Update lazy.log files

compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.lazy.log

@@ -43,3 +43,26 @@ LazyJavaPackageFragment@9['lang'] {
     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> = ArrayList@37[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]
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@41[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]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+}

compiler/testData/diagnostics/tests/inference/arrayConstructor.lazy.log

@@ -33,3 +33,60 @@ LazyJavaPackageFragment@13['lang'] {
     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> = ArrayList@35[1] { ResolutionCandidate@34 }
+    <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> = ArrayList@39[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]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[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]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}

compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.lazy.log

@@ -40,14 +40,14 @@ LazyJavaClassifierType@22['String'] {
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -146,3 +146,30 @@ LazyJavaPackageFragment@64['lang'] {
     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> = ArrayList@93[2] { ResolutionCandidate@91, 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]
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[4] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
+    <name not found> = ArrayList@99[5] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
+    <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[4] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
+    <name not found> = ArrayList@105[5] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}

compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.lazy.log

@@ -43,3 +43,12 @@ LazyJavaPackageFragment@18['lang'] {
     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> = ArrayList@43[2] { ResolutionCandidate@41, 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]
+}

compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.lazy.log

@@ -33,21 +33,21 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@13['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -75,21 +75,21 @@ LazyJavaClassifierType@36['Throwable'] {
 
 LazyJavaClassifierType@39['Throwable'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -148,3 +148,48 @@ LazyJavaPackageFragment@64['lang'] {
     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> = ArrayList@93[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]
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[2] { ResolutionCandidate@96, ResolutionCandidate@97 }
+    <name not found> = ArrayList@98[2] { 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]
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[4] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
+    <name not found> = ArrayList@104[5] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
+    <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@105 {
+    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = ArrayList@110[5] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <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@111 {
+    <name not found> = ArrayList@112[4] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
+    <name not found> = ArrayList@116[5] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@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]
+}

compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.lazy.log

@@ -45,3 +45,31 @@ LazyJavaPackageFragment@19['lang'] {
     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 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[2] { ResolutionCandidate@50, ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[2] { ResolutionCandidate@50, 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]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+}

compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.lazy.log

@@ -42,3 +42,21 @@ LazyJavaPackageFragment@16['lang'] {
     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> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <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@40 {
+    <name not found> = ArrayList@41[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[2] { ResolutionCandidate@42, 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]
+}

compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.lazy.log

@@ -37,3 +37,31 @@ LazyJavaPackageFragment@15['lang'] {
     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 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[2] { ResolutionCandidate@42, 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]
+}

compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.lazy.log

@@ -2,59 +2,54 @@ 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
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@7['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@8['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
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@17
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
+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@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
+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@7) = ArrayList@29[2] { JavaMethodDescriptor@30['add'], JavaMethodDescriptor@31['add'] } // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@32 // through LazyJavaClassMemberScope@26
-    nestedClassIndex = LinkedHashMap@33 // through LazyJavaClassMemberScope@26
-    nestedClasses('add': Name@7) = null // through LazyJavaClassMemberScope@26
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@26
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@34['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@35['ArrayList']
+    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@36['RandomAccess'] {
-    functions('add': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@37
+LazyJavaClassDescriptor@35['RandomAccess'] {
+    functions('add': Name@11) = EmptyList@36[empty] // through LazyJavaClassMemberScope@37
     memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@37
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@37
     typeConstructor = LazyJavaClassTypeConstructor@39['RandomAccess']
 }
 
 LazyJavaClassDescriptor@40['Serializable'] {
-    functions('add': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@41
+    functions('add': Name@11) = EmptyList@36[empty] // through LazyJavaClassMemberScope@41
     memberIndex = computeMemberIndex$1@42 // through LazyJavaClassMemberScope@41
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@41
     typeConstructor = LazyJavaClassTypeConstructor@43['Serializable']
 }
 
-LazyJavaClassTypeConstructor@10['AbstractCollection'] {
+LazyJavaClassTypeConstructor@8['AbstractCollection'] {
     parameters = ArrayList@44[1] { LazyJavaTypeParameterDescriptor@45['E'] }
     supertypes = ArrayList@46[1] { LazyJavaClassifierType@47['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@20['AbstractList'] {
+LazyJavaClassTypeConstructor@18['AbstractList'] {
     parameters = ArrayList@48[1] { LazyJavaTypeParameterDescriptor@49['E'] }
     supertypes = ArrayList@50[2] { LazyJavaClassifierType@51['AbstractCollection<E>'], LazyJavaClassifierType@52['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@35['ArrayList'] {
+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'], ... }
 }
@@ -73,14 +68,14 @@ LazyJavaClassifierType@51['AbstractCollection<E>'] {
     arguments = ArrayList@64[1] { TypeProjectionImpl@65 }
     classifier = JavaClassImpl@66['AbstractCollection']
     memberScope = SubstitutingScope@67
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
 }
 
 LazyJavaClassifierType@56['AbstractList<E>'] {
     arguments = ArrayList@68[1] { TypeProjectionImpl@69 }
     classifier = JavaClassImpl@70['AbstractList']
     memberScope = SubstitutingScope@71
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractList']
 }
 
 LazyJavaClassifierType@72['Cloneable'] {
@@ -138,7 +133,7 @@ LazyJavaClassifierType@105['E'] {
     arguments = ArrayList@106[empty]
     classifier = JavaTypeParameterImpl@107['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@108['E'] {
@@ -152,133 +147,133 @@ LazyJavaClassifierType@111['E'] {
     arguments = ArrayList@112[empty]
     classifier = JavaTypeParameterImpl@113['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
-LazyJavaClassifierType@114['E'] {
-    arguments = ArrayList@115[empty]
-    classifier = JavaTypeParameterImpl@116['E']
+LazyJavaClassifierType@115['E'] {
+    arguments = ArrayList@116[empty]
+    classifier = JavaTypeParameterImpl@117['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@118['E'] {
     arguments = ArrayList@119[empty]
     classifier = JavaTypeParameterImpl@120['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 LazyJavaClassifierType@121['E'] {
     arguments = ArrayList@122[empty]
     classifier = JavaTypeParameterImpl@123['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@124['E'] {
     arguments = ArrayList@125[empty]
     classifier = JavaTypeParameterImpl@126['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 LazyJavaClassifierType@127['E'] {
     arguments = ArrayList@128[empty]
     classifier = JavaTypeParameterImpl@129['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 LazyJavaClassifierType@130['E'] {
     arguments = ArrayList@131[empty]
     classifier = JavaTypeParameterImpl@132['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@133['E'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@116['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
-}
-
-LazyJavaClassifierType@135['E'] {
-    arguments = ArrayList@136[empty]
     classifier = JavaTypeParameterImpl@110['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
+LazyJavaClassifierType@135['E'] {
+    arguments = ArrayList@136[empty]
+    classifier = JavaTypeParameterImpl@113['E']
+    nullable = 'true': Boolean@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+}
+
 LazyJavaClassifierType@137['E'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@123['E']
+    classifier = JavaTypeParameterImpl@120['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 LazyJavaClassifierType@139['E'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@107['E']
+    classifier = JavaTypeParameterImpl@100['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@141['E'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@120['E']
+    classifier = JavaTypeParameterImpl@107['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@143['E'] {
     arguments = ArrayList@144[empty]
     classifier = JavaTypeParameterImpl@132['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@145['E'] {
     arguments = ArrayList@146[empty]
-    classifier = JavaTypeParameterImpl@104['E']
+    classifier = JavaTypeParameterImpl@96['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@147['E'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@96['E']
+    classifier = JavaTypeParameterImpl@104['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@149['E'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@100['E']
+    classifier = JavaTypeParameterImpl@129['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 LazyJavaClassifierType@151['E'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@126['E']
+    classifier = JavaTypeParameterImpl@117['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@153['E'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@129['E']
+    classifier = JavaTypeParameterImpl@123['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@155['E'] {
     arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@113['E']
+    classifier = JavaTypeParameterImpl@126['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 LazyJavaClassifierType@52['List<E>'] {
@@ -356,9 +351,9 @@ LazyJavaPackageFragmentProvider@178 {
     packageFragments('kotlin.io': FqName@211) = null
     packageFragments('kotlin.jvm': FqName@212) = null
     topLevelClasses(JavaClassImpl@66['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@70['AbstractList']) = LazyJavaClassDescriptor@11['AbstractList']
-    topLevelClasses(JavaClassImpl@213['ArrayList']) = LazyJavaClassDescriptor@21['ArrayList']
-    topLevelClasses(JavaClassImpl@174['RandomAccess']) = LazyJavaClassDescriptor@36['RandomAccess']
+    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']
 }
 
@@ -366,69 +361,65 @@ 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@8[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('util': Name@219) = EmptyList@8[empty] // 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('add': Name@7) = 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@8[empty] // through LazyPackageFragmentScopeForJavaPackage@222
-    functions('add': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@222
-    functions('elemAndList': Name@223) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@222
-    functions('elemAndListWithReceiver': Name@224) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@222
-    functions('list': Name@225) = EmptyList@8[empty] // 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@21['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@228
+    classes('ArrayList': Name@227) = LazyJavaClassDescriptor@19['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@228
     classes('MutableList': Name@229) = null // through LazyPackageFragmentScopeForJavaPackage@228
-    classes('add': Name@7) = 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@8[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    functions('add': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    functions('elemAndList': Name@223) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    functions('elemAndListWithReceiver': Name@224) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    functions('list': Name@225) = EmptyList@8[empty] // 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@45['E'] {
     defaultType = JetTypeImpl@231['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
     upperBounds = LinkedHashSet@232[1] { NullableType@233 }
     upperBoundsAsType = NullableType@233
 }
 
 LazyJavaTypeParameterDescriptor@54['E'] {
     defaultType = JetTypeImpl@234['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
     upperBounds = LinkedHashSet@235[1] { NullableType@236 }
     upperBoundsAsType = NullableType@236
 }
 
 LazyJavaTypeParameterDescriptor@49['E'] {
     defaultType = JetTypeImpl@237['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
     upperBounds = LinkedHashSet@238[1] { NullableType@239 }
     upperBoundsAsType = NullableType@239
 }
 
 LazyJavaTypeParameterResolver@240 {
-    resolve(JavaTypeParameterImpl@241['E']) = LazyJavaTypeParameterDescriptor@49['E']
+    resolve(JavaTypeParameterImpl@241['E']) = LazyJavaTypeParameterDescriptor@45['E']
 }
 
 LazyJavaTypeParameterResolver@242 {
-    resolve(JavaTypeParameterImpl@243['E']) = LazyJavaTypeParameterDescriptor@45['E']
+    resolve(JavaTypeParameterImpl@243['E']) = LazyJavaTypeParameterDescriptor@49['E']
 }
 
 LazyJavaTypeParameterResolver@244 {
@@ -436,21 +427,134 @@ LazyJavaTypeParameterResolver@244 {
 }
 
 LazyJavaTypeParameterResolver@246 {
-    resolve(JavaTypeParameterImpl@129['E']) = null
+    resolve(JavaTypeParameterImpl@123['E']) = null
 }
 
 LazyJavaTypeParameterResolver@247 {
-    resolve(JavaTypeParameterImpl@116['E']) = null
+    resolve(JavaTypeParameterImpl@110['E']) = null
 }
 
 LazyJavaTypeParameterResolver@248 {
-    resolve(JavaTypeParameterImpl@126['E']) = null
-}
-
-LazyJavaTypeParameterResolver@249 {
     resolve(JavaTypeParameterImpl@113['E']) = null
 }
 
-LazyJavaTypeParameterResolver@250 {
-    resolve(JavaTypeParameterImpl@96['E']) = null
+LazyJavaTypeParameterResolver@249 {
+    resolve(JavaTypeParameterImpl@120['E']) = null
+}
+
+LazyJavaTypeParameterResolver@250 {
+    resolve(JavaTypeParameterImpl@107['E']) = null
+}
+
+ResolutionTaskHolder@251 {
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
+    <name not found> = ArrayList@254[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]
+    <name not found> = EmptyList@36[empty]
+    <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@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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@259 {
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
+    <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@263 {
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@265 }
+    <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@267 {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
+}
+
+ResolutionTaskHolder@271 {
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
+}
+
+ResolutionTaskHolder@275 {
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@277 }
+}
+
+ResolutionTaskHolder@279 {
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
+}
+
+ResolutionTaskHolder@283 {
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
+}
+
+ResolutionTaskHolder@287 {
+    <name not found> = ArrayList@288[2] { ResolutionCandidate@289, ResolutionCandidate@290 }
+    <name not found> = ArrayList@291[2] { ResolutionCandidate@289, ResolutionCandidate@290 }
+}
+
+ResolutionTaskHolder@292 {
+    <name not found> = ArrayList@293[3] { ResolutionCandidate@294, ResolutionCandidate@295, ResolutionCandidate@296 }
+    <name not found> = ArrayList@297[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]
 }

compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.lazy.log

@@ -122,26 +122,26 @@ LazyJavaClassifierType@82['E'] {
     arguments = ArrayList@83[empty]
     classifier = JavaTypeParameterImpl@84['E']
     nullable = 'false': Boolean@59
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@85
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
-LazyJavaClassifierType@86['E'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaTypeParameterImpl@88['E']
+LazyJavaClassifierType@85['E'] {
+    arguments = ArrayList@86[empty]
+    classifier = JavaTypeParameterImpl@87['E']
     nullable = 'false': Boolean@59
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
 LazyJavaClassifierType@89['E'] {
     arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@81['E']
+    classifier = JavaTypeParameterImpl@87['E']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
 LazyJavaClassifierType@91['E'] {
     arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@77['E']
+    classifier = JavaTypeParameterImpl@84['E']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
@@ -155,16 +155,16 @@ LazyJavaClassifierType@93['E'] {
 
 LazyJavaClassifierType@95['E'] {
     arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@88['E']
+    classifier = JavaTypeParameterImpl@77['E']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
 LazyJavaClassifierType@97['E'] {
     arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@84['E']
+    classifier = JavaTypeParameterImpl@81['E']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@85
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
 LazyJavaClassifierType@32['List<E>'] {
@@ -267,14 +267,14 @@ LazyJavaClassifierType@135['Throwable'] {
 
 LazyJavaClassifierType@138['Throwable'] {
     arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@134['Throwable']
+    classifier = JavaClassImpl@130['Throwable']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@140['Throwable'] {
     arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@130['Throwable']
+    classifier = JavaClassImpl@134['Throwable']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@131
 }
@@ -381,21 +381,176 @@ LazyJavaTypeParameterDescriptor@34['E'] {
 }
 
 LazyJavaTypeParameterDescriptor@25['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
 LazyJavaTypeParameterDescriptor@29['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@85
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaTypeParameterResolver@218 {
-    resolve(JavaTypeParameterImpl@219['E']) = LazyJavaTypeParameterDescriptor@25['E']
+    resolve(JavaTypeParameterImpl@219['E']) = LazyJavaTypeParameterDescriptor@34['E']
 }
 
 LazyJavaTypeParameterResolver@220 {
-    resolve(JavaTypeParameterImpl@84['E']) = LazyJavaTypeParameterDescriptor@29['E']
+    resolve(JavaTypeParameterImpl@221['E']) = LazyJavaTypeParameterDescriptor@25['E']
 }
 
-LazyJavaTypeParameterResolver@221 {
-    resolve(JavaTypeParameterImpl@222['E']) = LazyJavaTypeParameterDescriptor@34['E']
+LazyJavaTypeParameterResolver@222 {
+    resolve(JavaTypeParameterImpl@73['E']) = LazyJavaTypeParameterDescriptor@29['E']
+}
+
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@226[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]
+    <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@227 {
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
+    <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@231 {
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
+    <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@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
+    <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@239 {
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
+    <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@243 {
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
+}
+
+ResolutionTaskHolder@247 {
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
+}
+
+ResolutionTaskHolder@251 {
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
+}
+
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
+}
+
+ResolutionTaskHolder@259 {
+    <name not found> = ArrayList@260[3] { ResolutionCandidate@261, ResolutionCandidate@262, ResolutionCandidate@263 }
+    <name not found> = ArrayList@264[3] { ResolutionCandidate@261, ResolutionCandidate@262, ResolutionCandidate@263 }
+    <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@265 {
+    <name not found> = ArrayList@266[4] { ResolutionCandidate@267, ResolutionCandidate@268, ResolutionCandidate@269, ... }
+    <name not found> = ArrayList@270[5] { ResolutionCandidate@267, ResolutionCandidate@268, ResolutionCandidate@269, ... }
+    <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]
 }

compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.lazy.log

@@ -40,21 +40,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -175,3 +175,150 @@ LazyJavaPackageFragment@60['lang'] {
     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> = ArrayList@103[1] { ResolutionCandidate@102 }
+    <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@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+    <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@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+    <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@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+    <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@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+    <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@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+    <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@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+}
+
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+}
+
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+}
+
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+}
+
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+}
+
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+}
+
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+}
+
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+}
+
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+}
+
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+}
+
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+}
+
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[4] { ResolutionCandidate@186, ResolutionCandidate@187, ResolutionCandidate@188, ... }
+    <name not found> = ArrayList@189[5] { ResolutionCandidate@186, ResolutionCandidate@187, ResolutionCandidate@188, ... }
+    <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@190 {
+    <name not found> = ArrayList@191[4] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
+    <name not found> = ArrayList@195[5] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+}

compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.lazy.log

@@ -38,14 +38,14 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -194,3 +194,134 @@ LazyJavaPackageFragment@63['lang'] {
     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> = ArrayList@118[1] { ResolutionCandidate@117 }
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+}
+
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <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> = ArrayList@130[1] { ResolutionCandidate@129 }
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+}
+
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
+}
+
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
+}
+
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
+}
+
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
+}
+
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
+}
+
+ResolutionTaskHolder@155 {
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
+}
+
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
+}
+
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
+}
+
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
+}
+
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
+}
+
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[4] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
+    <name not found> = ArrayList@180[5] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+}
+
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[4] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
+    <name not found> = ArrayList@186[5] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+}
+
+ResolutionTaskHolder@187 {
+    <name not found> = ArrayList@188[4] { ResolutionCandidate@189, ResolutionCandidate@190, ResolutionCandidate@191, ... }
+    <name not found> = ArrayList@192[5] { ResolutionCandidate@189, ResolutionCandidate@190, ResolutionCandidate@191, ... }
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+}
+
+ResolutionTaskHolder@193 {
+    <name not found> = ArrayList@194[4] { ResolutionCandidate@195, ResolutionCandidate@196, ResolutionCandidate@197, ... }
+    <name not found> = ArrayList@198[5] { ResolutionCandidate@195, ResolutionCandidate@196, ResolutionCandidate@197, ... }
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+    <name not found> = EmptyList@106[empty]
+}

compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.lazy.log

@@ -40,21 +40,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -82,21 +82,21 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -179,3 +179,150 @@ LazyJavaPackageFragment@61['lang'] {
     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> = ArrayList@107[1] { ResolutionCandidate@106 }
+    <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@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+    <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@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+    <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@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+    <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@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+    <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@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+    <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@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+}
+
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+}
+
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+}
+
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+}
+
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+}
+
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+}
+
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+}
+
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+}
+
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+}
+
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+}
+
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+}
+
+ResolutionTaskHolder@188 {
+    <name not found> = ArrayList@189[4] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
+    <name not found> = ArrayList@193[5] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
+    <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@194 {
+    <name not found> = ArrayList@195[4] { ResolutionCandidate@196, ResolutionCandidate@197, ResolutionCandidate@198, ... }
+    <name not found> = ArrayList@199[5] { ResolutionCandidate@196, ResolutionCandidate@197, ResolutionCandidate@198, ... }
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+}

compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.lazy.log

@@ -179,3 +179,150 @@ LazyJavaPackageFragment@61['lang'] {
     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> = ArrayList@107[1] { ResolutionCandidate@106 }
+    <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@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+    <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@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+    <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@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+    <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@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+    <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@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+    <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@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+}
+
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+}
+
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+}
+
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+}
+
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+}
+
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+}
+
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+}
+
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+}
+
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+}
+
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+}
+
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+}
+
+ResolutionTaskHolder@188 {
+    <name not found> = ArrayList@189[4] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
+    <name not found> = ArrayList@193[5] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
+    <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@194 {
+    <name not found> = ArrayList@195[4] { ResolutionCandidate@196, ResolutionCandidate@197, ResolutionCandidate@198, ... }
+    <name not found> = ArrayList@199[5] { ResolutionCandidate@196, ResolutionCandidate@197, ResolutionCandidate@198, ... }
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+}

compiler/testData/diagnostics/tests/inference/dependOnExpectedType.lazy.log

@@ -6,59 +6,54 @@ 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
-    properties('add': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractCollection']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
 }
 
-LazyJavaClassDescriptor@13['AbstractList'] {
-    defaultType = JetTypeImpl@14['AbstractList<1>']
-    functions('add': Name@15) = ArrayList@16[2] { JavaMethodDescriptor@17['add'], JavaMethodDescriptor@18['add'] } // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
-    properties('add': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@19
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@21['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@22['AbstractList']
+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@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
+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@9) = ArrayList@31[2] { JavaMethodDescriptor@32['add'], JavaMethodDescriptor@33['add'] } // through LazyJavaClassMemberScope@28
-    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@28
-    nestedClassIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@28
-    nestedClasses('add': Name@9) = null // through LazyJavaClassMemberScope@28
-    properties('add': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@28
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@36['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@37['ArrayList']
+    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@38['RandomAccess'] {
-    functions('add': Name@15) = EmptyList@10[empty] // through LazyJavaClassMemberScope@39
+LazyJavaClassDescriptor@37['RandomAccess'] {
+    functions('add': Name@13) = EmptyList@38[empty] // through LazyJavaClassMemberScope@39
     memberIndex = computeMemberIndex$1@40 // through LazyJavaClassMemberScope@39
-    properties('add': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@39
     typeConstructor = LazyJavaClassTypeConstructor@41['RandomAccess']
 }
 
 LazyJavaClassDescriptor@42['Serializable'] {
-    functions('add': Name@15) = EmptyList@10[empty] // through LazyJavaClassMemberScope@43
+    functions('add': Name@13) = EmptyList@38[empty] // through LazyJavaClassMemberScope@43
     memberIndex = computeMemberIndex$1@44 // through LazyJavaClassMemberScope@43
-    properties('add': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@43
     typeConstructor = LazyJavaClassTypeConstructor@45['Serializable']
 }
 
-LazyJavaClassTypeConstructor@12['AbstractCollection'] {
+LazyJavaClassTypeConstructor@10['AbstractCollection'] {
     parameters = ArrayList@46[1] { LazyJavaTypeParameterDescriptor@47['E'] }
     supertypes = ArrayList@48[1] { LazyJavaClassifierType@49['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@22['AbstractList'] {
+LazyJavaClassTypeConstructor@20['AbstractList'] {
     parameters = ArrayList@50[1] { LazyJavaTypeParameterDescriptor@51['E'] }
     supertypes = ArrayList@52[2] { LazyJavaClassifierType@53['AbstractCollection<E>'], LazyJavaClassifierType@54['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@37['ArrayList'] {
+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'], ... }
 }
@@ -77,14 +72,14 @@ LazyJavaClassifierType@53['AbstractCollection<E>'] {
     arguments = ArrayList@66[1] { TypeProjectionImpl@67 }
     classifier = JavaClassImpl@68['AbstractCollection']
     memberScope = SubstitutingScope@69
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
 }
 
 LazyJavaClassifierType@58['AbstractList<E>'] {
     arguments = ArrayList@70[1] { TypeProjectionImpl@71 }
     classifier = JavaClassImpl@72['AbstractList']
     memberScope = SubstitutingScope@73
-    typeConstructor = LazyJavaClassTypeConstructor@22['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
 }
 
 LazyJavaClassifierType@74['Cloneable'] {
@@ -128,49 +123,49 @@ LazyJavaClassifierType@100['E'] {
     arguments = ArrayList@101[empty]
     classifier = JavaTypeParameterImpl@102['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
-LazyJavaClassifierType@103['E'] {
-    arguments = ArrayList@104[empty]
-    classifier = JavaTypeParameterImpl@105['E']
+LazyJavaClassifierType@104['E'] {
+    arguments = ArrayList@105[empty]
+    classifier = JavaTypeParameterImpl@106['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 LazyJavaClassifierType@107['E'] {
     arguments = ArrayList@108[empty]
     classifier = JavaTypeParameterImpl@109['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
-LazyJavaClassifierType@110['E'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaTypeParameterImpl@112['E']
+LazyJavaClassifierType@111['E'] {
+    arguments = ArrayList@112[empty]
+    classifier = JavaTypeParameterImpl@113['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
-LazyJavaClassifierType@113['E'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaTypeParameterImpl@115['E']
+LazyJavaClassifierType@114['E'] {
+    arguments = ArrayList@115[empty]
+    classifier = JavaTypeParameterImpl@116['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 LazyJavaClassifierType@117['E'] {
     arguments = ArrayList@118[empty]
     classifier = JavaTypeParameterImpl@119['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
 LazyJavaClassifierType@120['E'] {
     arguments = ArrayList@121[empty]
     classifier = JavaTypeParameterImpl@122['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
 LazyJavaClassifierType@123['E'] {
@@ -184,56 +179,56 @@ LazyJavaClassifierType@126['E'] {
     arguments = ArrayList@127[empty]
     classifier = JavaTypeParameterImpl@128['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
 LazyJavaClassifierType@129['E'] {
     arguments = ArrayList@130[empty]
     classifier = JavaTypeParameterImpl@131['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
 LazyJavaClassifierType@132['E'] {
     arguments = ArrayList@133[empty]
     classifier = JavaTypeParameterImpl@134['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 LazyJavaClassifierType@135['E'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@119['E']
+    classifier = JavaTypeParameterImpl@98['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@137['E'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@128['E']
+    classifier = JavaTypeParameterImpl@134['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 LazyJavaClassifierType@139['E'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@122['E']
+    classifier = JavaTypeParameterImpl@113['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
 LazyJavaClassifierType@141['E'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@102['E']
+    classifier = JavaTypeParameterImpl@128['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
 LazyJavaClassifierType@143['E'] {
     arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@134['E']
+    classifier = JavaTypeParameterImpl@122['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
 LazyJavaClassifierType@145['E'] {
@@ -245,54 +240,54 @@ LazyJavaClassifierType@145['E'] {
 
 LazyJavaClassifierType@147['E'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@112['E']
+    classifier = JavaTypeParameterImpl@106['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 LazyJavaClassifierType@149['E'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@131['E']
+    classifier = JavaTypeParameterImpl@102['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 LazyJavaClassifierType@151['E'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@98['E']
+    classifier = JavaTypeParameterImpl@119['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
 LazyJavaClassifierType@153['E'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@109['E']
+    classifier = JavaTypeParameterImpl@131['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
 LazyJavaClassifierType@155['E'] {
     arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@105['E']
+    classifier = JavaTypeParameterImpl@116['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 LazyJavaClassifierType@157['E'] {
     arguments = ArrayList@158[empty]
-    classifier = JavaTypeParameterImpl@115['E']
+    classifier = JavaTypeParameterImpl@109['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
-LazyJavaClassifierType@59['List<E>'] {
+LazyJavaClassifierType@54['List<E>'] {
     arguments = ArrayList@159[1] { TypeProjectionImpl@160 }
     classifier = JavaClassImpl@161['List']
     memberScope = SubstitutingScope@162
     typeConstructor = DeserializedClassTypeConstructor@163
 }
 
-LazyJavaClassifierType@54['List<E>'] {
+LazyJavaClassifierType@59['List<E>'] {
     arguments = ArrayList@164[1] { TypeProjectionImpl@165 }
     classifier = JavaClassImpl@166['List']
     memberScope = SubstitutingScope@167
@@ -384,10 +379,10 @@ LazyJavaPackageFragmentProvider@180 {
     packageFragments('kotlin.io': FqName@238) = null
     packageFragments('kotlin.jvm': FqName@239) = null
     topLevelClasses(JavaClassImpl@68['AbstractCollection']) = LazyJavaClassDescriptor@2['AbstractCollection']
-    topLevelClasses(JavaClassImpl@72['AbstractList']) = LazyJavaClassDescriptor@13['AbstractList']
-    topLevelClasses(JavaClassImpl@240['ArrayList']) = LazyJavaClassDescriptor@23['ArrayList']
+    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@38['RandomAccess']
+    topLevelClasses(JavaClassImpl@176['RandomAccess']) = LazyJavaClassDescriptor@37['RandomAccess']
     topLevelClasses(JavaClassImpl@179['Serializable']) = LazyJavaClassDescriptor@42['Serializable']
 }
 
@@ -395,115 +390,464 @@ 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@10[empty] // through LazyPackageFragmentScopeForJavaPackage@244
-    functions('util': Name@248) = EmptyList@10[empty] // 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('add': Name@9) = 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('get': Name@255) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('id': Name@256) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('id1': Name@257) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('list': Name@258) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('newList': Name@259) = 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@10[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('add': Name@9) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('both': Name@252) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('elem': Name@253) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('elemAndList': Name@254) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('get': Name@255) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('id': Name@256) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('id1': Name@257) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('list': Name@258) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('newList': Name@259) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    memberIndex = computeMemberIndex$1@260 // 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@261) = LazyJavaClassDescriptor@23['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Comparable': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Int': Name@264) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('List': Name@265) = LazyJavaClassDescriptor@242['List'] // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Long': Name@266) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('String': Name@267) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('add': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('both': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('elem': Name@253) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('elemAndList': Name@254) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('get': Name@255) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('id': Name@256) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('id1': Name@257) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('list': Name@258) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('newList': Name@259) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    deserializedPackageScope = Empty@246 // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('ArrayList': Name@250) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('add': Name@9) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('both': Name@252) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('elem': Name@253) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('elemAndList': Name@254) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('get': Name@255) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('id': Name@256) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('id1': Name@257) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('list': Name@258) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('newList': Name@259) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    memberIndex = computeMemberIndex$1@268 // through LazyPackageFragmentScopeForJavaPackage@262
+    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@56['E'] {
-    defaultType = JetTypeImpl@269['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-    upperBounds = LinkedHashSet@270[1] { NullableType@271 }
-    upperBoundsAsType = NullableType@271
-}
-
-LazyJavaTypeParameterDescriptor@47['E'] {
-    defaultType = JetTypeImpl@272['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
-    upperBounds = LinkedHashSet@273[1] { NullableType@274 }
-    upperBoundsAsType = NullableType@274
+    defaultType = JetTypeImpl@268['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    upperBounds = LinkedHashSet@269[1] { NullableType@270 }
+    upperBoundsAsType = NullableType@270
 }
 
 LazyJavaTypeParameterDescriptor@51['E'] {
-    defaultType = JetTypeImpl@275['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-    upperBounds = LinkedHashSet@276[1] { NullableType@277 }
-    upperBoundsAsType = NullableType@277
+    defaultType = JetTypeImpl@271['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    upperBounds = LinkedHashSet@272[1] { NullableType@273 }
+    upperBoundsAsType = NullableType@273
 }
 
-LazyJavaTypeParameterResolver@278 {
-    resolve(JavaTypeParameterImpl@279['E']) = LazyJavaTypeParameterDescriptor@56['E']
+LazyJavaTypeParameterDescriptor@47['E'] {
+    defaultType = JetTypeImpl@274['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    upperBounds = LinkedHashSet@275[1] { NullableType@276 }
+    upperBoundsAsType = NullableType@276
+}
+
+LazyJavaTypeParameterResolver@277 {
+    resolve(JavaTypeParameterImpl@278['E']) = LazyJavaTypeParameterDescriptor@56['E']
+}
+
+LazyJavaTypeParameterResolver@279 {
+    resolve(JavaTypeParameterImpl@125['E']) = LazyJavaTypeParameterDescriptor@47['E']
 }
 
 LazyJavaTypeParameterResolver@280 {
-    resolve(JavaTypeParameterImpl@122['E']) = LazyJavaTypeParameterDescriptor@51['E']
+    resolve(JavaTypeParameterImpl@106['E']) = LazyJavaTypeParameterDescriptor@51['E']
 }
 
 LazyJavaTypeParameterResolver@281 {
-    resolve(JavaTypeParameterImpl@115['E']) = LazyJavaTypeParameterDescriptor@47['E']
-}
-
-LazyJavaTypeParameterResolver@282 {
     resolve(JavaTypeParameterImpl@102['E']) = null
 }
 
+LazyJavaTypeParameterResolver@282 {
+    resolve(JavaTypeParameterImpl@134['E']) = null
+}
+
 LazyJavaTypeParameterResolver@283 {
-    resolve(JavaTypeParameterImpl@109['E']) = null
+    resolve(JavaTypeParameterImpl@131['E']) = null
 }
 
 LazyJavaTypeParameterResolver@284 {
-    resolve(JavaTypeParameterImpl@105['E']) = null
+    resolve(JavaTypeParameterImpl@119['E']) = null
 }
 
 LazyJavaTypeParameterResolver@285 {
-    resolve(JavaTypeParameterImpl@112['E']) = null
+    resolve(JavaTypeParameterImpl@98['E']) = null
 }
 
-LazyJavaTypeParameterResolver@286 {
-    resolve(JavaTypeParameterImpl@119['E']) = null
+ResolutionTaskHolder@286 {
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@288 }
+    <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@290 {
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@292 }
+    <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@294 {
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@296 }
+    <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@298 {
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@300 }
+    <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@302 {
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@304 }
+    <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@306 {
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@308 }
+    <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@310 {
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@312 }
+    <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@314 {
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@316 }
+    <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@318 {
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@320 }
+    <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@322 {
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@324 }
+    <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@326 {
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@328 }
+    <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@330 {
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@332 }
+    <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@334 {
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@336 }
+    <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@338 {
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@340 }
+    <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@342 {
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@344 }
+    <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@346 {
+    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@348 }
+    <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@350 {
+    <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
+    <name not found> = ArrayList@353[1] { ResolutionCandidate@352 }
+    <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@354 {
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@356 }
+    <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@358 {
+    <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@360 }
+    <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@362 {
+    <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
+    <name not found> = ArrayList@365[1] { ResolutionCandidate@364 }
+    <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@366 {
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@368 }
+    <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@370 {
+    <name not found> = ArrayList@371[1] { ResolutionCandidate@372 }
+    <name not found> = ArrayList@373[1] { ResolutionCandidate@372 }
+    <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@374 {
+    <name not found> = ArrayList@375[1] { ResolutionCandidate@376 }
+    <name not found> = ArrayList@377[1] { ResolutionCandidate@376 }
+    <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@378 {
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@380 }
+    <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@382 {
+    <name not found> = ArrayList@383[1] { ResolutionCandidate@384 }
+    <name not found> = ArrayList@385[1] { ResolutionCandidate@384 }
+    <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@386 {
+    <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
+    <name not found> = ArrayList@389[1] { ResolutionCandidate@388 }
+    <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@390 {
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@392 }
+}
+
+ResolutionTaskHolder@394 {
+    <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@396 }
+}
+
+ResolutionTaskHolder@398 {
+    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
+    <name not found> = ArrayList@401[1] { ResolutionCandidate@400 }
+}
+
+ResolutionTaskHolder@402 {
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
+    <name not found> = ArrayList@405[1] { ResolutionCandidate@404 }
+}
+
+ResolutionTaskHolder@406 {
+    <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
+    <name not found> = ArrayList@409[1] { ResolutionCandidate@408 }
+}
+
+ResolutionTaskHolder@410 {
+    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
+    <name not found> = ArrayList@413[1] { ResolutionCandidate@412 }
+}
+
+ResolutionTaskHolder@414 {
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
+    <name not found> = ArrayList@417[1] { ResolutionCandidate@416 }
+}
+
+ResolutionTaskHolder@418 {
+    <name not found> = ArrayList@419[1] { ResolutionCandidate@420 }
+    <name not found> = ArrayList@421[1] { ResolutionCandidate@420 }
+}
+
+ResolutionTaskHolder@422 {
+    <name not found> = ArrayList@423[1] { ResolutionCandidate@424 }
+    <name not found> = ArrayList@425[1] { ResolutionCandidate@424 }
+}
+
+ResolutionTaskHolder@426 {
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
+    <name not found> = ArrayList@429[1] { ResolutionCandidate@428 }
+}
+
+ResolutionTaskHolder@430 {
+    <name not found> = ArrayList@431[1] { ResolutionCandidate@432 }
+    <name not found> = ArrayList@433[1] { ResolutionCandidate@432 }
+}
+
+ResolutionTaskHolder@434 {
+    <name not found> = ArrayList@435[1] { ResolutionCandidate@436 }
+    <name not found> = ArrayList@437[1] { ResolutionCandidate@436 }
+}
+
+ResolutionTaskHolder@438 {
+    <name not found> = ArrayList@439[1] { ResolutionCandidate@440 }
+    <name not found> = ArrayList@441[1] { ResolutionCandidate@440 }
+}
+
+ResolutionTaskHolder@442 {
+    <name not found> = ArrayList@443[1] { ResolutionCandidate@444 }
+    <name not found> = ArrayList@445[1] { ResolutionCandidate@444 }
+}
+
+ResolutionTaskHolder@446 {
+    <name not found> = ArrayList@447[1] { ResolutionCandidate@448 }
+    <name not found> = ArrayList@449[1] { ResolutionCandidate@448 }
+}
+
+ResolutionTaskHolder@450 {
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@452 }
+    <name not found> = ArrayList@453[1] { ResolutionCandidate@452 }
+}
+
+ResolutionTaskHolder@454 {
+    <name not found> = ArrayList@455[1] { ResolutionCandidate@456 }
+    <name not found> = ArrayList@457[1] { ResolutionCandidate@456 }
+}
+
+ResolutionTaskHolder@458 {
+    <name not found> = ArrayList@459[1] { ResolutionCandidate@460 }
+    <name not found> = ArrayList@461[1] { ResolutionCandidate@460 }
+}
+
+ResolutionTaskHolder@462 {
+    <name not found> = ArrayList@463[1] { ResolutionCandidate@464 }
+    <name not found> = ArrayList@465[1] { ResolutionCandidate@464 }
+}
+
+ResolutionTaskHolder@466 {
+    <name not found> = ArrayList@467[1] { ResolutionCandidate@468 }
+    <name not found> = ArrayList@469[1] { ResolutionCandidate@468 }
+}
+
+ResolutionTaskHolder@470 {
+    <name not found> = ArrayList@471[2] { ResolutionCandidate@472, ResolutionCandidate@473 }
+    <name not found> = ArrayList@474[2] { ResolutionCandidate@472, ResolutionCandidate@473 }
+}
+
+ResolutionTaskHolder@475 {
+    <name not found> = ArrayList@476[3] { ResolutionCandidate@477, ResolutionCandidate@478, ResolutionCandidate@479 }
+    <name not found> = ArrayList@480[3] { ResolutionCandidate@477, ResolutionCandidate@478, ResolutionCandidate@479 }
+    <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@481 {
+    <name not found> = ArrayList@482[3] { ResolutionCandidate@483, ResolutionCandidate@484, ResolutionCandidate@485 }
+    <name not found> = ArrayList@486[3] { ResolutionCandidate@483, ResolutionCandidate@484, ResolutionCandidate@485 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
 }

compiler/testData/diagnostics/tests/inference/dependantOnVariance.lazy.log

@@ -55,3 +55,899 @@ LazyJavaPackageFragment@17['lang'] {
     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> = ArrayList@48[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]
+    <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@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@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[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]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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> = ArrayList@60[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]
+    <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> = ArrayList@64[1] { ResolutionCandidate@63 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@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]
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+    <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> = ArrayList@78[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+    <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@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+    <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@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+    <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@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+    <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@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+    <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> = ArrayList@98[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@100[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]
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+    <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@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+    <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> = ArrayList@110[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+    <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@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+    <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@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+    <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@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+    <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@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+    <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@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+    <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@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
+    <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@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+    <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@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
+    <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@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+    <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@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+    <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@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
+    <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@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+    <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@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
+    <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@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
+    <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@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
+    <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@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
+    <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@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
+    <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@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
+    <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@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
+    <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@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
+    <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@193 {
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
+    <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@197 {
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
+    <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@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@203 }
+    <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@205 {
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@207 }
+    <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@209 {
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
+    <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@213 {
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
+    <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@217 {
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
+    <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@221 {
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
+    <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@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
+    <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@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
+    <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@233 {
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
+    <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@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
+    <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@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@243 }
+    <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@245 {
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
+    <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@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@251 }
+    <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@253 {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@255 }
+}
+
+ResolutionTaskHolder@257 {
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@259 }
+}
+
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@263 }
+}
+
+ResolutionTaskHolder@265 {
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@267 }
+}
+
+ResolutionTaskHolder@269 {
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@271 }
+}
+
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@275 }
+}
+
+ResolutionTaskHolder@277 {
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@279 }
+}
+
+ResolutionTaskHolder@281 {
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@283 }
+}
+
+ResolutionTaskHolder@285 {
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@287 }
+}
+
+ResolutionTaskHolder@289 {
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@291 }
+}
+
+ResolutionTaskHolder@293 {
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@295 }
+}
+
+ResolutionTaskHolder@297 {
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@299 }
+}
+
+ResolutionTaskHolder@301 {
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@303 }
+}
+
+ResolutionTaskHolder@305 {
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@307 }
+}
+
+ResolutionTaskHolder@309 {
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@311 }
+}
+
+ResolutionTaskHolder@313 {
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@315 }
+}
+
+ResolutionTaskHolder@317 {
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@319 }
+}
+
+ResolutionTaskHolder@321 {
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@323 }
+}
+
+ResolutionTaskHolder@325 {
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@327 }
+}
+
+ResolutionTaskHolder@329 {
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@331 }
+}
+
+ResolutionTaskHolder@333 {
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@335 }
+}
+
+ResolutionTaskHolder@337 {
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
+    <name not found> = ArrayList@340[1] { ResolutionCandidate@339 }
+}
+
+ResolutionTaskHolder@341 {
+    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
+    <name not found> = ArrayList@344[1] { ResolutionCandidate@343 }
+}
+
+ResolutionTaskHolder@345 {
+    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
+    <name not found> = ArrayList@348[1] { ResolutionCandidate@347 }
+}
+
+ResolutionTaskHolder@349 {
+    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@351 }
+}
+
+ResolutionTaskHolder@353 {
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
+    <name not found> = ArrayList@356[1] { ResolutionCandidate@355 }
+}
+
+ResolutionTaskHolder@357 {
+    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
+    <name not found> = ArrayList@360[1] { ResolutionCandidate@359 }
+}
+
+ResolutionTaskHolder@361 {
+    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
+    <name not found> = ArrayList@364[1] { ResolutionCandidate@363 }
+}
+
+ResolutionTaskHolder@365 {
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
+    <name not found> = ArrayList@368[1] { ResolutionCandidate@367 }
+}
+
+ResolutionTaskHolder@369 {
+    <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
+    <name not found> = ArrayList@372[1] { ResolutionCandidate@371 }
+}
+
+ResolutionTaskHolder@373 {
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
+    <name not found> = ArrayList@376[1] { ResolutionCandidate@375 }
+}
+
+ResolutionTaskHolder@377 {
+    <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
+    <name not found> = ArrayList@380[1] { ResolutionCandidate@379 }
+}
+
+ResolutionTaskHolder@381 {
+    <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
+    <name not found> = ArrayList@384[1] { ResolutionCandidate@383 }
+}
+
+ResolutionTaskHolder@385 {
+    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
+    <name not found> = ArrayList@388[1] { ResolutionCandidate@387 }
+}
+
+ResolutionTaskHolder@389 {
+    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
+    <name not found> = ArrayList@392[1] { ResolutionCandidate@391 }
+}
+
+ResolutionTaskHolder@393 {
+    <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
+    <name not found> = ArrayList@396[1] { ResolutionCandidate@395 }
+}
+
+ResolutionTaskHolder@397 {
+    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
+    <name not found> = ArrayList@400[1] { ResolutionCandidate@399 }
+}
+
+ResolutionTaskHolder@401 {
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
+    <name not found> = ArrayList@404[1] { ResolutionCandidate@403 }
+}
+
+ResolutionTaskHolder@405 {
+    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
+    <name not found> = ArrayList@408[1] { ResolutionCandidate@407 }
+}
+
+ResolutionTaskHolder@409 {
+    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
+    <name not found> = ArrayList@412[1] { ResolutionCandidate@411 }
+}
+
+ResolutionTaskHolder@413 {
+    <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
+    <name not found> = ArrayList@416[1] { ResolutionCandidate@415 }
+}
+
+ResolutionTaskHolder@417 {
+    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
+    <name not found> = ArrayList@420[1] { ResolutionCandidate@419 }
+}
+
+ResolutionTaskHolder@421 {
+    <name not found> = ArrayList@422[1] { ResolutionCandidate@423 }
+    <name not found> = ArrayList@424[1] { ResolutionCandidate@423 }
+}
+
+ResolutionTaskHolder@425 {
+    <name not found> = ArrayList@426[1] { ResolutionCandidate@427 }
+    <name not found> = ArrayList@428[1] { ResolutionCandidate@427 }
+}
+
+ResolutionTaskHolder@429 {
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@431 }
+}
+
+ResolutionTaskHolder@433 {
+    <name not found> = ArrayList@434[1] { ResolutionCandidate@435 }
+    <name not found> = ArrayList@436[1] { ResolutionCandidate@435 }
+}
+
+ResolutionTaskHolder@437 {
+    <name not found> = ArrayList@438[1] { ResolutionCandidate@439 }
+    <name not found> = ArrayList@440[1] { ResolutionCandidate@439 }
+}
+
+ResolutionTaskHolder@441 {
+    <name not found> = ArrayList@442[1] { ResolutionCandidate@443 }
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@443 }
+}
+
+ResolutionTaskHolder@445 {
+    <name not found> = ArrayList@446[1] { ResolutionCandidate@447 }
+    <name not found> = ArrayList@448[1] { ResolutionCandidate@447 }
+}
+
+ResolutionTaskHolder@449 {
+    <name not found> = ArrayList@450[1] { ResolutionCandidate@451 }
+    <name not found> = ArrayList@452[1] { ResolutionCandidate@451 }
+}
+
+ResolutionTaskHolder@453 {
+    <name not found> = ArrayList@454[1] { ResolutionCandidate@455 }
+    <name not found> = ArrayList@456[1] { ResolutionCandidate@455 }
+}
+
+ResolutionTaskHolder@457 {
+    <name not found> = ArrayList@458[1] { ResolutionCandidate@459 }
+    <name not found> = ArrayList@460[1] { ResolutionCandidate@459 }
+}
+
+ResolutionTaskHolder@461 {
+    <name not found> = ArrayList@462[1] { ResolutionCandidate@463 }
+    <name not found> = ArrayList@464[1] { ResolutionCandidate@463 }
+}
+
+ResolutionTaskHolder@465 {
+    <name not found> = ArrayList@466[1] { ResolutionCandidate@467 }
+    <name not found> = ArrayList@468[1] { ResolutionCandidate@467 }
+}
+
+ResolutionTaskHolder@469 {
+    <name not found> = ArrayList@470[1] { ResolutionCandidate@471 }
+    <name not found> = ArrayList@472[1] { ResolutionCandidate@471 }
+}
+
+ResolutionTaskHolder@473 {
+    <name not found> = ArrayList@474[1] { ResolutionCandidate@475 }
+    <name not found> = ArrayList@476[1] { ResolutionCandidate@475 }
+}
+
+ResolutionTaskHolder@477 {
+    <name not found> = ArrayList@478[1] { ResolutionCandidate@479 }
+    <name not found> = ArrayList@480[1] { ResolutionCandidate@479 }
+}
+
+ResolutionTaskHolder@481 {
+    <name not found> = ArrayList@482[1] { ResolutionCandidate@483 }
+    <name not found> = ArrayList@484[1] { ResolutionCandidate@483 }
+}
+
+ResolutionTaskHolder@485 {
+    <name not found> = ArrayList@486[1] { ResolutionCandidate@487 }
+    <name not found> = ArrayList@488[1] { ResolutionCandidate@487 }
+}
+
+ResolutionTaskHolder@489 {
+    <name not found> = ArrayList@490[1] { ResolutionCandidate@491 }
+    <name not found> = ArrayList@492[1] { ResolutionCandidate@491 }
+}
+
+ResolutionTaskHolder@493 {
+    <name not found> = ArrayList@494[1] { ResolutionCandidate@495 }
+    <name not found> = ArrayList@496[1] { ResolutionCandidate@495 }
+}
+
+ResolutionTaskHolder@497 {
+    <name not found> = ArrayList@498[1] { ResolutionCandidate@499 }
+    <name not found> = ArrayList@500[1] { ResolutionCandidate@499 }
+}
+
+ResolutionTaskHolder@501 {
+    <name not found> = ArrayList@502[1] { ResolutionCandidate@503 }
+    <name not found> = ArrayList@504[1] { ResolutionCandidate@503 }
+}
+
+ResolutionTaskHolder@505 {
+    <name not found> = ArrayList@506[1] { ResolutionCandidate@507 }
+    <name not found> = ArrayList@508[1] { ResolutionCandidate@507 }
+}
+
+ResolutionTaskHolder@509 {
+    <name not found> = ArrayList@510[1] { ResolutionCandidate@511 }
+    <name not found> = ArrayList@512[1] { ResolutionCandidate@511 }
+}
+
+ResolutionTaskHolder@513 {
+    <name not found> = ArrayList@514[1] { ResolutionCandidate@515 }
+    <name not found> = ArrayList@516[1] { ResolutionCandidate@515 }
+}

compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.lazy.log

@@ -137,28 +137,28 @@ LazyJavaClassifierType@84['T'] {
     arguments = ArrayList@85[empty]
     classifier = JavaTypeParameterImpl@86['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
-LazyJavaClassifierType@88['T'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@90['T']
+LazyJavaClassifierType@87['T'] {
+    arguments = ArrayList@88[empty]
+    classifier = JavaTypeParameterImpl@89['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@91['T'] {
     arguments = ArrayList@92[empty]
     classifier = JavaTypeParameterImpl@93['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@94['T'] {
     arguments = ArrayList@95[empty]
     classifier = JavaTypeParameterImpl@96['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@97['T'] {
@@ -179,28 +179,28 @@ LazyJavaClassifierType@104['T'] {
     arguments = ArrayList@105[empty]
     classifier = JavaTypeParameterImpl@106['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@107['T'] {
     arguments = ArrayList@108[empty]
     classifier = JavaTypeParameterImpl@109['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@110['T'] {
     arguments = ArrayList@111[empty]
     classifier = JavaTypeParameterImpl@112['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@113['T'] {
     arguments = ArrayList@114[empty]
     classifier = JavaTypeParameterImpl@115['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@116['T'] {
@@ -212,44 +212,44 @@ LazyJavaClassifierType@116['T'] {
 
 LazyJavaClassifierType@119['T'] {
     arguments = ArrayList@120[empty]
-    classifier = JavaTypeParameterImpl@103['T']
-    nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-}
-
-LazyJavaClassifierType@121['T'] {
-    arguments = ArrayList@122[empty]
     classifier = JavaTypeParameterImpl@99['T']
     nullable = 'true': Boolean@44
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
+LazyJavaClassifierType@121['T'] {
+    arguments = ArrayList@122[empty]
+    classifier = JavaTypeParameterImpl@106['T']
+    nullable = 'true': Boolean@44
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+}
+
 LazyJavaClassifierType@123['T'] {
     arguments = ArrayList@124[empty]
-    classifier = JavaTypeParameterImpl@93['T']
+    classifier = JavaTypeParameterImpl@103['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@125['T'] {
     arguments = ArrayList@126[empty]
-    classifier = JavaTypeParameterImpl@109['T']
+    classifier = JavaTypeParameterImpl@93['T']
     nullable = 'true': Boolean@44
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@127['T'] {
     arguments = ArrayList@128[empty]
-    classifier = JavaTypeParameterImpl@96['T']
+    classifier = JavaTypeParameterImpl@112['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@129['T'] {
     arguments = ArrayList@130[empty]
-    classifier = JavaTypeParameterImpl@90['T']
+    classifier = JavaTypeParameterImpl@115['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@131['T'] {
@@ -261,30 +261,30 @@ LazyJavaClassifierType@131['T'] {
 
 LazyJavaClassifierType@133['T'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@112['T']
-    nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
-}
-
-LazyJavaClassifierType@135['T'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@115['T']
+    classifier = JavaTypeParameterImpl@86['T']
     nullable = 'true': Boolean@44
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
+LazyJavaClassifierType@135['T'] {
+    arguments = ArrayList@136[empty]
+    classifier = JavaTypeParameterImpl@96['T']
+    nullable = 'true': Boolean@44
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+}
+
 LazyJavaClassifierType@137['T'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@86['T']
+    classifier = JavaTypeParameterImpl@89['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@139['T'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@106['T']
+    classifier = JavaTypeParameterImpl@109['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@141['T'] {
@@ -367,20 +367,20 @@ LazyJavaPackageFragment@167['util'] {
     memberIndex = computeMemberIndex$1@198 // through LazyPackageFragmentScopeForJavaPackage@196
 }
 
-LazyJavaTypeParameterDescriptor@199['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-    upperBounds = LinkedHashSet@200[1] { NullableType@201 }
-    upperBoundsAsType = NullableType@201
-}
-
 LazyJavaTypeParameterDescriptor@26['T'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    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@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
     upperBounds = LinkedHashSet@205[2] { DelegatingFlexibleType@206, DelegatingFlexibleType@207 }
     upperBoundsAsType = NotNullType@208
 }
@@ -390,13 +390,41 @@ LazyJavaTypeParameterResolver@209 {
 }
 
 LazyJavaTypeParameterResolver@211 {
-    resolve(JavaTypeParameterImpl@212['T']) = LazyJavaTypeParameterDescriptor@199['T']
+    resolve(JavaTypeParameterImpl@212['T']) = LazyJavaTypeParameterDescriptor@204['T']
 }
 
 LazyJavaTypeParameterResolver@213 {
-    resolve(JavaTypeParameterImpl@214['T']) = LazyJavaTypeParameterDescriptor@204['T']
+    resolve(JavaTypeParameterImpl@214['T']) = LazyJavaTypeParameterDescriptor@201['T']
 }
 
 LazyJavaTypeParameterResolver@215 {
     resolve(JavaTypeParameterImpl@99['T']) = null
 }
+
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
+    <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@220 {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
+}
+
+ResolutionTaskHolder@224 {
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
+}
+
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[2] { ResolutionCandidate@230, ResolutionCandidate@231 }
+    <name not found> = ArrayList@232[3] { ResolutionCandidate@230, ResolutionCandidate@231, 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]
+}

compiler/testData/diagnostics/tests/inference/functionPlaceholderError.lazy.log

@@ -33,7 +33,7 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@13['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -47,7 +47,7 @@ LazyJavaClassifierType@25['String'] {
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -75,21 +75,21 @@ LazyJavaClassifierType@36['Throwable'] {
 
 LazyJavaClassifierType@39['Throwable'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -144,3 +144,72 @@ LazyJavaPackageFragment@62['lang'] {
     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> = ArrayList@89[1] { ResolutionCandidate@88 }
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <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> = ArrayList@97[1] { ResolutionCandidate@96 }
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[4] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+    <name not found> = ArrayList@119[5] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+    <name not found> = ArrayList@125[5] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+}

compiler/testData/diagnostics/tests/inference/hasErrorInConstrainingTypes.lazy.log

@@ -37,3 +37,84 @@ LazyJavaPackageFragment@9['lang'] {
     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> = ArrayList@39[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]
+}
+
+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]
+    <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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@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]
+}

compiler/testData/diagnostics/tests/inference/immutableArrayList.lazy.log

@@ -150,22 +150,43 @@ LazyJavaPackageFragment@96['p'] {
     memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
 }
 
-LazyJavaTypeParameterDescriptor@56['T'] {
+LazyJavaTypeParameterDescriptor@52['T'] {
     defaultType = JetTypeImpl@115['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
-    upperBounds = LinkedHashSet@117[1] { NullableType@118 }
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
+    upperBounds = LinkedHashSet@116[1] { NullableType@117 }
 }
 
-LazyJavaTypeParameterDescriptor@52['T'] {
-    defaultType = JetTypeImpl@119['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
+LazyJavaTypeParameterDescriptor@56['T'] {
+    defaultType = JetTypeImpl@118['T']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@119
     upperBounds = LinkedHashSet@120[1] { NullableType@121 }
 }
 
 LazyJavaTypeParameterResolver@122 {
-    resolve(JavaTypeParameterImpl@123['T']) = LazyJavaTypeParameterDescriptor@52['T']
+    resolve(JavaTypeParameterImpl@123['T']) = LazyJavaTypeParameterDescriptor@56['T']
 }
 
 LazyJavaTypeParameterResolver@124 {
-    resolve(JavaTypeParameterImpl@125['T']) = LazyJavaTypeParameterDescriptor@56['T']
+    resolve(JavaTypeParameterImpl@125['T']) = LazyJavaTypeParameterDescriptor@52['T']
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
+    <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]
+    <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]
 }

compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.lazy.log

@@ -93,35 +93,35 @@ LazyJavaClassifierType@57['E'] {
     arguments = ArrayList@58[empty]
     classifier = JavaTypeParameterImpl@59['E']
     nullable = 'false': Boolean@34
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
-LazyJavaClassifierType@61['E'] {
-    arguments = ArrayList@62[empty]
-    classifier = JavaTypeParameterImpl@63['E']
+LazyJavaClassifierType@60['E'] {
+    arguments = ArrayList@61[empty]
+    classifier = JavaTypeParameterImpl@62['E']
     nullable = 'false': Boolean@34
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
 }
 
-LazyJavaClassifierType@64['E'] {
-    arguments = ArrayList@65[empty]
-    classifier = JavaTypeParameterImpl@66['E']
+LazyJavaClassifierType@63['E'] {
+    arguments = ArrayList@64[empty]
+    classifier = JavaTypeParameterImpl@65['E']
     nullable = 'false': Boolean@34
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@67['E'] {
     arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@66['E']
+    classifier = JavaTypeParameterImpl@59['E']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@70['E'] {
     arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@55['E']
+    classifier = JavaTypeParameterImpl@65['E']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@72['E'] {
@@ -133,14 +133,14 @@ LazyJavaClassifierType@72['E'] {
 
 LazyJavaClassifierType@74['E'] {
     arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@59['E']
+    classifier = JavaTypeParameterImpl@55['E']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@76['E'] {
     arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@63['E']
+    classifier = JavaTypeParameterImpl@62['E']
     nullable = 'true': Boolean@69
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
 }
@@ -261,16 +261,16 @@ LazyJavaPackageFragment@119['util'] {
 }
 
 LazyJavaTypeParameterDescriptor@20['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
     upperBounds = LinkedHashSet@156[1] { NullableType@157 }
 }
 
 LazyJavaTypeParameterDescriptor@15['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaTypeParameterDescriptor@11['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaTypeParameterResolver@158 {
@@ -278,9 +278,56 @@ LazyJavaTypeParameterResolver@158 {
 }
 
 LazyJavaTypeParameterResolver@160 {
-    resolve(JavaTypeParameterImpl@161['E']) = LazyJavaTypeParameterDescriptor@11['E']
+    resolve(JavaTypeParameterImpl@161['E']) = LazyJavaTypeParameterDescriptor@15['E']
 }
 
 LazyJavaTypeParameterResolver@162 {
-    resolve(JavaTypeParameterImpl@163['E']) = LazyJavaTypeParameterDescriptor@15['E']
+    resolve(JavaTypeParameterImpl@163['E']) = LazyJavaTypeParameterDescriptor@11['E']
+}
+
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@167[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]
+}
+
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+    <name not found> = EmptyList@144[empty]
+    <name not found> = EmptyList@144[empty]
+    <name not found> = EmptyList@144[empty]
+    <name not found> = EmptyList@144[empty]
+}
+
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+    <name not found> = EmptyList@144[empty]
+    <name not found> = EmptyList@144[empty]
+    <name not found> = EmptyList@144[empty]
+    <name not found> = EmptyList@144[empty]
+}
+
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+}
+
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+}
+
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+}
+
+ResolutionTaskHolder@188 {
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
 }

compiler/testData/diagnostics/tests/inference/kt1293.lazy.log

@@ -29,11 +29,61 @@ LazyJavaPackageFragment@7['java'] {
 
 LazyJavaPackageFragment@9['lang'] {
     classes('arrayOfNulls': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('get': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('requiresInt': Name@32) = 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('get': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('requiresInt': Name@32) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@33 // 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> = ArrayList@36[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]
+    <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> = ArrayList@40[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]
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
 }

compiler/testData/diagnostics/tests/inference/kt3184.lazy.log

@@ -12,59 +12,53 @@ LazyJavaClassDescriptor@2['AbstractMap'] {
 LazyJavaClassDescriptor@8['Appendable'] {
     functions('println': Name@9) = EmptyList@4[empty] // through LazyJavaClassMemberScope@10
     memberIndex = computeMemberIndex$1@11 // through LazyJavaClassMemberScope@10
-    properties('println': Name@12) = EmptyList@4[empty] // through LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@13['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@12['Appendable']
 }
 
-LazyJavaClassDescriptor@14['AutoCloseable'] {
-    functions('println': Name@9) = EmptyList@4[empty] // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
-    properties('println': Name@12) = EmptyList@4[empty] // through LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['AutoCloseable']
+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@18['Closeable'] {
-    functions('println': Name@9) = EmptyList@4[empty] // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
-    properties('println': Name@12) = EmptyList@4[empty] // through LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['Closeable']
+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@22['FilterOutputStream'] {
-    functions('println': Name@9) = EmptyList@4[empty] // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@23
-    properties('println': Name@12) = EmptyList@4[empty] // through LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@25['FilterOutputStream']
+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@26['HashMap'] {
-    constructors = ArrayList@27[4] { JavaConstructorDescriptor@28['<init>'], JavaConstructorDescriptor@29['<init>'], JavaConstructorDescriptor@30['<init>'], ... } // through LazyJavaClassMemberScope@31
-    defaultType = JetTypeImpl@32['HashMap<2>']
-    enumEntryIndex = LinkedHashMap@33 // through LazyJavaClassMemberScope@31
+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@31
-    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@31
-    nestedClassIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@31
-    nestedClasses('set': Name@3) = null // through LazyJavaClassMemberScope@31
-    properties('set': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@31
-    typeConstructor = LazyJavaClassTypeConstructor@36['HashMap']
+    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@37['OutputStream'] {
-    functions('println': Name@9) = EmptyList@4[empty] // through LazyJavaClassMemberScope@38
-    memberIndex = computeMemberIndex$1@39 // through LazyJavaClassMemberScope@38
-    properties('println': Name@12) = EmptyList@4[empty] // through LazyJavaClassMemberScope@38
-    typeConstructor = LazyJavaClassTypeConstructor@40['OutputStream']
+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@41['PrintStream'] {
-    defaultType = JetTypeImpl@42['PrintStream']
-    enumEntryIndex = LinkedHashMap@43 // through LazyJavaClassMemberScope@44
-    functions('println': Name@12) = ArrayList@45[10] { JavaMethodDescriptor@46['println'], JavaMethodDescriptor@47['println'], JavaMethodDescriptor@48['println'], ... } // through LazyJavaClassMemberScope@44
-    memberIndex = computeMemberIndex$1@49 // through LazyJavaClassMemberScope@44
-    nestedClassIndex = LinkedHashMap@50 // through LazyJavaClassMemberScope@44
-    nestedClasses('println': Name@12) = null // through LazyJavaClassMemberScope@44
-    properties('println': Name@12) = EmptyList@4[empty] // through LazyJavaClassMemberScope@44
+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']
 }
@@ -92,32 +86,32 @@ LazyJavaClassTypeConstructor@7['AbstractMap'] {
     supertypes = ArrayList@71[1] { LazyJavaClassifierType@72['Map<K, V>'] }
 }
 
-LazyJavaClassTypeConstructor@13['Appendable'] {
+LazyJavaClassTypeConstructor@12['Appendable'] {
     parameters = ArrayList@73[empty]
     supertypes = ArrayList@74[1] { JetTypeImpl@75['Any'] }
 }
 
-LazyJavaClassTypeConstructor@17['AutoCloseable'] {
+LazyJavaClassTypeConstructor@16['AutoCloseable'] {
     parameters = ArrayList@76[empty]
     supertypes = ArrayList@77[1] { JetTypeImpl@75['Any'] }
 }
 
-LazyJavaClassTypeConstructor@21['Closeable'] {
+LazyJavaClassTypeConstructor@20['Closeable'] {
     parameters = ArrayList@78[empty]
     supertypes = ArrayList@79[1] { LazyJavaClassifierType@80['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@25['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@24['FilterOutputStream'] {
     parameters = ArrayList@81[empty]
     supertypes = ArrayList@82[1] { LazyJavaClassifierType@83['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@36['HashMap'] {
+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@40['OutputStream'] {
+LazyJavaClassTypeConstructor@39['OutputStream'] {
     parameters = ArrayList@91[empty]
     supertypes = ArrayList@92[1] { LazyJavaClassifierType@93['Closeable'] }
 }
@@ -147,14 +141,14 @@ LazyJavaClassifierType@97['Appendable'] {
     arguments = ArrayList@107[empty]
     classifier = JavaClassImpl@108['Appendable']
     memberScope = LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@13['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@12['Appendable']
 }
 
 LazyJavaClassifierType@80['AutoCloseable'] {
     arguments = ArrayList@109[empty]
     classifier = JavaClassImpl@110['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['AutoCloseable']
+    memberScope = LazyJavaClassMemberScope@14
+    typeConstructor = LazyJavaClassTypeConstructor@16['AutoCloseable']
 }
 
 LazyJavaClassifierType@90['Cloneable'] {
@@ -167,22 +161,22 @@ LazyJavaClassifierType@90['Cloneable'] {
 LazyJavaClassifierType@98['Closeable'] {
     arguments = ArrayList@115[empty]
     classifier = JavaClassImpl@116['Closeable']
-    memberScope = LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['Closeable']
+    memberScope = LazyJavaClassMemberScope@18
+    typeConstructor = LazyJavaClassTypeConstructor@20['Closeable']
 }
 
 LazyJavaClassifierType@93['Closeable'] {
     arguments = ArrayList@117[empty]
     classifier = JavaClassImpl@118['Closeable']
-    memberScope = LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['Closeable']
+    memberScope = LazyJavaClassMemberScope@18
+    typeConstructor = LazyJavaClassTypeConstructor@20['Closeable']
 }
 
 LazyJavaClassifierType@96['FilterOutputStream'] {
     arguments = ArrayList@119[empty]
     classifier = JavaClassImpl@120['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@25['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@22
+    typeConstructor = LazyJavaClassTypeConstructor@24['FilterOutputStream']
 }
 
 LazyJavaClassifierType@121['Flushable'] {
@@ -201,14 +195,14 @@ LazyJavaClassifierType@128['K'] {
     arguments = ArrayList@129[empty]
     classifier = JavaTypeParameterImpl@130['K']
     nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
-LazyJavaClassifierType@132['K'] {
-    arguments = ArrayList@133[empty]
-    classifier = JavaTypeParameterImpl@134['K']
+LazyJavaClassifierType@131['K'] {
+    arguments = ArrayList@132[empty]
+    classifier = JavaTypeParameterImpl@133['K']
     nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
 }
 
 LazyJavaClassifierType@135['K'] {
@@ -229,12 +223,12 @@ LazyJavaClassifierType@141['K'] {
     arguments = ArrayList@142[empty]
     classifier = JavaTypeParameterImpl@130['K']
     nullable = 'true': Boolean@143
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@144['K'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@134['K']
+    classifier = JavaTypeParameterImpl@140['K']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
@@ -248,14 +242,14 @@ LazyJavaClassifierType@146['K'] {
 
 LazyJavaClassifierType@148['K'] {
     arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@125['K']
+    classifier = JavaTypeParameterImpl@133['K']
     nullable = 'true': Boolean@143
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
 }
 
 LazyJavaClassifierType@150['K'] {
     arguments = ArrayList@151[empty]
-    classifier = JavaTypeParameterImpl@140['K']
+    classifier = JavaTypeParameterImpl@125['K']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
@@ -338,14 +332,14 @@ LazyJavaClassifierType@191['Object'] {
 LazyJavaClassifierType@83['OutputStream'] {
     arguments = ArrayList@193[empty]
     classifier = JavaClassImpl@194['OutputStream']
-    memberScope = LazyJavaClassMemberScope@38
-    typeConstructor = LazyJavaClassTypeConstructor@40['OutputStream']
+    memberScope = LazyJavaClassMemberScope@37
+    typeConstructor = LazyJavaClassTypeConstructor@39['OutputStream']
 }
 
 LazyJavaClassifierType@195['PrintStream'] {
     arguments = ArrayList@196[empty]
     classifier = JavaClassImpl@197['PrintStream']
-    memberScope = LazyJavaClassMemberScope@44
+    memberScope = LazyJavaClassMemberScope@43
     nullable = 'false': Boolean@126
     typeConstructor = LazyJavaClassTypeConstructor@52['PrintStream']
 }
@@ -396,14 +390,14 @@ LazyJavaClassifierType@216['V'] {
     arguments = ArrayList@217[empty]
     classifier = JavaTypeParameterImpl@218['V']
     nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@219
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
 }
 
-LazyJavaClassifierType@220['V'] {
-    arguments = ArrayList@221[empty]
-    classifier = JavaTypeParameterImpl@222['V']
+LazyJavaClassifierType@219['V'] {
+    arguments = ArrayList@220[empty]
+    classifier = JavaTypeParameterImpl@221['V']
     nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@222
 }
 
 LazyJavaClassifierType@223['V'] {
@@ -415,35 +409,35 @@ LazyJavaClassifierType@223['V'] {
 
 LazyJavaClassifierType@226['V'] {
     arguments = ArrayList@227[empty]
-    classifier = JavaTypeParameterImpl@222['V']
+    classifier = JavaTypeParameterImpl@211['V']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
 }
 
 LazyJavaClassifierType@228['V'] {
     arguments = ArrayList@229[empty]
-    classifier = JavaTypeParameterImpl@225['V']
+    classifier = JavaTypeParameterImpl@215['V']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
 }
 
 LazyJavaClassifierType@230['V'] {
     arguments = ArrayList@231[empty]
-    classifier = JavaTypeParameterImpl@218['V']
+    classifier = JavaTypeParameterImpl@221['V']
     nullable = 'true': Boolean@143
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@219
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@222
 }
 
 LazyJavaClassifierType@232['V'] {
     arguments = ArrayList@233[empty]
-    classifier = JavaTypeParameterImpl@211['V']
+    classifier = JavaTypeParameterImpl@225['V']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
 }
 
 LazyJavaClassifierType@234['V'] {
     arguments = ArrayList@235[empty]
-    classifier = JavaTypeParameterImpl@215['V']
+    classifier = JavaTypeParameterImpl@218['V']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
 }
@@ -497,12 +491,12 @@ LazyJavaPackageFragmentProvider@236 {
     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@14['AutoCloseable']
-    topLevelClasses(JavaClassImpl@116['Closeable']) = LazyJavaClassDescriptor@18['Closeable']
-    topLevelClasses(JavaClassImpl@120['FilterOutputStream']) = LazyJavaClassDescriptor@22['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@288['HashMap']) = LazyJavaClassDescriptor@26['HashMap']
-    topLevelClasses(JavaClassImpl@194['OutputStream']) = LazyJavaClassDescriptor@37['OutputStream']
-    topLevelClasses(JavaClassImpl@197['PrintStream']) = LazyJavaClassDescriptor@41['PrintStream']
+    topLevelClasses(JavaClassImpl@110['AutoCloseable']) = LazyJavaClassDescriptor@13['AutoCloseable']
+    topLevelClasses(JavaClassImpl@116['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']
 }
@@ -522,53 +516,286 @@ LazyJavaPackageFragment@263['lang'] {
     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('put': Name@303) = null // through LazyPackageFragmentScopeForJavaPackage@298
     classes('set': Name@3) = null // through LazyPackageFragmentScopeForJavaPackage@298
-    classes('test': Name@304) = 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('put': Name@303) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@298
     functions('set': Name@3) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@298
-    functions('test': Name@304) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@298
-    memberIndex = computeMemberIndex$1@305 // 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@306) = LazyJavaClassDescriptor@26['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@307
-    deserializedPackageScope = Empty@293 // through LazyPackageFragmentScopeForJavaPackage@307
-    functions('HashMap': Name@308) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@307
-    memberIndex = computeMemberIndex$1@309 // through LazyPackageFragmentScopeForJavaPackage@307
+    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@310['K']
+    defaultType = JetTypeImpl@309['K']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-    upperBounds = LinkedHashSet@311[1] { NullableType@312 }
+    upperBounds = LinkedHashSet@310[1] { NullableType@311 }
 }
 
 LazyJavaTypeParameterDescriptor@69['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
 }
 
 LazyJavaTypeParameterDescriptor@86['V'] {
-    defaultType = JetTypeImpl@313['V']
+    defaultType = JetTypeImpl@312['V']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
-    upperBounds = LinkedHashSet@314[1] { NullableType@315 }
+    upperBounds = LinkedHashSet@313[1] { NullableType@314 }
 }
 
 LazyJavaTypeParameterDescriptor@70['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@219
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@222
 }
 
-LazyJavaTypeParameterResolver@316 {
-    resolve(JavaTypeParameterImpl@317['K']) = LazyJavaTypeParameterDescriptor@69['K']
-    resolve(JavaTypeParameterImpl@318['V']) = LazyJavaTypeParameterDescriptor@70['V']
+LazyJavaTypeParameterResolver@315 {
+    resolve(JavaTypeParameterImpl@316['K']) = LazyJavaTypeParameterDescriptor@69['K']
+    resolve(JavaTypeParameterImpl@317['V']) = LazyJavaTypeParameterDescriptor@70['V']
 }
 
-LazyJavaTypeParameterResolver@319 {
-    resolve(JavaTypeParameterImpl@320['K']) = LazyJavaTypeParameterDescriptor@85['K']
-    resolve(JavaTypeParameterImpl@321['V']) = LazyJavaTypeParameterDescriptor@86['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, ... }
+    <name not found> = ArrayList@326[10] { ResolutionCandidate@323, ResolutionCandidate@324, ResolutionCandidate@325, ... }
+}
+
+ResolutionTaskHolder@327 {
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@329 }
+    <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@331 {
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@333 }
+    <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@335 {
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@337 }
+    <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@339 {
+    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
+    <name not found> = ArrayList@342[1] { ResolutionCandidate@341 }
+    <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@343 {
+    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
+    <name not found> = ArrayList@346[1] { ResolutionCandidate@345 }
+    <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@347 {
+    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
+    <name not found> = ArrayList@350[1] { ResolutionCandidate@349 }
+    <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@351 {
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@353 }
+    <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@355 {
+    <name not found> = ArrayList@356[1] { ResolutionCandidate@357 }
+    <name not found> = ArrayList@358[1] { ResolutionCandidate@357 }
+    <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@359 {
+    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
+    <name not found> = ArrayList@362[1] { ResolutionCandidate@361 }
+    <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@363 {
+    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@365 }
+    <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@367 {
+    <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
+    <name not found> = ArrayList@370[1] { ResolutionCandidate@369 }
+    <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@371 {
+    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@373 }
+    <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@375 {
+    <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
+    <name not found> = ArrayList@378[1] { ResolutionCandidate@377 }
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+}
+
+ResolutionTaskHolder@379 {
+    <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
+    <name not found> = ArrayList@382[1] { ResolutionCandidate@381 }
+}
+
+ResolutionTaskHolder@383 {
+    <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
+    <name not found> = ArrayList@386[1] { ResolutionCandidate@385 }
+}
+
+ResolutionTaskHolder@387 {
+    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
+    <name not found> = ArrayList@390[1] { ResolutionCandidate@389 }
+}
+
+ResolutionTaskHolder@391 {
+    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
+    <name not found> = ArrayList@394[1] { ResolutionCandidate@393 }
+}
+
+ResolutionTaskHolder@395 {
+    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
+    <name not found> = ArrayList@398[1] { ResolutionCandidate@397 }
+}
+
+ResolutionTaskHolder@399 {
+    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@401 }
+}
+
+ResolutionTaskHolder@403 {
+    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
+    <name not found> = ArrayList@406[1] { ResolutionCandidate@405 }
+}
+
+ResolutionTaskHolder@407 {
+    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
+    <name not found> = ArrayList@410[1] { ResolutionCandidate@409 }
+}
+
+ResolutionTaskHolder@411 {
+    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
+    <name not found> = ArrayList@414[1] { ResolutionCandidate@413 }
+}
+
+ResolutionTaskHolder@415 {
+    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
+    <name not found> = ArrayList@418[1] { ResolutionCandidate@417 }
+}
+
+ResolutionTaskHolder@419 {
+    <name not found> = ArrayList@420[1] { ResolutionCandidate@421 }
+    <name not found> = ArrayList@422[1] { ResolutionCandidate@421 }
+}
+
+ResolutionTaskHolder@423 {
+    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
+    <name not found> = ArrayList@426[1] { ResolutionCandidate@425 }
+}
+
+ResolutionTaskHolder@427 {
+    <name not found> = ArrayList@428[1] { ResolutionCandidate@429 }
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@429 }
+}
+
+ResolutionTaskHolder@431 {
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@433 }
+    <name not found> = ArrayList@434[1] { ResolutionCandidate@433 }
+}
+
+ResolutionTaskHolder@435 {
+    <name not found> = ArrayList@436[1] { ResolutionCandidate@437 }
+    <name not found> = ArrayList@438[1] { ResolutionCandidate@437 }
+}
+
+ResolutionTaskHolder@439 {
+    <name not found> = ArrayList@440[4] { ResolutionCandidate@441, ResolutionCandidate@442, ResolutionCandidate@443, ... }
+    <name not found> = ArrayList@444[4] { ResolutionCandidate@441, ResolutionCandidate@442, ResolutionCandidate@443, ... }
+    <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@445 {
+    <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]
 }

compiler/testData/diagnostics/tests/inference/kt619.lazy.log

@@ -24,22 +24,36 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Comparable': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': 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
+    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('minus': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('minus': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
+    <name not found> = ArrayList@52[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
 }

compiler/testData/diagnostics/tests/inference/listConstructor.lazy.log

@@ -96,77 +96,77 @@ LazyJavaClassifierType@64['E'] {
     arguments = ArrayList@65[empty]
     classifier = JavaTypeParameterImpl@66['E']
     nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
-LazyJavaClassifierType@68['E'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@70['E']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
-}
-
-LazyJavaClassifierType@72['E'] {
-    arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@74['E']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
-}
-
-LazyJavaClassifierType@75['E'] {
-    arguments = ArrayList@76[empty]
-    classifier = JavaTypeParameterImpl@77['E']
+LazyJavaClassifierType@67['E'] {
+    arguments = ArrayList@68[empty]
+    classifier = JavaTypeParameterImpl@69['E']
     nullable = 'false': Boolean@48
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
+LazyJavaClassifierType@70['E'] {
+    arguments = ArrayList@71[empty]
+    classifier = JavaTypeParameterImpl@72['E']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+}
+
+LazyJavaClassifierType@74['E'] {
+    arguments = ArrayList@75[empty]
+    classifier = JavaTypeParameterImpl@76['E']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+}
+
 LazyJavaClassifierType@78['E'] {
     arguments = ArrayList@79[empty]
     classifier = JavaTypeParameterImpl@80['E']
     nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
 LazyJavaClassifierType@81['E'] {
     arguments = ArrayList@82[empty]
-    classifier = JavaTypeParameterImpl@77['E']
+    classifier = JavaTypeParameterImpl@62['E']
     nullable = 'true': Boolean@54
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
 LazyJavaClassifierType@83['E'] {
     arguments = ArrayList@84[empty]
-    classifier = JavaTypeParameterImpl@74['E']
-    nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
-}
-
-LazyJavaClassifierType@85['E'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaTypeParameterImpl@62['E']
+    classifier = JavaTypeParameterImpl@66['E']
     nullable = 'true': Boolean@54
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
+LazyJavaClassifierType@85['E'] {
+    arguments = ArrayList@86[empty]
+    classifier = JavaTypeParameterImpl@80['E']
+    nullable = 'true': Boolean@54
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+}
+
 LazyJavaClassifierType@87['E'] {
     arguments = ArrayList@88[empty]
-    classifier = JavaTypeParameterImpl@80['E']
+    classifier = JavaTypeParameterImpl@69['E']
     nullable = 'true': Boolean@54
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
 LazyJavaClassifierType@89['E'] {
     arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@70['E']
+    classifier = JavaTypeParameterImpl@76['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
 LazyJavaClassifierType@91['E'] {
     arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@66['E']
+    classifier = JavaTypeParameterImpl@72['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaClassifierType@24['List<E>'] {
@@ -289,82 +289,213 @@ LazyJavaPackageFragment@135['java'] {
 
 LazyJavaPackageFragment@139['lang'] {
     classes('ArrayList': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('add': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('arrayList': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('cons': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('hasNext': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('iterator': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('next': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('nil': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('size': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('toCollection': Name@199) = 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('add': Name@191) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('arrayList': Name@192) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('cons': Name@193) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('hasNext': Name@194) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('iterator': Name@195) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('next': Name@196) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('nil': Name@197) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('size': Name@198) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('toCollection': Name@199) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    memberIndex = computeMemberIndex$1@200 // 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@201) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('Array': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('ArrayList': Name@204) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('Int': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('List': Name@206) = LazyJavaClassDescriptor@180['List'] // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('MutableCollection': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('String': Name@208) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('add': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('arrayList': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('cons': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('hasNext': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('iterator': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('next': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('nil': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('size': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('toCollection': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    deserializedPackageScope = Empty@184 // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('ArrayList': Name@189) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('add': Name@191) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('arrayList': Name@192) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('cons': Name@193) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('hasNext': Name@194) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('iterator': Name@195) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('next': Name@196) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('nil': Name@197) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('size': Name@198) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('toCollection': Name@199) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    memberIndex = computeMemberIndex$1@209 // through LazyPackageFragmentScopeForJavaPackage@202
+    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@210['E']
+    defaultType = JetTypeImpl@205['E']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-    upperBounds = LinkedHashSet@211[1] { NullableType@212 }
+    upperBounds = LinkedHashSet@206[1] { NullableType@207 }
 }
 
 LazyJavaTypeParameterDescriptor@17['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaTypeParameterDescriptor@21['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
-LazyJavaTypeParameterResolver@213 {
-    resolve(JavaTypeParameterImpl@74['E']) = LazyJavaTypeParameterDescriptor@21['E']
+LazyJavaTypeParameterResolver@208 {
+    resolve(JavaTypeParameterImpl@209['E']) = LazyJavaTypeParameterDescriptor@26['E']
 }
 
-LazyJavaTypeParameterResolver@214 {
-    resolve(JavaTypeParameterImpl@215['E']) = LazyJavaTypeParameterDescriptor@26['E']
+LazyJavaTypeParameterResolver@210 {
+    resolve(JavaTypeParameterImpl@80['E']) = LazyJavaTypeParameterDescriptor@21['E']
 }
 
-LazyJavaTypeParameterResolver@216 {
-    resolve(JavaTypeParameterImpl@217['E']) = LazyJavaTypeParameterDescriptor@17['E']
+LazyJavaTypeParameterResolver@211 {
+    resolve(JavaTypeParameterImpl@212['E']) = LazyJavaTypeParameterDescriptor@17['E']
+}
+
+ResolutionTaskHolder@213 {
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
+    <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@217 {
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
+    <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@221 {
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
+    <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@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
+    <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@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
+    <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@233 {
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
+    <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@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
+    <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@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@243 }
+    <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@245 {
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
+}
+
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@251 }
+}
+
+ResolutionTaskHolder@253 {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@255 }
+}
+
+ResolutionTaskHolder@257 {
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@259 }
+}
+
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@263 }
+}
+
+ResolutionTaskHolder@265 {
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@267 }
+}
+
+ResolutionTaskHolder@269 {
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@271 }
+}
+
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@275 }
+}
+
+ResolutionTaskHolder@277 {
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@279 }
+}
+
+ResolutionTaskHolder@281 {
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@283 }
+}
+
+ResolutionTaskHolder@285 {
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@287 }
+}
+
+ResolutionTaskHolder@289 {
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@291 }
+}
+
+ResolutionTaskHolder@293 {
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@295 }
+}
+
+ResolutionTaskHolder@297 {
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@299 }
+}
+
+ResolutionTaskHolder@301 {
+    <name not found> = ArrayList@302[3] { ResolutionCandidate@303, ResolutionCandidate@304, ResolutionCandidate@305 }
+    <name not found> = ArrayList@306[3] { ResolutionCandidate@303, ResolutionCandidate@304, ResolutionCandidate@305 }
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
 }

compiler/testData/diagnostics/tests/inference/mapFunction.lazy.log

@@ -57,30 +57,109 @@ LazyJavaPackageFragment@19['java'] {
 LazyJavaPackageFragment@21['lang'] {
     classes('array': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
     classes('map': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('rangeTo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('times': Name@62) = 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
-    functions('rangeTo': Name@61) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('times': Name@62) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@59
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@30['util'] {
-    classes('Array': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Int': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Iterable': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('List': Name@68) = LazyJavaClassDescriptor@49['List'] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('String': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('array': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('map': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('rangeTo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('times': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('array': Name@58) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('map': Name@60) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('rangeTo': Name@61) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('times': Name@62) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@65
+    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> = ArrayList@72[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]
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[2] { ResolutionCandidate@111, ResolutionCandidate@112 }
+    <name not found> = ArrayList@113[2] { ResolutionCandidate@111, ResolutionCandidate@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]
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[2] { ResolutionCandidate@116, ResolutionCandidate@117 }
+    <name not found> = ArrayList@118[2] { ResolutionCandidate@116, ResolutionCandidate@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]
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[7] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
+    <name not found> = ArrayList@124[7] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
+}
+
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[7] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
+    <name not found> = ArrayList@130[7] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
+    <name not found> = ArrayList@136[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
 }

compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.lazy.log

@@ -94,3 +94,46 @@ LazyJavaTypeParameterDescriptor@3['T'] {
 LazyJavaTypeParameterResolver@77 {
     resolve(JavaTypeParameterImpl@78['T']) = LazyJavaTypeParameterDescriptor@3['T']
 }
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[2] { ResolutionCandidate@101, ResolutionCandidate@102 }
+    <name not found> = ArrayList@103[2] { ResolutionCandidate@101, 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]
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
+    <name not found> = ArrayList@108[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+}

compiler/testData/diagnostics/tests/inference/nestedCalls/arrayAccess.lazy.log

@@ -37,7 +37,7 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -51,7 +51,7 @@ LazyJavaClassifierType@27['String'] {
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -141,10 +141,58 @@ LazyJavaPackageFragment@62['java'] {
 LazyJavaPackageFragment@64['lang'] {
     classes('Exception': Name@83) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@84
     classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('get': Name@86) = 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
-    functions('get': Name@86) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@84
+    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+    <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@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[4] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+    <name not found> = ArrayList@112[5] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+    <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]
 }

compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.lazy.log

@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -86,14 +86,14 @@ LazyJavaClassifierType@41['Throwable'] {
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -153,24 +153,702 @@ LazyJavaPackageFragment@68['java'] {
 LazyJavaPackageFragment@70['lang'] {
     classes('Exception': Name@95) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@96
     classes('compareTo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('contains': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('equals': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('foo': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('id': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('newA': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('plus': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('toBeOrNot': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('use': Name@105) = 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('contains': Name@98) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('equals': Name@99) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('foo': Name@100) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('id': Name@101) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('newA': Name@102) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('plus': Name@103) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('toBeOrNot': Name@104) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('use': Name@105) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@106 // 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> = ArrayList@108[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]
+    <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@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+    <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]
+}
+
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+    <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@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+    <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@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+    <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@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+    <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@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+    <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@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
+    <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@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+    <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@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
+    <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@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+    <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@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+    <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@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
+    <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@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+    <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@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
+    <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@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
+    <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@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
+    <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@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
+    <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@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
+    <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@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
+    <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@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
+    <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@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
+    <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@193 {
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
+    <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@197 {
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
+    <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@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@203 }
+    <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@205 {
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@207 }
+    <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@209 {
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
+    <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@213 {
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
+    <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@217 {
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
+    <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@221 {
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
+    <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@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
+    <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@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
+    <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@233 {
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
+    <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@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
+    <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@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@243 }
+    <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@245 {
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
+    <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@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@251 }
+    <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@253 {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@255 }
+    <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@257 {
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@259 }
+    <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@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@263 }
+    <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@265 {
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@267 }
+    <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@269 {
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@271 }
+    <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@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@275 }
+    <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@277 {
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@279 }
+    <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@281 {
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@283 }
+    <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@285 {
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@287 }
+}
+
+ResolutionTaskHolder@289 {
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@291 }
+}
+
+ResolutionTaskHolder@293 {
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@295 }
+}
+
+ResolutionTaskHolder@297 {
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@299 }
+}
+
+ResolutionTaskHolder@301 {
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@303 }
+}
+
+ResolutionTaskHolder@305 {
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@307 }
+}
+
+ResolutionTaskHolder@309 {
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@311 }
+}
+
+ResolutionTaskHolder@313 {
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@315 }
+}
+
+ResolutionTaskHolder@317 {
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@319 }
+}
+
+ResolutionTaskHolder@321 {
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@323 }
+}
+
+ResolutionTaskHolder@325 {
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@327 }
+}
+
+ResolutionTaskHolder@329 {
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@331 }
+}
+
+ResolutionTaskHolder@333 {
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@335 }
+}
+
+ResolutionTaskHolder@337 {
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
+    <name not found> = ArrayList@340[1] { ResolutionCandidate@339 }
+}
+
+ResolutionTaskHolder@341 {
+    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
+    <name not found> = ArrayList@344[1] { ResolutionCandidate@343 }
+}
+
+ResolutionTaskHolder@345 {
+    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
+    <name not found> = ArrayList@348[1] { ResolutionCandidate@347 }
+}
+
+ResolutionTaskHolder@349 {
+    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@351 }
+}
+
+ResolutionTaskHolder@353 {
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
+    <name not found> = ArrayList@356[1] { ResolutionCandidate@355 }
+}
+
+ResolutionTaskHolder@357 {
+    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
+    <name not found> = ArrayList@360[1] { ResolutionCandidate@359 }
+}
+
+ResolutionTaskHolder@361 {
+    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
+    <name not found> = ArrayList@364[1] { ResolutionCandidate@363 }
+}
+
+ResolutionTaskHolder@365 {
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
+    <name not found> = ArrayList@368[1] { ResolutionCandidate@367 }
+}
+
+ResolutionTaskHolder@369 {
+    <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
+    <name not found> = ArrayList@372[1] { ResolutionCandidate@371 }
+}
+
+ResolutionTaskHolder@373 {
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
+    <name not found> = ArrayList@376[1] { ResolutionCandidate@375 }
+}
+
+ResolutionTaskHolder@377 {
+    <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
+    <name not found> = ArrayList@380[1] { ResolutionCandidate@379 }
+}
+
+ResolutionTaskHolder@381 {
+    <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
+    <name not found> = ArrayList@384[1] { ResolutionCandidate@383 }
+}
+
+ResolutionTaskHolder@385 {
+    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
+    <name not found> = ArrayList@388[1] { ResolutionCandidate@387 }
+}
+
+ResolutionTaskHolder@389 {
+    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
+    <name not found> = ArrayList@392[1] { ResolutionCandidate@391 }
+}
+
+ResolutionTaskHolder@393 {
+    <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
+    <name not found> = ArrayList@396[1] { ResolutionCandidate@395 }
+}
+
+ResolutionTaskHolder@397 {
+    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
+    <name not found> = ArrayList@400[1] { ResolutionCandidate@399 }
+}
+
+ResolutionTaskHolder@401 {
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
+    <name not found> = ArrayList@404[1] { ResolutionCandidate@403 }
+}
+
+ResolutionTaskHolder@405 {
+    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
+    <name not found> = ArrayList@408[1] { ResolutionCandidate@407 }
+}
+
+ResolutionTaskHolder@409 {
+    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
+    <name not found> = ArrayList@412[1] { ResolutionCandidate@411 }
+}
+
+ResolutionTaskHolder@413 {
+    <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
+    <name not found> = ArrayList@416[1] { ResolutionCandidate@415 }
+}
+
+ResolutionTaskHolder@417 {
+    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
+    <name not found> = ArrayList@420[1] { ResolutionCandidate@419 }
+}
+
+ResolutionTaskHolder@421 {
+    <name not found> = ArrayList@422[1] { ResolutionCandidate@423 }
+    <name not found> = ArrayList@424[1] { ResolutionCandidate@423 }
+}
+
+ResolutionTaskHolder@425 {
+    <name not found> = ArrayList@426[1] { ResolutionCandidate@427 }
+    <name not found> = ArrayList@428[1] { ResolutionCandidate@427 }
+}
+
+ResolutionTaskHolder@429 {
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@431 }
+}
+
+ResolutionTaskHolder@433 {
+    <name not found> = ArrayList@434[1] { ResolutionCandidate@435 }
+    <name not found> = ArrayList@436[1] { ResolutionCandidate@435 }
+}
+
+ResolutionTaskHolder@437 {
+    <name not found> = ArrayList@438[2] { ResolutionCandidate@439, ResolutionCandidate@440 }
+    <name not found> = ArrayList@441[2] { ResolutionCandidate@439, ResolutionCandidate@440 }
+    <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@442 {
+    <name not found> = ArrayList@443[2] { ResolutionCandidate@444, ResolutionCandidate@445 }
+    <name not found> = ArrayList@446[2] { ResolutionCandidate@444, ResolutionCandidate@445 }
+    <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@447 {
+    <name not found> = ArrayList@448[2] { ResolutionCandidate@449, ResolutionCandidate@450 }
+    <name not found> = ArrayList@451[2] { ResolutionCandidate@449, ResolutionCandidate@450 }
+    <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@452 {
+    <name not found> = ArrayList@453[2] { ResolutionCandidate@454, ResolutionCandidate@455 }
+    <name not found> = ArrayList@456[2] { ResolutionCandidate@454, ResolutionCandidate@455 }
+    <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@457 {
+    <name not found> = ArrayList@458[2] { ResolutionCandidate@459, ResolutionCandidate@460 }
+    <name not found> = ArrayList@461[2] { ResolutionCandidate@459, ResolutionCandidate@460 }
+    <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@462 {
+    <name not found> = ArrayList@463[4] { ResolutionCandidate@464, ResolutionCandidate@465, ResolutionCandidate@466, ... }
+    <name not found> = ArrayList@467[5] { ResolutionCandidate@464, ResolutionCandidate@465, ResolutionCandidate@466, ... }
+    <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@468 {
+    <name not found> = ArrayList@469[4] { ResolutionCandidate@470, ResolutionCandidate@471, ResolutionCandidate@472, ... }
+    <name not found> = ArrayList@473[5] { ResolutionCandidate@470, ResolutionCandidate@471, ResolutionCandidate@472, ... }
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
+    <name not found> = EmptyList@93[empty]
 }

compiler/testData/diagnostics/tests/inference/nestedCalls/checkTypesForQualifiedProperties.lazy.log

@@ -37,3 +37,41 @@ LazyJavaPackageFragment@15['lang'] {
     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> = ArrayList@37[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]
+    <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> = ArrayList@41[1] { ResolutionCandidate@40 }
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+}

compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.lazy.log

@@ -30,29 +30,78 @@ 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('put': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('set': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('put': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('set': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@35 // 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@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
+    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@40
-    classes('put': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('set': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('foo': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('put': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('set': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+    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> = ArrayList@44[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]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[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]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
 }

compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.lazy.log

@@ -2,59 +2,54 @@ 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
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@7['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@8['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
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@17
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
+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@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
+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@7) = ArrayList@29[2] { JavaMethodDescriptor@30['add'], JavaMethodDescriptor@31['add'] } // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@32 // through LazyJavaClassMemberScope@26
-    nestedClassIndex = LinkedHashMap@33 // through LazyJavaClassMemberScope@26
-    nestedClasses('add': Name@7) = null // through LazyJavaClassMemberScope@26
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@26
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@34['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@35['ArrayList']
+    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@36['RandomAccess'] {
-    functions('add': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@37
+LazyJavaClassDescriptor@35['RandomAccess'] {
+    functions('add': Name@11) = EmptyList@36[empty] // through LazyJavaClassMemberScope@37
     memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@37
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@37
     typeConstructor = LazyJavaClassTypeConstructor@39['RandomAccess']
 }
 
 LazyJavaClassDescriptor@40['Serializable'] {
-    functions('add': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@41
+    functions('add': Name@11) = EmptyList@36[empty] // through LazyJavaClassMemberScope@41
     memberIndex = computeMemberIndex$1@42 // through LazyJavaClassMemberScope@41
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@41
     typeConstructor = LazyJavaClassTypeConstructor@43['Serializable']
 }
 
-LazyJavaClassTypeConstructor@10['AbstractCollection'] {
+LazyJavaClassTypeConstructor@8['AbstractCollection'] {
     parameters = ArrayList@44[1] { LazyJavaTypeParameterDescriptor@45['E'] }
     supertypes = ArrayList@46[1] { LazyJavaClassifierType@47['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@20['AbstractList'] {
+LazyJavaClassTypeConstructor@18['AbstractList'] {
     parameters = ArrayList@48[1] { LazyJavaTypeParameterDescriptor@49['E'] }
     supertypes = ArrayList@50[2] { LazyJavaClassifierType@51['AbstractCollection<E>'], LazyJavaClassifierType@52['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@35['ArrayList'] {
+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'], ... }
 }
@@ -73,14 +68,14 @@ LazyJavaClassifierType@51['AbstractCollection<E>'] {
     arguments = ArrayList@64[1] { TypeProjectionImpl@65 }
     classifier = JavaClassImpl@66['AbstractCollection']
     memberScope = SubstitutingScope@67
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
 }
 
 LazyJavaClassifierType@56['AbstractList<E>'] {
     arguments = ArrayList@68[1] { TypeProjectionImpl@69 }
     classifier = JavaClassImpl@70['AbstractList']
     memberScope = SubstitutingScope@71
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractList']
 }
 
 LazyJavaClassifierType@72['Cloneable'] {
@@ -131,7 +126,7 @@ LazyJavaClassifierType@102['E'] {
     arguments = ArrayList@103[empty]
     classifier = JavaTypeParameterImpl@104['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@105['E'] {
@@ -145,14 +140,14 @@ LazyJavaClassifierType@109['E'] {
     arguments = ArrayList@110[empty]
     classifier = JavaTypeParameterImpl@111['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@112['E'] {
     arguments = ArrayList@113[empty]
     classifier = JavaTypeParameterImpl@114['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@115['E'] {
@@ -166,7 +161,7 @@ LazyJavaClassifierType@118['E'] {
     arguments = ArrayList@119[empty]
     classifier = JavaTypeParameterImpl@120['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@121['E'] {
@@ -180,14 +175,14 @@ LazyJavaClassifierType@124['E'] {
     arguments = ArrayList@125[empty]
     classifier = JavaTypeParameterImpl@126['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@127['E'] {
     arguments = ArrayList@128[empty]
     classifier = JavaTypeParameterImpl@129['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@130['E'] {
@@ -199,96 +194,96 @@ LazyJavaClassifierType@130['E'] {
 
 LazyJavaClassifierType@133['E'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@107['E']
+    classifier = JavaTypeParameterImpl@120['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@135['E'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@117['E']
+    classifier = JavaTypeParameterImpl@132['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@137['E'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@96['E']
+    classifier = JavaTypeParameterImpl@126['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@139['E'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@100['E']
+    classifier = JavaTypeParameterImpl@107['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@141['E'] {
     arguments = ArrayList@142[empty]
     classifier = JavaTypeParameterImpl@111['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@143['E'] {
     arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@129['E']
+    classifier = JavaTypeParameterImpl@96['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@145['E'] {
     arguments = ArrayList@146[empty]
-    classifier = JavaTypeParameterImpl@114['E']
+    classifier = JavaTypeParameterImpl@100['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@147['E'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@104['E']
+    classifier = JavaTypeParameterImpl@123['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@149['E'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@120['E']
+    classifier = JavaTypeParameterImpl@129['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@151['E'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@132['E']
+    classifier = JavaTypeParameterImpl@114['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@153['E'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@123['E']
+    classifier = JavaTypeParameterImpl@117['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@155['E'] {
     arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@126['E']
+    classifier = JavaTypeParameterImpl@104['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
-LazyJavaClassifierType@52['List<E>'] {
+LazyJavaClassifierType@57['List<E>'] {
     arguments = ArrayList@157[1] { TypeProjectionImpl@158 }
     classifier = JavaClassImpl@159['List']
     memberScope = SubstitutingScope@160
     typeConstructor = DeserializedClassTypeConstructor@161
 }
 
-LazyJavaClassifierType@57['List<E>'] {
+LazyJavaClassifierType@52['List<E>'] {
     arguments = ArrayList@162[1] { TypeProjectionImpl@163 }
     classifier = JavaClassImpl@164['List']
     memberScope = SubstitutingScope@165
@@ -364,9 +359,9 @@ LazyJavaPackageFragmentProvider@178 {
     packageFragments('kotlin.io': FqName@220) = null
     packageFragments('kotlin.jvm': FqName@221) = null
     topLevelClasses(JavaClassImpl@66['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@70['AbstractList']) = LazyJavaClassDescriptor@11['AbstractList']
-    topLevelClasses(JavaClassImpl@222['ArrayList']) = LazyJavaClassDescriptor@21['ArrayList']
-    topLevelClasses(JavaClassImpl@174['RandomAccess']) = LazyJavaClassDescriptor@36['RandomAccess']
+    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']
 }
 
@@ -374,86 +369,168 @@ 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@8[empty] // through LazyPackageFragmentScopeForJavaPackage@224
-    functions('util': Name@228) = EmptyList@8[empty] // 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
-    classes('add': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@231
-    classes('hasNext': Name@233) = null // through LazyPackageFragmentScopeForJavaPackage@231
-    classes('inc': Name@234) = null // through LazyPackageFragmentScopeForJavaPackage@231
-    classes('iterator': Name@235) = null // through LazyPackageFragmentScopeForJavaPackage@231
-    classes('next': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@231
     deserializedPackageScope = Empty@226 // through LazyPackageFragmentScopeForJavaPackage@231
-    functions('ArrayList': Name@230) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@231
-    functions('Pair': Name@232) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@231
-    functions('add': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@231
-    functions('hasNext': Name@233) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@231
-    functions('inc': Name@234) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@231
-    functions('iterator': Name@235) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@231
-    functions('next': Name@236) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@231
-    memberIndex = computeMemberIndex$1@237 // 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@238) = LazyJavaClassDescriptor@21['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@239
-    deserializedPackageScope = Empty@226 // through LazyPackageFragmentScopeForJavaPackage@239
-    functions('ArrayList': Name@240) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    memberIndex = computeMemberIndex$1@241 // through LazyPackageFragmentScopeForJavaPackage@239
-}
-
-LazyJavaTypeParameterDescriptor@54['E'] {
-    defaultType = JetTypeImpl@242['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-    upperBounds = LinkedHashSet@243[1] { NullableType@244 }
-    upperBoundsAsType = NullableType@244
-}
-
-LazyJavaTypeParameterDescriptor@49['E'] {
-    defaultType = JetTypeImpl@245['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-    upperBounds = LinkedHashSet@246[1] { NullableType@247 }
-    upperBoundsAsType = NullableType@247
+    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@45['E'] {
-    defaultType = JetTypeImpl@248['E']
+    defaultType = JetTypeImpl@238['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    upperBounds = LinkedHashSet@239[1] { NullableType@240 }
+    upperBoundsAsType = NullableType@240
+}
+
+LazyJavaTypeParameterDescriptor@49['E'] {
+    defaultType = JetTypeImpl@241['E']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-    upperBounds = LinkedHashSet@249[1] { NullableType@250 }
-    upperBoundsAsType = NullableType@250
+    upperBounds = LinkedHashSet@242[1] { NullableType@243 }
+    upperBoundsAsType = NullableType@243
+}
+
+LazyJavaTypeParameterDescriptor@54['E'] {
+    defaultType = JetTypeImpl@244['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    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@54['E']
 }
 
 LazyJavaTypeParameterResolver@251 {
-    resolve(JavaTypeParameterImpl@252['E']) = LazyJavaTypeParameterDescriptor@54['E']
+    resolve(JavaTypeParameterImpl@252['E']) = LazyJavaTypeParameterDescriptor@45['E']
 }
 
 LazyJavaTypeParameterResolver@253 {
-    resolve(JavaTypeParameterImpl@254['E']) = LazyJavaTypeParameterDescriptor@45['E']
+    resolve(JavaTypeParameterImpl@114['E']) = null
+}
+
+LazyJavaTypeParameterResolver@254 {
+    resolve(JavaTypeParameterImpl@132['E']) = null
 }
 
 LazyJavaTypeParameterResolver@255 {
-    resolve(JavaTypeParameterImpl@256['E']) = LazyJavaTypeParameterDescriptor@49['E']
+    resolve(JavaTypeParameterImpl@129['E']) = null
+}
+
+LazyJavaTypeParameterResolver@256 {
+    resolve(JavaTypeParameterImpl@123['E']) = null
 }
 
 LazyJavaTypeParameterResolver@257 {
-    resolve(JavaTypeParameterImpl@117['E']) = null
-}
-
-LazyJavaTypeParameterResolver@258 {
-    resolve(JavaTypeParameterImpl@107['E']) = null
-}
-
-LazyJavaTypeParameterResolver@259 {
-    resolve(JavaTypeParameterImpl@100['E']) = null
-}
-
-LazyJavaTypeParameterResolver@260 {
     resolve(JavaTypeParameterImpl@96['E']) = null
 }
 
-LazyJavaTypeParameterResolver@261 {
-    resolve(JavaTypeParameterImpl@120['E']) = null
+ResolutionTaskHolder@258 {
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@261[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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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@262 {
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@264 }
+}
+
+ResolutionTaskHolder@266 {
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@268 }
+}
+
+ResolutionTaskHolder@270 {
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@272 }
+}
+
+ResolutionTaskHolder@274 {
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@276 }
+}
+
+ResolutionTaskHolder@278 {
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@280 }
+}
+
+ResolutionTaskHolder@282 {
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@284 }
+}
+
+ResolutionTaskHolder@286 {
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@288 }
+}
+
+ResolutionTaskHolder@290 {
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@292 }
+}
+
+ResolutionTaskHolder@294 {
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@296 }
+}
+
+ResolutionTaskHolder@298 {
+    <name not found> = ArrayList@299[2] { ResolutionCandidate@300, ResolutionCandidate@301 }
+    <name not found> = ArrayList@302[2] { ResolutionCandidate@300, ResolutionCandidate@301 }
+}
+
+ResolutionTaskHolder@303 {
+    <name not found> = ArrayList@304[3] { ResolutionCandidate@305, ResolutionCandidate@306, ResolutionCandidate@307 }
+    <name not found> = ArrayList@308[3] { ResolutionCandidate@305, ResolutionCandidate@306, ResolutionCandidate@307 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }

compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedForVariableAsFunctionCall.lazy.log

@@ -37,14 +37,14 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,21 +79,21 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -148,15 +148,71 @@ LazyJavaPackageFragment@66['java'] {
 
 LazyJavaPackageFragment@68['lang'] {
     classes('Exception': Name@91) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('b': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('id': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('invoke': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('plus': Name@96) = null // 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('b': Name@93) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('id': Name@94) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('invoke': Name@95) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('plus': Name@96) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@97 // 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> = ArrayList@98[1] { ResolutionCandidate@97 }
+    <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> = ArrayList@102[1] { ResolutionCandidate@101 }
+    <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> = ArrayList@106[1] { ResolutionCandidate@105 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+}
+
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+}
+
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[4] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
+    <name not found> = ArrayList@124[5] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
+    <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@125 {
+    <name not found> = ArrayList@126[8] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
+    <name not found> = ArrayList@130[8] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
 }

compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.lazy.log

@@ -36,3 +36,36 @@ LazyJavaPackageFragment@14['lang'] {
     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> = ArrayList@35[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]
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[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]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}

compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.lazy.log

@@ -100,14 +100,14 @@ LazyJavaClassifierType@68['E'] {
     arguments = ArrayList@69[empty]
     classifier = JavaTypeParameterImpl@70['E']
     nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
 }
 
-LazyJavaClassifierType@71['E'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@73['E']
+LazyJavaClassifierType@72['E'] {
+    arguments = ArrayList@73[empty]
+    classifier = JavaTypeParameterImpl@74['E']
     nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@75['E'] {
@@ -119,28 +119,28 @@ LazyJavaClassifierType@75['E'] {
 
 LazyJavaClassifierType@78['E'] {
     arguments = ArrayList@79[empty]
-    classifier = JavaTypeParameterImpl@77['E']
+    classifier = JavaTypeParameterImpl@70['E']
     nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
 }
 
 LazyJavaClassifierType@80['E'] {
     arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@70['E']
+    classifier = JavaTypeParameterImpl@66['E']
     nullable = 'true': Boolean@61
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@82['E'] {
     arguments = ArrayList@83[empty]
-    classifier = JavaTypeParameterImpl@73['E']
+    classifier = JavaTypeParameterImpl@77['E']
     nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@84['E'] {
     arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@66['E']
+    classifier = JavaTypeParameterImpl@74['E']
     nullable = 'true': Boolean@61
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
@@ -194,14 +194,14 @@ LazyJavaClassifierType@104['String'] {
 
 LazyJavaClassifierType@107['String'] {
     arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@99['String']
+    classifier = JavaClassImpl@106['String']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@100
 }
 
 LazyJavaClassifierType@109['String'] {
     arguments = ArrayList@110[empty]
-    classifier = JavaClassImpl@106['String']
+    classifier = JavaClassImpl@99['String']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@100
 }
@@ -236,14 +236,14 @@ LazyJavaClassifierType@120['Throwable'] {
 
 LazyJavaClassifierType@123['Throwable'] {
     arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@119['Throwable']
+    classifier = JavaClassImpl@122['Throwable']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@116
 }
 
 LazyJavaClassifierType@125['Throwable'] {
     arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@122['Throwable']
+    classifier = JavaClassImpl@119['Throwable']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@116
 }
@@ -338,43 +338,205 @@ LazyJavaPackageFragment@162['lang'] {
     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('plus': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('println': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('query': Name@208) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('to': Name@209) = 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('plus': Name@206) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('println': Name@207) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('query': Name@208) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('to': Name@209) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    memberIndex = computeMemberIndex$1@210 // 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@211) = LazyJavaClassDescriptor@7['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@212
-    deserializedPackageScope = Empty@196 // through LazyPackageFragmentScopeForJavaPackage@212
-    functions('ArrayList': Name@213) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@212
-    memberIndex = computeMemberIndex$1@214 // through LazyPackageFragmentScopeForJavaPackage@212
+    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@215['E']
+    defaultType = JetTypeImpl@214['E']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-    upperBounds = LinkedHashSet@216[1] { NullableType@217 }
+    upperBounds = LinkedHashSet@215[1] { NullableType@216 }
 }
 
 LazyJavaTypeParameterDescriptor@30['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
 }
 
-LazyJavaTypeParameterResolver@218 {
-    resolve(JavaTypeParameterImpl@219['E']) = LazyJavaTypeParameterDescriptor@35['E']
+LazyJavaTypeParameterResolver@217 {
+    resolve(JavaTypeParameterImpl@218['E']) = LazyJavaTypeParameterDescriptor@35['E']
 }
 
-LazyJavaTypeParameterResolver@220 {
-    resolve(JavaTypeParameterImpl@73['E']) = LazyJavaTypeParameterDescriptor@30['E']
+LazyJavaTypeParameterResolver@219 {
+    resolve(JavaTypeParameterImpl@70['E']) = LazyJavaTypeParameterDescriptor@30['E']
+}
+
+ResolutionTaskHolder@220 {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
+    <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@224 {
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
+    <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@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
+    <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@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
+    <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@236 {
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
+    <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@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
+    <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@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
+    <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@248 {
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
+    <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@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
+    <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@256 {
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
+}
+
+ResolutionTaskHolder@260 {
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@262 }
+}
+
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@266 }
+}
+
+ResolutionTaskHolder@268 {
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@270 }
+}
+
+ResolutionTaskHolder@272 {
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@274 }
+}
+
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@278 }
+}
+
+ResolutionTaskHolder@280 {
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@282 }
+}
+
+ResolutionTaskHolder@284 {
+    <name not found> = ArrayList@285[3] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288 }
+    <name not found> = ArrayList@289[3] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288 }
+    <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@290 {
+    <name not found> = ArrayList@291[4] { ResolutionCandidate@292, ResolutionCandidate@293, ResolutionCandidate@294, ... }
+    <name not found> = ArrayList@295[5] { ResolutionCandidate@292, ResolutionCandidate@293, ResolutionCandidate@294, ... }
+    <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]
+}
+
+ResolutionTaskHolder@296 {
+    <name not found> = ArrayList@297[4] { ResolutionCandidate@298, ResolutionCandidate@299, ResolutionCandidate@300, ... }
+    <name not found> = ArrayList@301[5] { ResolutionCandidate@298, ResolutionCandidate@299, ResolutionCandidate@300, ... }
+    <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@302 {
+    <name not found> = ArrayList@303[4] { ResolutionCandidate@304, ResolutionCandidate@305, ResolutionCandidate@306, ... }
+    <name not found> = ArrayList@307[5] { ResolutionCandidate@304, ResolutionCandidate@305, ResolutionCandidate@306, ... }
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
 }

compiler/testData/diagnostics/tests/inference/nestedCalls/kt3461checkTypes.lazy.log

@@ -27,12 +27,79 @@ LazyJavaPackageFragment@10['java'] {
 LazyJavaPackageFragment@12['lang'] {
     classes('F': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('foo': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('p': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('r': Name@30) = 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('p': Name@29) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('r': Name@30) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // 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> = ArrayList@34[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]
+    <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> = ArrayList@38[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@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@42[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]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+    <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> = ArrayList@50[1] { ResolutionCandidate@49 }
 }

compiler/testData/diagnostics/tests/inference/nestedCalls/makeNullableIfSafeCall.lazy.log

@@ -35,11 +35,395 @@ 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
-    classes('foo': Name@35) = 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
-    functions('foo': Name@35) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@32
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[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]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[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]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[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]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[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]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+}
+
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+}
+
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+}
+
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+}
+
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+}
+
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+}
+
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+}
+
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+}
+
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+}
+
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+}
+
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+}
+
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+}
+
+ResolutionTaskHolder@188 {
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+}
+
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
+}
+
+ResolutionTaskHolder@196 {
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
+}
+
+ResolutionTaskHolder@200 {
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
+}
+
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
+}
+
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+}
+
+ResolutionTaskHolder@212 {
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
+}
+
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
+}
+
+ResolutionTaskHolder@220 {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
+}
+
+ResolutionTaskHolder@224 {
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
+}
+
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
+}
+
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
+}
+
+ResolutionTaskHolder@236 {
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
+}
+
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
+}
+
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
+}
+
+ResolutionTaskHolder@248 {
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
+}
+
+ResolutionTaskHolder@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
+}
+
+ResolutionTaskHolder@256 {
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
+}
+
+ResolutionTaskHolder@260 {
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@262 }
+}
+
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@266 }
+}
+
+ResolutionTaskHolder@268 {
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@270 }
+}
+
+ResolutionTaskHolder@272 {
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@274 }
+}
+
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@278 }
+}
+
+ResolutionTaskHolder@280 {
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@282 }
+}
+
+ResolutionTaskHolder@284 {
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@286 }
+}
+
+ResolutionTaskHolder@288 {
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@290 }
+}
+
+ResolutionTaskHolder@292 {
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@294 }
+}
+
+ResolutionTaskHolder@296 {
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@298 }
+}
+
+ResolutionTaskHolder@300 {
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@302 }
+}
+
+ResolutionTaskHolder@304 {
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@306 }
+}
+
+ResolutionTaskHolder@308 {
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@310 }
+}
+
+ResolutionTaskHolder@312 {
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@314 }
+}
+
+ResolutionTaskHolder@316 {
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@318 }
+}
+
+ResolutionTaskHolder@320 {
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@322 }
+}
+
+ResolutionTaskHolder@324 {
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@326 }
+}
+
+ResolutionTaskHolder@328 {
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@330 }
 }

compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.lazy.log

@@ -45,14 +45,14 @@ LazyJavaClassifierType@25['String'] {
 
 LazyJavaClassifierType@28['String'] {
     arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@24['String']
+    classifier = JavaClassImpl@16['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@30['String'] {
     arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@16['String']
+    classifier = JavaClassImpl@24['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -87,14 +87,14 @@ LazyJavaClassifierType@42['Throwable'] {
 
 LazyJavaClassifierType@44['Throwable'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@41['Throwable']
+    classifier = JavaClassImpl@34['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@46['Throwable'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@34['Throwable']
+    classifier = JavaClassImpl@41['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
@@ -150,16 +150,182 @@ LazyJavaPackageFragment@68['lang'] {
     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('get': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('makeNullable': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('plus': Name@97) = 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('get': Name@95) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('makeNullable': Name@96) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('plus': Name@97) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@98 // 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> = ArrayList@100[1] { ResolutionCandidate@99 }
+    <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@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@104[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]
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+    <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@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+    <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 }
+    <name not found> = ArrayList@116[1] { 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]
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+    <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@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+    <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@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+    <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@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+    <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> = ArrayList@134[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
+}
+
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+}
+
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+}
+
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+}
+
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+}
+
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[2] { ResolutionCandidate@163, ResolutionCandidate@164 }
+    <name not found> = ArrayList@165[2] { ResolutionCandidate@163, ResolutionCandidate@164 }
+    <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@166 {
+    <name not found> = ArrayList@167[2] { ResolutionCandidate@168, ResolutionCandidate@169 }
+    <name not found> = ArrayList@170[2] { ResolutionCandidate@168, ResolutionCandidate@169 }
+    <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@171 {
+    <name not found> = ArrayList@172[2] { ResolutionCandidate@173, ResolutionCandidate@174 }
+    <name not found> = ArrayList@175[2] { ResolutionCandidate@173, ResolutionCandidate@174 }
+    <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@176 {
+    <name not found> = ArrayList@177[4] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
+    <name not found> = ArrayList@181[5] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
+    <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@182 {
+    <name not found> = ArrayList@183[8] { ResolutionCandidate@184, ResolutionCandidate@185, ResolutionCandidate@186, ... }
+    <name not found> = ArrayList@187[8] { ResolutionCandidate@184, ResolutionCandidate@185, ResolutionCandidate@186, ... }
+}
+
+ResolutionTaskHolder@188 {
+    <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]
 }

compiler/testData/diagnostics/tests/inference/noInformationForParameter.lazy.log

@@ -91,49 +91,49 @@ LazyJavaClassifierType@57['E'] {
     arguments = ArrayList@58[empty]
     classifier = JavaTypeParameterImpl@59['E']
     nullable = 'false': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
-LazyJavaClassifierType@61['E'] {
-    arguments = ArrayList@62[empty]
-    classifier = JavaTypeParameterImpl@63['E']
+LazyJavaClassifierType@60['E'] {
+    arguments = ArrayList@61[empty]
+    classifier = JavaTypeParameterImpl@62['E']
     nullable = 'false': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
-LazyJavaClassifierType@64['E'] {
-    arguments = ArrayList@65[empty]
-    classifier = JavaTypeParameterImpl@66['E']
+LazyJavaClassifierType@63['E'] {
+    arguments = ArrayList@64[empty]
+    classifier = JavaTypeParameterImpl@65['E']
     nullable = 'false': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@67['E'] {
     arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@66['E']
+    classifier = JavaTypeParameterImpl@62['E']
     nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@69['E'] {
     arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@59['E']
+    classifier = JavaTypeParameterImpl@55['E']
     nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@71['E'] {
     arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@55['E']
+    classifier = JavaTypeParameterImpl@59['E']
     nullable = 'true': Boolean@50
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@73['E'] {
     arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@63['E']
+    classifier = JavaTypeParameterImpl@65['E']
     nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@22['List<E>'] {
@@ -241,12 +241,12 @@ LazyJavaPackageFragment@108['util'] {
 
 LazyJavaTypeParameterDescriptor@24['E'] {
     defaultType = JetTypeImpl@145['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
     upperBounds = LinkedHashSet@146[1] { NullableType@147 }
 }
 
 LazyJavaTypeParameterDescriptor@19['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaTypeParameterResolver@148 {
@@ -254,5 +254,32 @@ LazyJavaTypeParameterResolver@148 {
 }
 
 LazyJavaTypeParameterResolver@150 {
-    resolve(JavaTypeParameterImpl@55['E']) = LazyJavaTypeParameterDescriptor@19['E']
+    resolve(JavaTypeParameterImpl@65['E']) = LazyJavaTypeParameterDescriptor@19['E']
+}
+
+ResolutionTaskHolder@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
+    <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@155 {
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
+    <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@159 {
+    <name not found> = ArrayList@160[3] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163 }
+    <name not found> = ArrayList@164[3] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163 }
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
 }

compiler/testData/diagnostics/tests/inference/nullableUpperBound.lazy.log

@@ -43,3 +43,21 @@ LazyJavaPackageFragment@11['lang'] {
     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> = ArrayList@44[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]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+}

compiler/testData/diagnostics/tests/inference/opposite.lazy.log

@@ -44,3 +44,38 @@ LazyJavaPackageFragment@18['lang'] {
     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> = ArrayList@44[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]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <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@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+    <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@51 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+}

compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.lazy.log

@@ -52,14 +52,14 @@ LazyJavaClassifierType@34['T'] {
 
 LazyJavaClassifierType@37['T'] {
     arguments = ArrayList@38[empty]
-    classifier = JavaTypeParameterImpl@36['T']
+    classifier = JavaTypeParameterImpl@32['T']
     nullable = 'true': Boolean@25
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
 }
 
 LazyJavaClassifierType@39['T'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaTypeParameterImpl@32['T']
+    classifier = JavaTypeParameterImpl@36['T']
     nullable = 'true': Boolean@25
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
 }
@@ -132,3 +132,96 @@ LazyJavaTypeParameterDescriptor@92['T'] {
 LazyJavaTypeParameterResolver@95 {
     resolve(JavaTypeParameterImpl@96['T']) = LazyJavaTypeParameterDescriptor@92['T']
 }
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@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]
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@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]
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+    <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@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+    <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@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@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]
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+    <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@121 {
+    <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@122 {
+    <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@123 {
+    <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]
+}

compiler/testData/diagnostics/tests/inference/regressions/compareBy.lazy.log

@@ -33,7 +33,7 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -47,7 +47,7 @@ LazyJavaClassifierType@25['String'] {
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -75,14 +75,14 @@ LazyJavaClassifierType@36['Throwable'] {
 
 LazyJavaClassifierType@39['Throwable'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -160,3 +160,52 @@ LazyJavaPackageFragment@59['lang'] {
     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> = ArrayList@97[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]
+    <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@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+    <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> = ArrayList@109[1] { ResolutionCandidate@108 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[4] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+    <name not found> = ArrayList@115[5] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+}

compiler/testData/diagnostics/tests/inference/regressions/kt1029.lazy.log

@@ -32,16 +32,58 @@ LazyJavaPackageFragment@13['java'] {
 }
 
 LazyJavaPackageFragment@15['lang'] {
-    classes('equals': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('from': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('mod': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('rangeTo': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('where': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('from': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('where': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
     deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('equals': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('from': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('mod': Name@36) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('rangeTo': Name@37) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('where': Name@38) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@39 // 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> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <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@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[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]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[7] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
+    <name not found> = ArrayList@66[7] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[7] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
+    <name not found> = ArrayList@72[7] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
 }

compiler/testData/diagnostics/tests/inference/regressions/kt1031.lazy.log

@@ -49,25 +49,109 @@ LazyJavaPackageFragment@18['java'] {
 }
 
 LazyJavaPackageFragment@20['lang'] {
-    classes('equals': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('mod': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('rangeTo': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('select': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('toString': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('where': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('select': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('where': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@49
     deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('equals': Name@48) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('mod': Name@50) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('rangeTo': Name@51) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('select': Name@52) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('toString': Name@53) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('where': Name@54) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@55 // 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@56) = LazyJavaClassDescriptor@0['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('ArrayList': Name@58) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@57
+    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> = ArrayList@59[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]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+    <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@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+    <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@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[7] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+    <name not found> = ArrayList@113[7] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[7] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+    <name not found> = ArrayList@119[7] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[7] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+    <name not found> = ArrayList@125[7] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
 }

compiler/testData/diagnostics/tests/inference/regressions/kt1127.lazy.log

@@ -37,3 +37,12 @@ LazyJavaPackageFragment@15['lang'] {
     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> = 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]
+}

compiler/testData/diagnostics/tests/inference/regressions/kt1145.lazy.log

@@ -38,12 +38,61 @@ LazyJavaPackageFragment@15['java'] {
 LazyJavaPackageFragment@17['lang'] {
     classes('fold': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
     classes('map': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('plus': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('toString': Name@41) = 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
-    functions('plus': Name@40) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('toString': Name@41) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[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]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+    <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> = ArrayList@52[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
 }

compiler/testData/diagnostics/tests/inference/regressions/kt1358.lazy.log

@@ -33,3 +33,50 @@ LazyJavaPackageFragment@11['lang'] {
     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@32 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+    <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> = ArrayList@40[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]
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <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@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+}

compiler/testData/diagnostics/tests/inference/regressions/kt1410.lazy.log

@@ -40,22 +40,140 @@ LazyJavaPackageFragment@17['java'] {
 }
 
 LazyJavaPackageFragment@19['lang'] {
-    classes('add': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('filter': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('filterToMy': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('hasNext': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('invoke': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('iterator': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('next': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('startsWith': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    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('add': Name@41) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('filter': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('filterToMy': Name@44) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('hasNext': Name@45) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('invoke': Name@46) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('iterator': Name@47) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('next': Name@48) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('startsWith': Name@49) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@50 // 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> = ArrayList@49[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]
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@53[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]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[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]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@61[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]
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+}
+
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+}
+
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[2] { ResolutionCandidate@132, ResolutionCandidate@133 }
+    <name not found> = ArrayList@134[2] { ResolutionCandidate@132, ResolutionCandidate@133 }
 }

compiler/testData/diagnostics/tests/inference/regressions/kt1558.lazy.log

@@ -49,3 +49,218 @@ LazyJavaPackageFragment@19['lang'] {
     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> = ArrayList@49[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]
+    <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> = ArrayList@53[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]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[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]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@61[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]
+    <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> = ArrayList@65[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]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@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]
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@73[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@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+    <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@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+    <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@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@85[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]
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+}
+
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+}

compiler/testData/diagnostics/tests/inference/regressions/kt1718.lazy.log

@@ -108,66 +108,66 @@ LazyJavaClassifierType@71['E'] {
     arguments = ArrayList@72[empty]
     classifier = JavaTypeParameterImpl@73['E']
     nullable = 'false': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
 }
 
-LazyJavaClassifierType@75['E'] {
-    arguments = ArrayList@76[empty]
-    classifier = JavaTypeParameterImpl@77['E']
+LazyJavaClassifierType@74['E'] {
+    arguments = ArrayList@75[empty]
+    classifier = JavaTypeParameterImpl@76['E']
     nullable = 'false': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
 LazyJavaClassifierType@78['E'] {
     arguments = ArrayList@79[empty]
     classifier = JavaTypeParameterImpl@80['E']
     nullable = 'false': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@81['E'] {
     arguments = ArrayList@82[empty]
-    classifier = JavaTypeParameterImpl@80['E']
+    classifier = JavaTypeParameterImpl@64['E']
     nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@84['E'] {
     arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@77['E']
+    classifier = JavaTypeParameterImpl@80['E']
     nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@86['E'] {
     arguments = ArrayList@87[empty]
-    classifier = JavaTypeParameterImpl@73['E']
+    classifier = JavaTypeParameterImpl@69['E']
     nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
 }
 
 LazyJavaClassifierType@88['E'] {
     arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@69['E']
+    classifier = JavaTypeParameterImpl@73['E']
     nullable = 'true': Boolean@83
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
 }
 
 LazyJavaClassifierType@90['E'] {
     arguments = ArrayList@91[empty]
-    classifier = JavaTypeParameterImpl@64['E']
+    classifier = JavaTypeParameterImpl@76['E']
     nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
-LazyJavaClassifierType@32['List<E>'] {
+LazyJavaClassifierType@37['List<E>'] {
     arguments = ArrayList@92[1] { TypeProjectionImpl@93 }
     classifier = JavaClassImpl@94['List']
     memberScope = SubstitutingScope@95
     typeConstructor = DeserializedClassTypeConstructor@96
 }
 
-LazyJavaClassifierType@37['List<E>'] {
+LazyJavaClassifierType@32['List<E>'] {
     arguments = ArrayList@97[1] { TypeProjectionImpl@98 }
     classifier = JavaClassImpl@99['List']
     memberScope = SubstitutingScope@100
@@ -271,26 +271,63 @@ LazyJavaPackageFragment@135['util'] {
 }
 
 LazyJavaTypeParameterDescriptor@34['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
     upperBounds = LinkedHashSet@168[1] { NullableType@169 }
 }
 
 LazyJavaTypeParameterDescriptor@25['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
 LazyJavaTypeParameterDescriptor@29['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaTypeParameterResolver@170 {
-    resolve(JavaTypeParameterImpl@171['E']) = LazyJavaTypeParameterDescriptor@29['E']
+    resolve(JavaTypeParameterImpl@171['E']) = LazyJavaTypeParameterDescriptor@34['E']
 }
 
 LazyJavaTypeParameterResolver@172 {
-    resolve(JavaTypeParameterImpl@173['E']) = LazyJavaTypeParameterDescriptor@25['E']
+    resolve(JavaTypeParameterImpl@173['E']) = LazyJavaTypeParameterDescriptor@29['E']
 }
 
 LazyJavaTypeParameterResolver@174 {
-    resolve(JavaTypeParameterImpl@175['E']) = LazyJavaTypeParameterDescriptor@34['E']
+    resolve(JavaTypeParameterImpl@175['E']) = LazyJavaTypeParameterDescriptor@25['E']
+}
+
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+    <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> = ArrayList@183[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]
+}
+
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+}
+
+ResolutionTaskHolder@188 {
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+}
+
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[2] { ResolutionCandidate@194, ResolutionCandidate@195 }
+    <name not found> = ArrayList@196[2] { ResolutionCandidate@194, ResolutionCandidate@195 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
 }

compiler/testData/diagnostics/tests/inference/regressions/kt1944.lazy.log

@@ -30,12 +30,55 @@ LazyJavaPackageFragment@12['java'] {
 
 LazyJavaPackageFragment@14['lang'] {
     classes('f': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('invoke': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('run': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('x': Name@34) = 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('invoke': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('run': Name@33) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // 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> = ArrayList@38[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]
+    <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> = ArrayList@42[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }

compiler/testData/diagnostics/tests/inference/regressions/kt2179.lazy.log

@@ -103,7 +103,7 @@ LazyJavaClassifierType@68['E'] {
     arguments = ArrayList@69[empty]
     classifier = JavaTypeParameterImpl@70['E']
     nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@71['E'] {
@@ -117,56 +117,56 @@ LazyJavaClassifierType@75['E'] {
     arguments = ArrayList@76[empty]
     classifier = JavaTypeParameterImpl@77['E']
     nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@78['E'] {
     arguments = ArrayList@79[empty]
     classifier = JavaTypeParameterImpl@80['E']
     nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@81['E'] {
     arguments = ArrayList@82[empty]
-    classifier = JavaTypeParameterImpl@66['E']
+    classifier = JavaTypeParameterImpl@70['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@73['E']
     nullable = 'true': Boolean@54
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
-LazyJavaClassifierType@85['E'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaTypeParameterImpl@77['E']
-    nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-}
-
 LazyJavaClassifierType@87['E'] {
     arguments = ArrayList@88[empty]
-    classifier = JavaTypeParameterImpl@80['E']
+    classifier = JavaTypeParameterImpl@62['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
 LazyJavaClassifierType@89['E'] {
     arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@70['E']
+    classifier = JavaTypeParameterImpl@66['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@91['E'] {
     arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@62['E']
+    classifier = JavaTypeParameterImpl@77['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@24['List<E>'] {
@@ -282,91 +282,416 @@ LazyJavaPackageFragment@133['java'] {
 
 LazyJavaPackageFragment@137['lang'] {
     classes('ArrayList': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('add': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('arrayList': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('hasNext': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('invoke': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('iterator': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('java': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('map': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('mapTo': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('next': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('size': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('toCollection': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('transform': Name@196) = 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('add': Name@185) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('arrayList': Name@186) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('hasNext': Name@187) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('invoke': Name@188) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('iterator': Name@189) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('map': Name@191) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('mapTo': Name@192) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('next': Name@193) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('size': Name@194) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('toCollection': Name@195) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('transform': Name@196) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    memberIndex = computeMemberIndex$1@197 // 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@198) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('ArrayList': Name@200) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('Collection': Name@201) = LazyJavaClassDescriptor@172['Collection'] // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('Int': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('List': Name@203) = LazyJavaClassDescriptor@174['List'] // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('MutableCollection': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('add': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('arrayList': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('hasNext': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('invoke': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('iterator': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('java': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('map': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('mapTo': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('next': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('size': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('toCollection': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('transform': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    deserializedPackageScope = Empty@178 // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('ArrayList': Name@183) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('add': Name@185) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('arrayList': Name@186) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('hasNext': Name@187) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('invoke': Name@188) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('iterator': Name@189) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('map': Name@191) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('mapTo': Name@192) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('next': Name@193) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('size': Name@194) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('toCollection': Name@195) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('transform': Name@196) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    memberIndex = computeMemberIndex$1@205 // through LazyPackageFragmentScopeForJavaPackage@199
+    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@206['E']
+    defaultType = JetTypeImpl@201['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+    upperBounds = LinkedHashSet@202[1] { NullableType@203 }
+}
+
+LazyJavaTypeParameterDescriptor@17['E'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-    upperBounds = LinkedHashSet@207[1] { NullableType@208 }
 }
 
 LazyJavaTypeParameterDescriptor@21['E'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
-LazyJavaTypeParameterDescriptor@17['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+LazyJavaTypeParameterResolver@204 {
+    resolve(JavaTypeParameterImpl@205['E']) = LazyJavaTypeParameterDescriptor@26['E']
 }
 
-LazyJavaTypeParameterResolver@209 {
-    resolve(JavaTypeParameterImpl@66['E']) = LazyJavaTypeParameterDescriptor@17['E']
+LazyJavaTypeParameterResolver@206 {
+    resolve(JavaTypeParameterImpl@62['E']) = LazyJavaTypeParameterDescriptor@17['E']
 }
 
-LazyJavaTypeParameterResolver@210 {
-    resolve(JavaTypeParameterImpl@211['E']) = LazyJavaTypeParameterDescriptor@26['E']
+LazyJavaTypeParameterResolver@207 {
+    resolve(JavaTypeParameterImpl@73['E']) = LazyJavaTypeParameterDescriptor@21['E']
 }
 
-LazyJavaTypeParameterResolver@212 {
-    resolve(JavaTypeParameterImpl@80['E']) = LazyJavaTypeParameterDescriptor@21['E']
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@211[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]
+    <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@212 {
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
+    <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@216 {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
+    <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@220 {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
+    <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@224 {
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
+    <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@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
+    <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@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
+    <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@236 {
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
+    <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@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
+    <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@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
+    <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@248 {
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
+    <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@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
+    <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@256 {
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+}
+
+ResolutionTaskHolder@260 {
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@262 }
+}
+
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@266 }
+}
+
+ResolutionTaskHolder@268 {
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@270 }
+}
+
+ResolutionTaskHolder@272 {
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@274 }
+}
+
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@278 }
+}
+
+ResolutionTaskHolder@280 {
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@282 }
+}
+
+ResolutionTaskHolder@284 {
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@286 }
+}
+
+ResolutionTaskHolder@288 {
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@290 }
+}
+
+ResolutionTaskHolder@292 {
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@294 }
+}
+
+ResolutionTaskHolder@296 {
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@298 }
+}
+
+ResolutionTaskHolder@300 {
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@302 }
+}
+
+ResolutionTaskHolder@304 {
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@306 }
+}
+
+ResolutionTaskHolder@308 {
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@310 }
+}
+
+ResolutionTaskHolder@312 {
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@314 }
+}
+
+ResolutionTaskHolder@316 {
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@318 }
+}
+
+ResolutionTaskHolder@320 {
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@322 }
+}
+
+ResolutionTaskHolder@324 {
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@326 }
+}
+
+ResolutionTaskHolder@328 {
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@330 }
+}
+
+ResolutionTaskHolder@332 {
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@334 }
+}
+
+ResolutionTaskHolder@336 {
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@338 }
+}
+
+ResolutionTaskHolder@340 {
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@342 }
+}
+
+ResolutionTaskHolder@344 {
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
+    <name not found> = ArrayList@347[1] { ResolutionCandidate@346 }
+}
+
+ResolutionTaskHolder@348 {
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
+    <name not found> = ArrayList@351[1] { ResolutionCandidate@350 }
+}
+
+ResolutionTaskHolder@352 {
+    <name not found> = ArrayList@353[1] { ResolutionCandidate@354 }
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@354 }
+}
+
+ResolutionTaskHolder@356 {
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
+    <name not found> = ArrayList@359[1] { ResolutionCandidate@358 }
+}
+
+ResolutionTaskHolder@360 {
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
+    <name not found> = ArrayList@363[1] { ResolutionCandidate@362 }
+}
+
+ResolutionTaskHolder@364 {
+    <name not found> = ArrayList@365[1] { ResolutionCandidate@366 }
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@366 }
+}
+
+ResolutionTaskHolder@368 {
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@370 }
+    <name not found> = ArrayList@371[1] { ResolutionCandidate@370 }
+}
+
+ResolutionTaskHolder@372 {
+    <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
+    <name not found> = ArrayList@375[1] { ResolutionCandidate@374 }
+}
+
+ResolutionTaskHolder@376 {
+    <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@378 }
+}
+
+ResolutionTaskHolder@380 {
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@382 }
+    <name not found> = ArrayList@383[1] { ResolutionCandidate@382 }
+}
+
+ResolutionTaskHolder@384 {
+    <name not found> = ArrayList@385[1] { ResolutionCandidate@386 }
+    <name not found> = ArrayList@387[1] { ResolutionCandidate@386 }
+}
+
+ResolutionTaskHolder@388 {
+    <name not found> = ArrayList@389[3] { ResolutionCandidate@390, ResolutionCandidate@391, ResolutionCandidate@392 }
+    <name not found> = ArrayList@393[3] { ResolutionCandidate@390, ResolutionCandidate@391, ResolutionCandidate@392 }
+    <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@394 {
+    <name not found> = ArrayList@395[3] { ResolutionCandidate@396, ResolutionCandidate@397, ResolutionCandidate@398 }
+    <name not found> = ArrayList@399[3] { ResolutionCandidate@396, ResolutionCandidate@397, ResolutionCandidate@398 }
+    <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@400 {
+    <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]
+}
+
+ResolutionTaskHolder@401 {
+    <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]
 }

compiler/testData/diagnostics/tests/inference/regressions/kt2200.lazy.log

@@ -37,3 +37,90 @@ LazyJavaPackageFragment@10['lang'] {
     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> = 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]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[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]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[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]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[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]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[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]
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@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]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[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]
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@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]
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+}

compiler/testData/diagnostics/tests/inference/regressions/kt2283.lazy.log

@@ -45,3 +45,17 @@ LazyJavaPackageFragment@19['lang'] {
     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> = ArrayList@43[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]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+}

compiler/testData/diagnostics/tests/inference/regressions/kt2286.lazy.log

@@ -42,10 +42,120 @@ LazyJavaPackageFragment@10['java'] {
 
 LazyJavaPackageFragment@12['lang'] {
     classes('coll': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('compareTo': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('find': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('find': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@43
     deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('compareTo': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('find': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@46 // 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> = ArrayList@49[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <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@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@53[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]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <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> = ArrayList@61[1] { ResolutionCandidate@60 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <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> = ArrayList@65[1] { ResolutionCandidate@64 }
+    <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> = ArrayList@69[1] { ResolutionCandidate@68 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[7] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
+    <name not found> = ArrayList@99[7] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[7] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
+    <name not found> = ArrayList@105[7] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[7] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
+    <name not found> = ArrayList@111[7] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
+    <name not found> = ArrayList@117[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
 }

compiler/testData/diagnostics/tests/inference/regressions/kt2294.lazy.log

@@ -39,3 +39,36 @@ LazyJavaPackageFragment@15['lang'] {
     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> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <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@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[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]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+}

compiler/testData/diagnostics/tests/inference/regressions/kt2320.lazy.log

@@ -86,14 +86,14 @@ LazyJavaClassifierType@41['Throwable'] {
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -149,14 +149,68 @@ LazyJavaPackageFragment@66['java'] {
 LazyJavaPackageFragment@68['lang'] {
     classes('Exception': Name@91) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@92
     classes('f': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('getValue': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('invoke': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('mapValuesOriginal': Name@96) = 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('getValue': Name@94) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('invoke': Name@95) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('mapValuesOriginal': Name@96) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@97 // 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> = ArrayList@99[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]
+    <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> = ArrayList@103[1] { ResolutionCandidate@102 }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[4] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
+    <name not found> = ArrayList@121[5] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@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]
+    <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]
 }

compiler/testData/diagnostics/tests/inference/regressions/kt2324.lazy.log

@@ -2,59 +2,54 @@ 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
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@7['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@8['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
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@17
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
+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@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
+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@7) = ArrayList@29[2] { JavaMethodDescriptor@30['add'], JavaMethodDescriptor@31['add'] } // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@32 // through LazyJavaClassMemberScope@26
-    nestedClassIndex = LinkedHashMap@33 // through LazyJavaClassMemberScope@26
-    nestedClasses('add': Name@7) = null // through LazyJavaClassMemberScope@26
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@26
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@34['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@35['ArrayList']
+    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@36['RandomAccess'] {
-    functions('add': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@37
+LazyJavaClassDescriptor@35['RandomAccess'] {
+    functions('add': Name@11) = EmptyList@36[empty] // through LazyJavaClassMemberScope@37
     memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@37
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@37
     typeConstructor = LazyJavaClassTypeConstructor@39['RandomAccess']
 }
 
 LazyJavaClassDescriptor@40['Serializable'] {
-    functions('add': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@41
+    functions('add': Name@11) = EmptyList@36[empty] // through LazyJavaClassMemberScope@41
     memberIndex = computeMemberIndex$1@42 // through LazyJavaClassMemberScope@41
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@41
     typeConstructor = LazyJavaClassTypeConstructor@43['Serializable']
 }
 
-LazyJavaClassTypeConstructor@10['AbstractCollection'] {
+LazyJavaClassTypeConstructor@8['AbstractCollection'] {
     parameters = ArrayList@44[1] { LazyJavaTypeParameterDescriptor@45['E'] }
     supertypes = ArrayList@46[1] { LazyJavaClassifierType@47['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@20['AbstractList'] {
+LazyJavaClassTypeConstructor@18['AbstractList'] {
     parameters = ArrayList@48[1] { LazyJavaTypeParameterDescriptor@49['E'] }
     supertypes = ArrayList@50[2] { LazyJavaClassifierType@51['AbstractCollection<E>'], LazyJavaClassifierType@52['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@35['ArrayList'] {
+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'], ... }
 }
@@ -73,14 +68,14 @@ LazyJavaClassifierType@51['AbstractCollection<E>'] {
     arguments = ArrayList@64[1] { TypeProjectionImpl@65 }
     classifier = JavaClassImpl@66['AbstractCollection']
     memberScope = SubstitutingScope@67
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
 }
 
 LazyJavaClassifierType@56['AbstractList<E>'] {
     arguments = ArrayList@68[1] { TypeProjectionImpl@69 }
     classifier = JavaClassImpl@70['AbstractList']
     memberScope = SubstitutingScope@71
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractList']
 }
 
 LazyJavaClassifierType@72['Cloneable'] {
@@ -132,164 +127,164 @@ LazyJavaClassifierType@102['E'] {
     arguments = ArrayList@103[empty]
     classifier = JavaTypeParameterImpl@104['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
-LazyJavaClassifierType@106['E'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaTypeParameterImpl@108['E']
+LazyJavaClassifierType@105['E'] {
+    arguments = ArrayList@106[empty]
+    classifier = JavaTypeParameterImpl@107['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@109['E'] {
     arguments = ArrayList@110[empty]
     classifier = JavaTypeParameterImpl@111['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@112['E'] {
     arguments = ArrayList@113[empty]
     classifier = JavaTypeParameterImpl@114['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@115['E'] {
     arguments = ArrayList@116[empty]
     classifier = JavaTypeParameterImpl@117['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@118['E'] {
     arguments = ArrayList@119[empty]
     classifier = JavaTypeParameterImpl@120['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@121['E'] {
     arguments = ArrayList@122[empty]
     classifier = JavaTypeParameterImpl@123['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@124['E'] {
     arguments = ArrayList@125[empty]
     classifier = JavaTypeParameterImpl@126['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@127['E'] {
     arguments = ArrayList@128[empty]
     classifier = JavaTypeParameterImpl@129['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@130['E'] {
     arguments = ArrayList@131[empty]
     classifier = JavaTypeParameterImpl@132['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@133['E'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@123['E']
+    classifier = JavaTypeParameterImpl@96['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@135['E'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@132['E']
+    classifier = JavaTypeParameterImpl@114['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@137['E'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@114['E']
+    classifier = JavaTypeParameterImpl@123['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@139['E'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@100['E']
+    classifier = JavaTypeParameterImpl@120['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@141['E'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@96['E']
+    classifier = JavaTypeParameterImpl@129['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@143['E'] {
     arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@111['E']
+    classifier = JavaTypeParameterImpl@100['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@145['E'] {
     arguments = ArrayList@146[empty]
     classifier = JavaTypeParameterImpl@117['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@147['E'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@108['E']
+    classifier = JavaTypeParameterImpl@107['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@149['E'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@120['E']
+    classifier = JavaTypeParameterImpl@104['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@151['E'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@129['E']
+    classifier = JavaTypeParameterImpl@126['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@153['E'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@104['E']
+    classifier = JavaTypeParameterImpl@111['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@155['E'] {
     arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@126['E']
+    classifier = JavaTypeParameterImpl@132['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
-LazyJavaClassifierType@57['List<E>'] {
+LazyJavaClassifierType@52['List<E>'] {
     arguments = ArrayList@157[1] { TypeProjectionImpl@158 }
     classifier = JavaClassImpl@159['List']
     memberScope = SubstitutingScope@160
     typeConstructor = DeserializedClassTypeConstructor@161
 }
 
-LazyJavaClassifierType@52['List<E>'] {
+LazyJavaClassifierType@57['List<E>'] {
     arguments = ArrayList@162[1] { TypeProjectionImpl@163 }
     classifier = JavaClassImpl@164['List']
     memberScope = SubstitutingScope@165
@@ -386,10 +381,10 @@ LazyJavaPackageFragmentProvider@178 {
     packageFragments('kotlin.io': FqName@241) = null
     packageFragments('kotlin.jvm': FqName@242) = null
     topLevelClasses(JavaClassImpl@66['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@70['AbstractList']) = LazyJavaClassDescriptor@11['AbstractList']
-    topLevelClasses(JavaClassImpl@243['ArrayList']) = LazyJavaClassDescriptor@21['ArrayList']
+    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@36['RandomAccess']
+    topLevelClasses(JavaClassImpl@174['RandomAccess']) = LazyJavaClassDescriptor@35['RandomAccess']
     topLevelClasses(JavaClassImpl@177['Serializable']) = LazyJavaClassDescriptor@40['Serializable']
 }
 
@@ -397,128 +392,318 @@ 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@8[empty] // through LazyPackageFragmentScopeForJavaPackage@247
-    functions('util': Name@251) = EmptyList@8[empty] // 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('add': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@254
     classes('arrayList': Name@255) = null // through LazyPackageFragmentScopeForJavaPackage@254
     classes('assertEquals': Name@256) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('get': Name@257) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('hasNext': Name@258) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('invoke': Name@259) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('iterator': Name@260) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('next': Name@261) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('size': Name@262) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('someFunction': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('toCollection': Name@264) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('transform': Name@265) = 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@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('add': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('arrayList': Name@255) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('assertEquals': Name@256) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('get': Name@257) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('hasNext': Name@258) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('invoke': Name@259) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('iterator': Name@260) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('next': Name@261) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('size': Name@262) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('someFunction': Name@263) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('toCollection': Name@264) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('transform': Name@265) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    memberIndex = computeMemberIndex$1@266 // 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@267) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('Array': Name@269) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('ArrayList': Name@270) = LazyJavaClassDescriptor@21['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('Int': Name@271) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('List': Name@272) = LazyJavaClassDescriptor@245['List'] // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('MutableCollection': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('String': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('add': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('arrayList': Name@255) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('assertEquals': Name@256) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('get': Name@257) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('hasNext': Name@258) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('invoke': Name@259) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('iterator': Name@260) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('next': Name@261) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('size': Name@262) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('someFunction': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('toCollection': Name@264) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('transform': Name@265) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    deserializedPackageScope = Empty@249 // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('ArrayList': Name@253) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('add': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('arrayList': Name@255) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('assertEquals': Name@256) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('get': Name@257) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('hasNext': Name@258) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('invoke': Name@259) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('iterator': Name@260) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('next': Name@261) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('size': Name@262) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('someFunction': Name@263) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('toCollection': Name@264) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('transform': Name@265) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    memberIndex = computeMemberIndex$1@275 // through LazyPackageFragmentScopeForJavaPackage@268
+    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@97
+    upperBounds = LinkedHashSet@271[1] { NullableType@272 }
+    upperBoundsAsType = NullableType@272
 }
 
 LazyJavaTypeParameterDescriptor@49['E'] {
+    defaultType = JetTypeImpl@273['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    upperBounds = LinkedHashSet@274[1] { NullableType@275 }
+    upperBoundsAsType = NullableType@275
+}
+
+LazyJavaTypeParameterDescriptor@45['E'] {
     defaultType = JetTypeImpl@276['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
     upperBounds = LinkedHashSet@277[1] { NullableType@278 }
     upperBoundsAsType = NullableType@278
 }
 
-LazyJavaTypeParameterDescriptor@45['E'] {
-    defaultType = JetTypeImpl@279['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-    upperBounds = LinkedHashSet@280[1] { NullableType@281 }
-    upperBoundsAsType = NullableType@281
+LazyJavaTypeParameterResolver@279 {
+    resolve(JavaTypeParameterImpl@280['E']) = LazyJavaTypeParameterDescriptor@54['E']
 }
 
-LazyJavaTypeParameterDescriptor@54['E'] {
-    defaultType = JetTypeImpl@282['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-    upperBounds = LinkedHashSet@283[1] { NullableType@284 }
-    upperBoundsAsType = NullableType@284
+LazyJavaTypeParameterResolver@281 {
+    resolve(JavaTypeParameterImpl@282['E']) = LazyJavaTypeParameterDescriptor@49['E']
+}
+
+LazyJavaTypeParameterResolver@283 {
+    resolve(JavaTypeParameterImpl@284['E']) = LazyJavaTypeParameterDescriptor@45['E']
 }
 
 LazyJavaTypeParameterResolver@285 {
-    resolve(JavaTypeParameterImpl@286['E']) = LazyJavaTypeParameterDescriptor@45['E']
+    resolve(JavaTypeParameterImpl@120['E']) = null
+}
+
+LazyJavaTypeParameterResolver@286 {
+    resolve(JavaTypeParameterImpl@100['E']) = null
 }
 
 LazyJavaTypeParameterResolver@287 {
-    resolve(JavaTypeParameterImpl@288['E']) = LazyJavaTypeParameterDescriptor@54['E']
+    resolve(JavaTypeParameterImpl@123['E']) = null
+}
+
+LazyJavaTypeParameterResolver@288 {
+    resolve(JavaTypeParameterImpl@107['E']) = null
 }
 
 LazyJavaTypeParameterResolver@289 {
-    resolve(JavaTypeParameterImpl@290['E']) = LazyJavaTypeParameterDescriptor@49['E']
+    resolve(JavaTypeParameterImpl@117['E']) = null
 }
 
-LazyJavaTypeParameterResolver@291 {
-    resolve(JavaTypeParameterImpl@108['E']) = null
+ResolutionTaskHolder@290 {
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@292 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }
 
-LazyJavaTypeParameterResolver@292 {
-    resolve(JavaTypeParameterImpl@132['E']) = null
+ResolutionTaskHolder@294 {
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
+    <name not found> = ArrayList@297[1] { 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]
 }
 
-LazyJavaTypeParameterResolver@293 {
-    resolve(JavaTypeParameterImpl@129['E']) = null
+ResolutionTaskHolder@298 {
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@300 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }
 
-LazyJavaTypeParameterResolver@294 {
-    resolve(JavaTypeParameterImpl@104['E']) = null
+ResolutionTaskHolder@302 {
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@304 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }
 
-LazyJavaTypeParameterResolver@295 {
-    resolve(JavaTypeParameterImpl@123['E']) = null
+ResolutionTaskHolder@306 {
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@308 }
+    <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@310 {
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@312 }
+    <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@314 {
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@316 }
+    <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@318 {
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@320 }
+    <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@322 {
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@324 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@326 {
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@328 }
+}
+
+ResolutionTaskHolder@330 {
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@332 }
+}
+
+ResolutionTaskHolder@334 {
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@336 }
+}
+
+ResolutionTaskHolder@338 {
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@340 }
+}
+
+ResolutionTaskHolder@342 {
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@344 }
+}
+
+ResolutionTaskHolder@346 {
+    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@348 }
+}
+
+ResolutionTaskHolder@350 {
+    <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
+    <name not found> = ArrayList@353[1] { ResolutionCandidate@352 }
+}
+
+ResolutionTaskHolder@354 {
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@356 }
+}
+
+ResolutionTaskHolder@358 {
+    <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@360 }
+}
+
+ResolutionTaskHolder@362 {
+    <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
+    <name not found> = ArrayList@365[1] { ResolutionCandidate@364 }
+}
+
+ResolutionTaskHolder@366 {
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@368 }
+}
+
+ResolutionTaskHolder@370 {
+    <name not found> = ArrayList@371[1] { ResolutionCandidate@372 }
+    <name not found> = ArrayList@373[1] { ResolutionCandidate@372 }
+}
+
+ResolutionTaskHolder@374 {
+    <name not found> = ArrayList@375[1] { ResolutionCandidate@376 }
+    <name not found> = ArrayList@377[1] { ResolutionCandidate@376 }
+}
+
+ResolutionTaskHolder@378 {
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@380 }
+}
+
+ResolutionTaskHolder@382 {
+    <name not found> = ArrayList@383[1] { ResolutionCandidate@384 }
+    <name not found> = ArrayList@385[1] { ResolutionCandidate@384 }
+}
+
+ResolutionTaskHolder@386 {
+    <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
+    <name not found> = ArrayList@389[1] { ResolutionCandidate@388 }
+}
+
+ResolutionTaskHolder@390 {
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@392 }
+}
+
+ResolutionTaskHolder@394 {
+    <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@396 }
+}
+
+ResolutionTaskHolder@398 {
+    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
+    <name not found> = ArrayList@401[1] { ResolutionCandidate@400 }
+}
+
+ResolutionTaskHolder@402 {
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
+    <name not found> = ArrayList@405[1] { ResolutionCandidate@404 }
+}
+
+ResolutionTaskHolder@406 {
+    <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
+    <name not found> = ArrayList@409[1] { ResolutionCandidate@408 }
+}
+
+ResolutionTaskHolder@410 {
+    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
+    <name not found> = ArrayList@413[1] { ResolutionCandidate@412 }
+}
+
+ResolutionTaskHolder@414 {
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
+    <name not found> = ArrayList@417[1] { ResolutionCandidate@416 }
+}
+
+ResolutionTaskHolder@418 {
+    <name not found> = ArrayList@419[1] { ResolutionCandidate@420 }
+    <name not found> = ArrayList@421[1] { ResolutionCandidate@420 }
+}
+
+ResolutionTaskHolder@422 {
+    <name not found> = ArrayList@423[1] { ResolutionCandidate@424 }
+    <name not found> = ArrayList@425[1] { ResolutionCandidate@424 }
+}
+
+ResolutionTaskHolder@426 {
+    <name not found> = ArrayList@427[2] { ResolutionCandidate@428, ResolutionCandidate@429 }
+    <name not found> = ArrayList@430[2] { ResolutionCandidate@428, ResolutionCandidate@429 }
+}
+
+ResolutionTaskHolder@431 {
+    <name not found> = ArrayList@432[3] { ResolutionCandidate@433, ResolutionCandidate@434, ResolutionCandidate@435 }
+    <name not found> = ArrayList@436[3] { ResolutionCandidate@433, ResolutionCandidate@434, ResolutionCandidate@435 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }

compiler/testData/diagnostics/tests/inference/regressions/kt2407.lazy.log

@@ -117,63 +117,63 @@ LazyJavaClassifierType@81['E'] {
     arguments = ArrayList@82[empty]
     classifier = JavaTypeParameterImpl@83['E']
     nullable = 'false': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
-LazyJavaClassifierType@85['E'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaTypeParameterImpl@87['E']
+LazyJavaClassifierType@84['E'] {
+    arguments = ArrayList@85[empty]
+    classifier = JavaTypeParameterImpl@86['E']
     nullable = 'false': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
 }
 
 LazyJavaClassifierType@88['E'] {
     arguments = ArrayList@89[empty]
     classifier = JavaTypeParameterImpl@90['E']
     nullable = 'false': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
 }
 
-LazyJavaClassifierType@91['E'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@93['E']
+LazyJavaClassifierType@92['E'] {
+    arguments = ArrayList@93[empty]
+    classifier = JavaTypeParameterImpl@94['E']
     nullable = 'false': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
 }
 
 LazyJavaClassifierType@95['E'] {
     arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@83['E']
+    classifier = JavaTypeParameterImpl@86['E']
     nullable = 'true': Boolean@97
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
 }
 
 LazyJavaClassifierType@98['E'] {
     arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@87['E']
+    classifier = JavaTypeParameterImpl@83['E']
     nullable = 'true': Boolean@97
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaClassifierType@100['E'] {
     arguments = ArrayList@101[empty]
-    classifier = JavaTypeParameterImpl@93['E']
+    classifier = JavaTypeParameterImpl@90['E']
     nullable = 'true': Boolean@97
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
 }
 
 LazyJavaClassifierType@102['E'] {
     arguments = ArrayList@103[empty]
-    classifier = JavaTypeParameterImpl@78['E']
+    classifier = JavaTypeParameterImpl@94['E']
     nullable = 'true': Boolean@97
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
 }
 
 LazyJavaClassifierType@104['E'] {
     arguments = ArrayList@105[empty]
-    classifier = JavaTypeParameterImpl@90['E']
+    classifier = JavaTypeParameterImpl@78['E']
     nullable = 'true': Boolean@97
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaClassifierType@45['List<E>'] {
@@ -329,16 +329,16 @@ LazyJavaPackageFragment@157['util'] {
 }
 
 LazyJavaTypeParameterDescriptor@47['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
     upperBounds = LinkedHashSet@215[1] { NullableType@216 }
 }
 
-LazyJavaTypeParameterDescriptor@38['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
+LazyJavaTypeParameterDescriptor@42['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
-LazyJavaTypeParameterDescriptor@42['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+LazyJavaTypeParameterDescriptor@38['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
 }
 
 LazyJavaTypeParameterResolver@217 {
@@ -352,3 +352,82 @@ LazyJavaTypeParameterResolver@219 {
 LazyJavaTypeParameterResolver@221 {
     resolve(JavaTypeParameterImpl@222['E']) = LazyJavaTypeParameterDescriptor@38['E']
 }
+
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
+    <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@227 {
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
+    <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@231 {
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
+    <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@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
+}
+
+ResolutionTaskHolder@239 {
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
+}
+
+ResolutionTaskHolder@243 {
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
+}
+
+ResolutionTaskHolder@247 {
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
+}
+
+ResolutionTaskHolder@251 {
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
+}
+
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
+}
+
+ResolutionTaskHolder@259 {
+    <name not found> = ArrayList@260[4] { ResolutionCandidate@261, ResolutionCandidate@262, ResolutionCandidate@263, ... }
+    <name not found> = ArrayList@264[4] { ResolutionCandidate@261, ResolutionCandidate@262, ResolutionCandidate@263, ... }
+    <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@265 {
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+}

compiler/testData/diagnostics/tests/inference/regressions/kt2445.lazy.log

@@ -33,11 +33,35 @@ LazyJavaPackageFragment@13['java'] {
 
 LazyJavaPackageFragment@15['lang'] {
     classes('callback': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('invoke': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('test': Name@36) = 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('invoke': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('test': Name@36) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@37 // 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> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <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@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <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> = ArrayList@48[1] { ResolutionCandidate@47 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }

compiler/testData/diagnostics/tests/inference/regressions/kt2459.lazy.log

@@ -193,12 +193,12 @@ LazyJavaPackageFragment@87['util'] {
 }
 
 LazyJavaTypeParameterDescriptor@18['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@43
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@39
     upperBounds = LinkedHashSet@118[1] { NullableType@119 }
 }
 
 LazyJavaTypeParameterDescriptor@13['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@39
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@43
 }
 
 LazyJavaTypeParameterResolver@120 {
@@ -206,5 +206,28 @@ LazyJavaTypeParameterResolver@120 {
 }
 
 LazyJavaTypeParameterResolver@122 {
-    resolve(JavaTypeParameterImpl@37['E']) = LazyJavaTypeParameterDescriptor@13['E']
+    resolve(JavaTypeParameterImpl@42['E']) = LazyJavaTypeParameterDescriptor@13['E']
+}
+
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@126[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]
+}
+
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+    <name not found> = EmptyList@107[empty]
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
 }

compiler/testData/diagnostics/tests/inference/regressions/kt2484.lazy.log

@@ -38,18 +38,269 @@ LazyJavaPackageFragment@15['java'] {
 LazyJavaPackageFragment@17['lang'] {
     classes('bar': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('forEach': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('hasNext': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('invoke': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('iterator': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('next': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('operation': Name@42) = 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('hasNext': Name@38) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('invoke': Name@39) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('iterator': Name@40) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('next': Name@41) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('operation': Name@42) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@43 // 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> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <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> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <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> = ArrayList@51[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]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[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]
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+    <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> = ArrayList@63[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]
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+    <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@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@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]
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+    <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@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+    <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@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+    <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> = ArrayList@87[1] { ResolutionCandidate@86 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+}
+
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+}
+
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+}
+
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+}
+
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+}
+
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+}
+
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+}
+
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+}
+
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+}
+
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+}
+
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+}
+
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+}
+
+ResolutionTaskHolder@188 {
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+}
+
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
+}
+
+ResolutionTaskHolder@196 {
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
+}
+
+ResolutionTaskHolder@200 {
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
+}
+
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
+}
+
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
 }

compiler/testData/diagnostics/tests/inference/regressions/kt2505.lazy.log

@@ -40,14 +40,14 @@ LazyJavaClassifierType@22['String'] {
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@13['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -75,21 +75,21 @@ LazyJavaClassifierType@36['Throwable'] {
 
 LazyJavaClassifierType@39['Throwable'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -144,9 +144,48 @@ LazyJavaPackageFragment@64['java'] {
 
 LazyJavaPackageFragment@66['lang'] {
     classes('Exception': Name@89) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('parseAs': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@90
     deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@90
     functions('Exception': Name@89) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('parseAs': Name@91) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@90
+    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@90
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
+    <name not found> = ArrayList@108[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[4] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
+    <name not found> = ArrayList@114[5] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
+    <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]
 }

compiler/testData/diagnostics/tests/inference/regressions/kt2514.lazy.log

@@ -1,386 +1,480 @@
 LazyJavaClassDescriptor@0['AutoCloseable'] {
     defaultType = JetTypeImpl@1['AutoCloseable']
-    functions('block': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('clone': Name@5) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('close': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['close'] } // through LazyJavaClassMemberScope@4
-    functions('equals': Name@9) = ArrayList@10[1] { DeserializedSimpleFunctionDescriptor@11['equals'] } // through LazyJavaClassMemberScope@4
-    functions('finalize': Name@12) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('getClass': Name@13) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('hashCode': Name@14) = ArrayList@15[1] { DeserializedSimpleFunctionDescriptor@16['hashCode'] } // through LazyJavaClassMemberScope@4
-    functions('invoke': Name@17) = EmptyList@3[empty] // 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
-    properties('block': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@25['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@26['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@27['Closeable'] {
-    allDescriptors = ArrayList@28[4] { DeserializedSimpleFunctionDescriptor@29['hashCode'], JavaMethodDescriptor@30['close'], DeserializedSimpleFunctionDescriptor@31['toString'], ... } // through LazyJavaClassMemberScope@32
-    annotations = LazyJavaAnnotations@33
-    defaultType = JetTypeImpl@34['Closeable']
-    enumEntryIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@32
-    functionTypeForSamInterface = JetTypeImpl@36['Function0<1>']
-    functions('block': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    functions('clone': Name@5) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    functions('close': Name@37) = ArrayList@38[1] { JavaMethodDescriptor@30['close'] } // through LazyJavaClassMemberScope@32
-    functions('equals': Name@9) = ArrayList@39[1] { DeserializedSimpleFunctionDescriptor@40['equals'] } // through LazyJavaClassMemberScope@32
-    functions('finalize': Name@12) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    functions('getClass': Name@13) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    functions('hashCode': Name@14) = ArrayList@41[1] { DeserializedSimpleFunctionDescriptor@29['hashCode'] } // through LazyJavaClassMemberScope@32
-    functions('invoke': Name@17) = EmptyList@3[empty] // 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@42[1] { DeserializedSimpleFunctionDescriptor@31['toString'] } // through LazyJavaClassMemberScope@32
-    functions('wait': Name@23) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    memberIndex = computeMemberIndex$1@43 // through LazyJavaClassMemberScope@32
-    nestedClassIndex = LinkedHashMap@44 // through LazyJavaClassMemberScope@32
-    nestedClasses('block': Name@2) = null // through LazyJavaClassMemberScope@32
-    properties('block': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@45['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@46['Closeable']
+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@47['Runnable'] {
-    functionTypeForSamInterface = JetTypeImpl@48['Function0<1>']
-    functions('block': Name@49) = EmptyList@3[empty] // through LazyJavaClassMemberScope@50
-    functions('invoke': Name@51) = EmptyList@3[empty] // through LazyJavaClassMemberScope@50
-    functions('plus': Name@52) = EmptyList@3[empty] // through LazyJavaClassMemberScope@50
-    functions('use': Name@53) = EmptyList@3[empty] // through LazyJavaClassMemberScope@50
-    memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@50
-    properties('block': Name@49) = EmptyList@3[empty] // through LazyJavaClassMemberScope@50
-    properties('plus': Name@52) = EmptyList@3[empty] // through LazyJavaClassMemberScope@50
-    properties('use': Name@53) = EmptyList@3[empty] // through LazyJavaClassMemberScope@50
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@55['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+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@57['Thread'] {
-    constructors = ArrayList@58[13] { JavaConstructorDescriptor@59['<init>'], JavaConstructorDescriptor@60['<init>'], SamAdapterConstructorDescriptor@61['<init>'], ... } // through LazyJavaClassMemberScope@62
-    defaultType = JetTypeImpl@63['Thread']
-    enumEntryIndex = LinkedHashMap@64 // through LazyJavaClassMemberScope@62
+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('block': Name@49) = EmptyList@3[empty] // through LazyJavaClassMemberScope@62
-    functions('invoke': Name@51) = EmptyList@3[empty] // through LazyJavaClassMemberScope@62
-    functions('plus': Name@52) = EmptyList@3[empty] // through LazyJavaClassMemberScope@62
-    functions('use': Name@53) = EmptyList@3[empty] // through LazyJavaClassMemberScope@62
-    memberIndex = computeMemberIndex$1@65 // through LazyJavaClassMemberScope@62
-    nestedClassIndex = LinkedHashMap@66 // through LazyJavaClassMemberScope@62
-    nestedClasses('block': Name@49) = null // through LazyJavaClassMemberScope@62
-    nestedClasses('use': Name@53) = null // through LazyJavaClassMemberScope@62
-    properties('block': Name@49) = EmptyList@3[empty] // through LazyJavaClassMemberScope@62
-    properties('plus': Name@52) = EmptyList@3[empty] // through LazyJavaClassMemberScope@62
-    properties('use': Name@53) = EmptyList@3[empty] // through LazyJavaClassMemberScope@62
-    typeConstructor = LazyJavaClassTypeConstructor@67['Thread']
+    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@26['AutoCloseable'] {
-    parameters = ArrayList@68[empty]
-    supertypes = ArrayList@69[1] { JetTypeImpl@70['Any'] }
+LazyJavaClassTypeConstructor@24['AutoCloseable'] {
+    parameters = ArrayList@64[empty]
+    supertypes = ArrayList@65[1] { JetTypeImpl@66['Any'] }
 }
 
-LazyJavaClassTypeConstructor@46['Closeable'] {
-    parameters = ArrayList@71[empty]
-    supertypes = ArrayList@72[1] { LazyJavaClassifierType@73['AutoCloseable'] }
+LazyJavaClassTypeConstructor@44['Closeable'] {
+    parameters = ArrayList@67[empty]
+    supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@56['Runnable'] {
-    parameters = ArrayList@74[empty]
-    supertypes = ArrayList@75[1] { JetTypeImpl@70['Any'] }
+LazyJavaClassTypeConstructor@52['Runnable'] {
+    parameters = ArrayList@70[empty]
+    supertypes = ArrayList@71[1] { JetTypeImpl@66['Any'] }
 }
 
-LazyJavaClassTypeConstructor@67['Thread'] {
-    parameters = ArrayList@76[empty]
-    supertypes = ArrayList@77[1] { LazyJavaClassifierType@78['Runnable'] }
+LazyJavaClassTypeConstructor@63['Thread'] {
+    parameters = ArrayList@72[empty]
+    supertypes = ArrayList@73[1] { LazyJavaClassifierType@74['Runnable'] }
 }
 
-LazyJavaClassifierType@73['AutoCloseable'] {
-    arguments = ArrayList@79[empty]
-    classifier = JavaClassImpl@80['AutoCloseable']
+LazyJavaClassifierType@69['AutoCloseable'] {
+    arguments = ArrayList@75[empty]
+    classifier = JavaClassImpl@76['AutoCloseable']
     memberScope = LazyJavaClassMemberScope@4
-    typeConstructor = LazyJavaClassTypeConstructor@26['AutoCloseable']
+    typeConstructor = LazyJavaClassTypeConstructor@24['AutoCloseable']
 }
 
-LazyJavaClassifierType@81['Object'] {
-    classifier = JavaClassImpl@82['Object']
-    typeConstructor = DeserializedClassTypeConstructor@83
+LazyJavaClassifierType@77['Object'] {
+    classifier = JavaClassImpl@78['Object']
+    typeConstructor = DeserializedClassTypeConstructor@79
 }
 
-LazyJavaClassifierType@84['Object'] {
-    classifier = JavaClassImpl@85['Object']
-    typeConstructor = DeserializedClassTypeConstructor@83
+LazyJavaClassifierType@80['Object'] {
+    classifier = JavaClassImpl@81['Object']
+    typeConstructor = DeserializedClassTypeConstructor@79
 }
 
-LazyJavaClassifierType@86['Object'] {
-    classifier = JavaClassImpl@87['Object']
-    typeConstructor = DeserializedClassTypeConstructor@83
+LazyJavaClassifierType@82['Object'] {
+    classifier = JavaClassImpl@83['Object']
+    typeConstructor = DeserializedClassTypeConstructor@79
 }
 
-LazyJavaClassifierType@78['Runnable'] {
-    arguments = ArrayList@88[empty]
-    classifier = JavaClassImpl@89['Runnable']
-    memberScope = LazyJavaClassMemberScope@50
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+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@93
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+    nullable = 'false': Boolean@89
+    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
 
-LazyJavaClassifierType@94['Runnable'] {
-    arguments = ArrayList@95[empty]
-    classifier = JavaClassImpl@96['Runnable']
-    nullable = 'false': Boolean@93
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+LazyJavaClassifierType@93['Runnable'] {
+    arguments = ArrayList@94[empty]
+    classifier = JavaClassImpl@95['Runnable']
+    nullable = 'false': Boolean@89
+    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
 
-LazyJavaClassifierType@97['Runnable'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaClassImpl@99['Runnable']
-    nullable = 'false': Boolean@93
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+LazyJavaClassifierType@96['Runnable'] {
+    arguments = ArrayList@97[empty]
+    classifier = JavaClassImpl@98['Runnable']
+    nullable = 'false': Boolean@89
+    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
 
-LazyJavaClassifierType@100['Runnable'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaClassImpl@102['Runnable']
-    nullable = 'false': Boolean@93
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+LazyJavaClassifierType@99['Runnable'] {
+    arguments = ArrayList@100[empty]
+    classifier = JavaClassImpl@101['Runnable']
+    nullable = 'false': Boolean@89
+    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
 
-LazyJavaClassifierType@103['Runnable'] {
-    arguments = ArrayList@104[empty]
-    classifier = JavaClassImpl@105['Runnable']
-    nullable = 'false': Boolean@93
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+LazyJavaClassifierType@102['Runnable'] {
+    arguments = ArrayList@103[empty]
+    classifier = JavaClassImpl@101['Runnable']
+    nullable = 'true': Boolean@104
+    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
 
-LazyJavaClassifierType@106['Runnable'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaClassImpl@96['Runnable']
-    nullable = 'true': Boolean@108
-    typeConstructor = LazyJavaClassTypeConstructor@56['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@95['Runnable']
+    nullable = 'true': Boolean@104
+    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
 
 LazyJavaClassifierType@109['Runnable'] {
     arguments = ArrayList@110[empty]
-    classifier = JavaClassImpl@105['Runnable']
-    nullable = 'true': Boolean@108
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+    classifier = JavaClassImpl@88['Runnable']
+    nullable = 'true': Boolean@104
+    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
 
 LazyJavaClassifierType@111['Runnable'] {
     arguments = ArrayList@112[empty]
-    classifier = JavaClassImpl@92['Runnable']
-    nullable = 'true': Boolean@108
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+    classifier = JavaClassImpl@98['Runnable']
+    nullable = 'true': Boolean@104
+    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
 
-LazyJavaClassifierType@113['Runnable'] {
+LazyJavaClassifierType@113['String'] {
     arguments = ArrayList@114[empty]
-    classifier = JavaClassImpl@102['Runnable']
-    nullable = 'true': Boolean@108
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
-}
-
-LazyJavaClassifierType@115['Runnable'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaClassImpl@99['Runnable']
-    nullable = 'true': Boolean@108
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+    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@93
-    typeConstructor = DeserializedClassTypeConstructor@120
+    nullable = 'false': Boolean@89
+    typeConstructor = DeserializedClassTypeConstructor@116
 }
 
-LazyJavaClassifierType@121['String'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaClassImpl@123['String']
-    nullable = 'false': Boolean@93
-    typeConstructor = DeserializedClassTypeConstructor@120
+LazyJavaClassifierType@120['String'] {
+    arguments = ArrayList@121[empty]
+    classifier = JavaClassImpl@122['String']
+    nullable = 'false': Boolean@89
+    typeConstructor = DeserializedClassTypeConstructor@116
 }
 
-LazyJavaClassifierType@124['String'] {
-    arguments = ArrayList@125[empty]
-    classifier = JavaClassImpl@126['String']
-    nullable = 'false': Boolean@93
-    typeConstructor = DeserializedClassTypeConstructor@120
+LazyJavaClassifierType@123['String'] {
+    arguments = ArrayList@124[empty]
+    classifier = JavaClassImpl@125['String']
+    nullable = 'false': Boolean@89
+    typeConstructor = DeserializedClassTypeConstructor@116
 }
 
-LazyJavaClassifierType@127['String'] {
-    arguments = ArrayList@128[empty]
-    classifier = JavaClassImpl@129['String']
-    nullable = 'false': Boolean@93
-    typeConstructor = DeserializedClassTypeConstructor@120
+LazyJavaClassifierType@126['String'] {
+    arguments = ArrayList@127[empty]
+    classifier = JavaClassImpl@128['String']
+    nullable = 'false': Boolean@89
+    typeConstructor = DeserializedClassTypeConstructor@116
 }
 
-LazyJavaClassifierType@130['String'] {
-    arguments = ArrayList@131[empty]
-    classifier = JavaClassImpl@132['String']
-    nullable = 'false': Boolean@93
-    typeConstructor = DeserializedClassTypeConstructor@120
+LazyJavaClassifierType@129['String'] {
+    arguments = ArrayList@130[empty]
+    classifier = JavaClassImpl@122['String']
+    nullable = 'true': Boolean@104
+    typeConstructor = DeserializedClassTypeConstructor@116
+}
+
+LazyJavaClassifierType@131['String'] {
+    arguments = ArrayList@132[empty]
+    classifier = JavaClassImpl@128['String']
+    nullable = 'true': Boolean@104
+    typeConstructor = DeserializedClassTypeConstructor@116
 }
 
 LazyJavaClassifierType@133['String'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaClassImpl@129['String']
-    nullable = 'true': Boolean@108
-    typeConstructor = DeserializedClassTypeConstructor@120
+    classifier = JavaClassImpl@115['String']
+    nullable = 'true': Boolean@104
+    typeConstructor = DeserializedClassTypeConstructor@116
 }
 
 LazyJavaClassifierType@135['String'] {
     arguments = ArrayList@136[empty]
     classifier = JavaClassImpl@119['String']
-    nullable = 'true': Boolean@108
-    typeConstructor = DeserializedClassTypeConstructor@120
+    nullable = 'true': Boolean@104
+    typeConstructor = DeserializedClassTypeConstructor@116
 }
 
 LazyJavaClassifierType@137['String'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaClassImpl@126['String']
-    nullable = 'true': Boolean@108
-    typeConstructor = DeserializedClassTypeConstructor@120
+    classifier = JavaClassImpl@125['String']
+    nullable = 'true': Boolean@104
+    typeConstructor = DeserializedClassTypeConstructor@116
 }
 
-LazyJavaClassifierType@139['String'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaClassImpl@132['String']
-    nullable = 'true': Boolean@108
-    typeConstructor = DeserializedClassTypeConstructor@120
+LazyJavaClassifierType@139['ThreadGroup'] {
+    classifier = null
+    nullable = 'false': Boolean@89
+    typeConstructor = TypeConstructorImpl$1@140
 }
 
-LazyJavaClassifierType@141['String'] {
-    arguments = ArrayList@142[empty]
-    classifier = JavaClassImpl@123['String']
-    nullable = 'true': Boolean@108
-    typeConstructor = DeserializedClassTypeConstructor@120
+LazyJavaClassifierType@141['ThreadGroup'] {
+    classifier = null
+    nullable = 'false': Boolean@89
+    typeConstructor = TypeConstructorImpl$1@142
 }
 
 LazyJavaClassifierType@143['ThreadGroup'] {
     classifier = null
-    nullable = 'false': Boolean@93
+    nullable = 'false': Boolean@89
     typeConstructor = TypeConstructorImpl$1@144
 }
 
 LazyJavaClassifierType@145['ThreadGroup'] {
     classifier = null
-    nullable = 'false': Boolean@93
+    nullable = 'false': Boolean@89
     typeConstructor = TypeConstructorImpl$1@146
 }
 
 LazyJavaClassifierType@147['ThreadGroup'] {
-    classifier = null
-    nullable = 'false': Boolean@93
-    typeConstructor = TypeConstructorImpl$1@148
+    nullable = 'true': Boolean@104
+}
+
+LazyJavaClassifierType@148['ThreadGroup'] {
+    nullable = 'true': Boolean@104
 }
 
 LazyJavaClassifierType@149['ThreadGroup'] {
-    classifier = null
-    nullable = 'false': Boolean@93
-    typeConstructor = TypeConstructorImpl$1@150
+    nullable = 'true': Boolean@104
 }
 
-LazyJavaClassifierType@151['ThreadGroup'] {
-    nullable = 'true': Boolean@108
+LazyJavaClassifierType@150['ThreadGroup'] {
+    nullable = 'true': Boolean@104
 }
 
-LazyJavaClassifierType@152['ThreadGroup'] {
-    nullable = 'true': Boolean@108
+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']
 }
 
-LazyJavaClassifierType@153['ThreadGroup'] {
-    nullable = 'true': Boolean@108
+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
 }
 
-LazyJavaClassifierType@154['ThreadGroup'] {
-    nullable = 'true': Boolean@108
+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
 }
 
-LazyJavaPackageFragmentProvider@155 {
-    packageFragments('<root>': FqName@156) = LazyJavaPackageFragment@157['<root>']
-    packageFragments('Array': FqName@158) = null
-    packageFragments('Closeable': FqName@159) = null
-    packageFragments('Int': FqName@160) = null
-    packageFragments('R': FqName@161) = null
-    packageFragments('String': FqName@162) = null
-    packageFragments('T': FqName@163) = null
-    packageFragments('Thread': FqName@164) = null
-    packageFragments('Unit': FqName@165) = null
-    packageFragments('java': FqName@166) = LazyJavaPackageFragment@167['java']
-    packageFragments('java.io': FqName@168) = LazyJavaPackageFragment@169['io']
-    packageFragments('java.io.Closeable': FqName@170) = null
-    packageFragments('java.lang': FqName@171) = LazyJavaPackageFragment@172['lang']
-    packageFragments('java.lang.Array': FqName@173) = null
-    packageFragments('java.lang.Closeable': FqName@174) = null
-    packageFragments('java.lang.Int': FqName@175) = null
-    packageFragments('java.lang.R': FqName@176) = null
-    packageFragments('java.lang.String': FqName@177) = null
-    packageFragments('java.lang.T': FqName@178) = null
-    packageFragments('java.lang.Thread': FqName@179) = null
-    packageFragments('java.lang.Unit': FqName@180) = null
-    packageFragments('kotlin': FqName@181) = null
-    packageFragments('kotlin.Array': FqName@182) = null
-    packageFragments('kotlin.Closeable': FqName@183) = null
-    packageFragments('kotlin.Int': FqName@184) = null
-    packageFragments('kotlin.R': FqName@185) = null
-    packageFragments('kotlin.String': FqName@186) = null
-    packageFragments('kotlin.T': FqName@187) = null
-    packageFragments('kotlin.Thread': FqName@188) = null
-    packageFragments('kotlin.Unit': FqName@189) = null
-    packageFragments('kotlin.io': FqName@190) = null
-    packageFragments('kotlin.jvm': FqName@191) = null
-    packageFragments('kt2514': FqName@192) = null
-    packageFragments('kt2514.Array': FqName@193) = null
-    packageFragments('kt2514.Closeable': FqName@194) = null
-    packageFragments('kt2514.Int': FqName@195) = null
-    packageFragments('kt2514.R': FqName@196) = null
-    packageFragments('kt2514.String': FqName@197) = null
-    packageFragments('kt2514.T': FqName@198) = null
-    packageFragments('kt2514.Thread': FqName@199) = null
-    packageFragments('kt2514.Unit': FqName@200) = null
-    topLevelClasses(JavaClassImpl@80['AutoCloseable']) = LazyJavaClassDescriptor@0['AutoCloseable']
-    topLevelClasses(JavaClassImpl@201['Closeable']) = LazyJavaClassDescriptor@27['Closeable']
-    topLevelClasses(JavaClassImpl@89['Runnable']) = LazyJavaClassDescriptor@47['Runnable']
-    topLevelClasses(JavaClassImpl@202['Thread']) = LazyJavaClassDescriptor@57['Thread']
+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
 }
 
-LazyJavaPackageFragment@169['io'] {
-    classes('Closeable': Name@203) = LazyJavaClassDescriptor@27['Closeable'] // through LazyPackageFragmentScopeForJavaPackage@204
-    deserializedPackageScope = Empty@205 // through LazyPackageFragmentScopeForJavaPackage@204
-    functions('Closeable': Name@206) = ArrayList@207[1] { SamConstructorDescriptor@208['Closeable'] } // through LazyPackageFragmentScopeForJavaPackage@204
-    memberIndex = computeMemberIndex$1@209 // through LazyPackageFragmentScopeForJavaPackage@204
+ResolutionTaskHolder@217 {
+    <name not found> = ArrayList@218[13] { ResolutionCandidate@219, ResolutionCandidate@220, ResolutionCandidate@221, ... }
+    <name not found> = ArrayList@222[8] { ResolutionCandidate@219, ResolutionCandidate@220, ResolutionCandidate@223, ... }
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
 }
 
-LazyJavaPackageFragment@167['java'] {
-    classes('io': Name@210) = null // through LazyPackageFragmentScopeForJavaPackage@211
-    classes('lang': Name@212) = null // through LazyPackageFragmentScopeForJavaPackage@211
-    deserializedPackageScope = Empty@205 // through LazyPackageFragmentScopeForJavaPackage@211
-    functions('io': Name@213) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@211
-    functions('lang': Name@214) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@211
-    memberIndex = computeMemberIndex$1@215 // through LazyPackageFragmentScopeForJavaPackage@211
+ResolutionTaskHolder@224 {
+    <name not found> = ArrayList@225[13] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
+    <name not found> = ArrayList@229[8] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@230, ... }
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
 }
 
-LazyJavaPackageFragment@172['lang'] {
-    classes('Thread': Name@216) = LazyJavaClassDescriptor@57['Thread'] // through LazyPackageFragmentScopeForJavaPackage@217
-    classes('block': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@217
-    classes('invoke': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@217
-    classes('plus': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@217
-    classes('use': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@217
-    deserializedPackageScope = Empty@205 // through LazyPackageFragmentScopeForJavaPackage@217
-    functions('Thread': Name@218) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@217
-    functions('block': Name@49) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@217
-    functions('invoke': Name@51) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@217
-    functions('plus': Name@52) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@217
-    functions('use': Name@53) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@217
-    memberIndex = computeMemberIndex$1@219 // through LazyPackageFragmentScopeForJavaPackage@217
+ResolutionTaskHolder@231 {
+    <name not found> = ArrayList@232[13] { ResolutionCandidate@233, ResolutionCandidate@234, ResolutionCandidate@235, ... }
+    <name not found> = ArrayList@236[8] { ResolutionCandidate@233, ResolutionCandidate@234, ResolutionCandidate@237, ... }
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+}
+
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[13] { ResolutionCandidate@240, ResolutionCandidate@241, ResolutionCandidate@242, ... }
+    <name not found> = ArrayList@243[8] { ResolutionCandidate@240, ResolutionCandidate@241, ResolutionCandidate@244, ... }
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+}
+
+ResolutionTaskHolder@245 {
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+}
+
+ResolutionTaskHolder@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+}
+
+ResolutionTaskHolder@256 {
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+}
+
+ResolutionTaskHolder@260 {
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@262 }
+}
+
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[2] { ResolutionCandidate@266, ResolutionCandidate@267 }
+    <name not found> = ArrayList@268[2] { ResolutionCandidate@266, ResolutionCandidate@267 }
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+}
+
+ResolutionTaskHolder@269 {
+    <name not found> = ArrayList@270[2] { ResolutionCandidate@271, ResolutionCandidate@272 }
+    <name not found> = ArrayList@273[2] { ResolutionCandidate@271, ResolutionCandidate@272 }
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+}
+
+ResolutionTaskHolder@274 {
+    <name not found> = ArrayList@275[2] { ResolutionCandidate@276, ResolutionCandidate@277 }
+    <name not found> = ArrayList@278[2] { ResolutionCandidate@276, ResolutionCandidate@277 }
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+}
+
+ResolutionTaskHolder@279 {
+    <name not found> = ArrayList@280[2] { ResolutionCandidate@281, ResolutionCandidate@282 }
+    <name not found> = ArrayList@283[2] { ResolutionCandidate@281, ResolutionCandidate@282 }
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+}
+
+ResolutionTaskHolder@284 {
+    <name not found> = ArrayList@285[8] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288, ... }
+    <name not found> = ArrayList@289[8] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288, ... }
+}
+
+ResolutionTaskHolder@290 {
+    <name not found> = ArrayList@291[8] { ResolutionCandidate@292, ResolutionCandidate@293, ResolutionCandidate@294, ... }
+    <name not found> = ArrayList@295[8] { ResolutionCandidate@292, ResolutionCandidate@293, ResolutionCandidate@294, ... }
 }

compiler/testData/diagnostics/tests/inference/regressions/kt2741.lazy.log

@@ -33,21 +33,21 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@13['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -75,21 +75,21 @@ LazyJavaClassifierType@36['Throwable'] {
 
 LazyJavaClassifierType@39['Throwable'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -161,3 +161,96 @@ LazyJavaPackageFragment@68['lang'] {
     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> = ArrayList@105[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]
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+    <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@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+    <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@114 {
+    <name not found> = ArrayList@115[4] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+    <name not found> = ArrayList@119[5] { 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]
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+    <name not found> = ArrayList@125[5] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+    <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@126 {
+    <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@127 {
+    <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]
+}

compiler/testData/diagnostics/tests/inference/regressions/kt2838.lazy.log

@@ -38,7 +38,7 @@ LazyJavaClassifierType@22['String'] {
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@16['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -52,7 +52,7 @@ LazyJavaClassifierType@28['String'] {
 
 LazyJavaClassifierType@30['String'] {
     arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@16['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -80,14 +80,14 @@ LazyJavaClassifierType@39['Throwable'] {
 
 LazyJavaClassifierType@42['Throwable'] {
     arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@34['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@44['Throwable'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@34['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
@@ -143,11 +143,113 @@ 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
-    classes('get': Name@88) = 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
-    functions('get': Name@88) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@85
+    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@85
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+    <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@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+    <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@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@100[1] { 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]
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+    <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@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+}
+
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+}
+
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+}
+
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
+}
+
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+}
+
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[4] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
+    <name not found> = ArrayList@150[5] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
+    <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@151 {
+    <name not found> = ArrayList@152[4] { ResolutionCandidate@153, ResolutionCandidate@154, ResolutionCandidate@155, ... }
+    <name not found> = ArrayList@156[5] { ResolutionCandidate@153, ResolutionCandidate@154, ResolutionCandidate@155, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
 }

compiler/testData/diagnostics/tests/inference/regressions/kt2841.lazy.log

@@ -53,14 +53,83 @@ LazyJavaPackageFragment@23['java'] {
 LazyJavaPackageFragment@25['lang'] {
     classes('C': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
     classes('block': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('invoke': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('use1': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('x': Name@55) = 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('invoke': Name@53) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('use1': Name@54) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('x': Name@56) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@57 // 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> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <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@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+    <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> = ArrayList@68[1] { ResolutionCandidate@67 }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <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@78 {
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
 }

compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.lazy.log

@@ -45,16 +45,93 @@ LazyJavaPackageFragment@19['java'] {
 LazyJavaPackageFragment@21['lang'] {
     classes('C': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
     classes('block': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('close': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('invoke': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('use': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('x': Name@48) = 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('close': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('invoke': Name@46) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('use': Name@47) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('x': Name@49) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@50 // 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> = ArrayList@52[1] { ResolutionCandidate@51 }
+    <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> = ArrayList@56[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]
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <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> = ArrayList@64[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+}
+
+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]
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
 }

compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.lazy.log

@@ -45,16 +45,187 @@ LazyJavaPackageFragment@19['java'] {
 LazyJavaPackageFragment@21['lang'] {
     classes('C': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
     classes('block': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('close': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('invoke': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('use': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('xx': Name@48) = 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('close': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('invoke': Name@46) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('use': Name@47) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('xx': Name@49) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@50 // 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> = ArrayList@53[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]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <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> = ArrayList@61[1] { ResolutionCandidate@60 }
+    <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> = ArrayList@65[1] { ResolutionCandidate@64 }
+    <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@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <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@95 {
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
 }

compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.lazy.log

@@ -45,16 +45,169 @@ LazyJavaPackageFragment@19['java'] {
 LazyJavaPackageFragment@21['lang'] {
     classes('C': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
     classes('block': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('close': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('invoke': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('use': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('x': Name@48) = 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('close': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('invoke': Name@46) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('use': Name@47) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('x': Name@49) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@50 // 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@52 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[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]
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <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@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+    <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@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+    <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@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <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@82 {
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
 }

compiler/testData/diagnostics/tests/inference/regressions/kt2842.lazy.log

@@ -71,3 +71,78 @@ LazyJavaPackageFragment@29['lang'] {
     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> = ArrayList@70[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]
+    <name not found> = EmptyList@59[empty]
+    <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@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+    <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@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+    <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> = ArrayList@82[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]
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+}

compiler/testData/diagnostics/tests/inference/regressions/kt2883.lazy.log

@@ -45,13 +45,109 @@ LazyJavaPackageFragment@19['java'] {
 
 LazyJavaPackageFragment@21['lang'] {
     classes('Y': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('add': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('bar': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('doAction': Name@49) = 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('add': Name@47) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('bar': Name@48) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('doAction': Name@49) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@50 // 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> = ArrayList@53[1] { ResolutionCandidate@52 }
+    <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@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+    <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@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+    <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> = ArrayList@65[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]
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[2] { ResolutionCandidate@96, ResolutionCandidate@97 }
+    <name not found> = ArrayList@98[2] { ResolutionCandidate@96, ResolutionCandidate@97 }
+    <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@99 {
+    <name not found> = ArrayList@100[2] { ResolutionCandidate@101, ResolutionCandidate@102 }
+    <name not found> = ArrayList@103[2] { ResolutionCandidate@101, ResolutionCandidate@102 }
+    <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@104 {
+    <name not found> = ArrayList@105[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
+    <name not found> = ArrayList@108[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
 }

compiler/testData/diagnostics/tests/inference/regressions/kt3007.lazy.log

@@ -36,12 +36,405 @@ LazyJavaPackageFragment@15['java'] {
 }
 
 LazyJavaPackageFragment@17['lang'] {
-    classes('equals': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('fold': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('tempFun': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('fold': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('tempFun': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
     deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@37) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('fold': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('tempFun': Name@40) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@41 // 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> = ArrayList@44[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]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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> = ArrayList@52[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]
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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> = ArrayList@60[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]
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+    <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> = ArrayList@72[1] { ResolutionCandidate@71 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+}
+
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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@118 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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@119 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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@120 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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@121 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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@122 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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@123 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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@124 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }

compiler/testData/diagnostics/tests/inference/regressions/kt3038.lazy.log

@@ -39,3 +39,140 @@ LazyJavaPackageFragment@15['lang'] {
     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> = ArrayList@38[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]
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@42[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]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[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]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+    <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> = ArrayList@54[1] { ResolutionCandidate@53 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+    <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> = ArrayList@62[1] { ResolutionCandidate@61 }
+    <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> = ArrayList@66[1] { ResolutionCandidate@65 }
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+}
+
+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]
+}
+
+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]
+}
+
+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]
+}
+
+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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}

compiler/testData/diagnostics/tests/inference/regressions/kt3150.lazy.log

@@ -160,3 +160,87 @@ LazyJavaTypeParameterDescriptor@19['T'] {
 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@102 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+    <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> = ArrayList@110[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@118[2] { ResolutionCandidate@119, ResolutionCandidate@120 }
+    <name not found> = ArrayList@121[2] { ResolutionCandidate@119, ResolutionCandidate@120 }
+    <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> = ArrayList@125[1] { ResolutionCandidate@124 }
+    <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@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+    <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@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@133[1] { 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]
+}
+
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+}
+
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+}
+
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+}
+
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+}
+
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+}
+
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+}

compiler/testData/diagnostics/tests/inference/regressions/kt3174.lazy.log

@@ -37,12 +37,53 @@ LazyJavaPackageFragment@16['java'] {
 }
 
 LazyJavaPackageFragment@18['lang'] {
-    classes('add': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('fff': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('fff': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('test': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
     deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('add': Name@36) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('fff': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('test': Name@39) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@40 // 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> = ArrayList@43[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]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[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]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[2] { ResolutionCandidate@66, ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[2] { ResolutionCandidate@66, ResolutionCandidate@67 }
 }

compiler/testData/diagnostics/tests/inference/regressions/kt3301.lazy.log

@@ -41,3 +41,49 @@ LazyJavaPackageFragment@17['lang'] {
     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> = ArrayList@42[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]
+    <name not found> = EmptyList@33[empty]
+    <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> = ArrayList@46[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]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+    <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> = ArrayList@54[1] { ResolutionCandidate@53 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}

compiler/testData/diagnostics/tests/inference/regressions/kt3344.lazy.log

@@ -6,80 +6,75 @@ 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
-    properties('add': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractCollection']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
 }
 
-LazyJavaClassDescriptor@13['AbstractList'] {
-    defaultType = JetTypeImpl@14['AbstractList<1>']
-    functions('add': Name@15) = ArrayList@16[2] { JavaMethodDescriptor@17['add'], JavaMethodDescriptor@18['add'] } // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
-    properties('add': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@19
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@21['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@22['AbstractList']
+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@23['AbstractMap'] {
-    typeConstructor = LazyJavaClassTypeConstructor@24['AbstractMap']
+LazyJavaClassDescriptor@21['AbstractMap'] {
+    typeConstructor = LazyJavaClassTypeConstructor@22['AbstractMap']
 }
 
-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
+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@9) = ArrayList@33[2] { JavaMethodDescriptor@34['add'], JavaMethodDescriptor@35['add'] } // through LazyJavaClassMemberScope@30
-    memberIndex = computeMemberIndex$1@36 // through LazyJavaClassMemberScope@30
-    nestedClassIndex = LinkedHashMap@37 // through LazyJavaClassMemberScope@30
-    nestedClasses('add': Name@9) = null // through LazyJavaClassMemberScope@30
-    properties('add': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@30
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@38['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@39['ArrayList']
+    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@40['HashMap'] {
-    constructors = ArrayList@41[4] { JavaConstructorDescriptor@42['<init>'], JavaConstructorDescriptor@43['<init>'], JavaConstructorDescriptor@44['<init>'], ... } // through LazyJavaClassMemberScope@45
-    defaultType = JetTypeImpl@46['HashMap<2>']
+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@47['HashMap']
+    typeConstructor = LazyJavaClassTypeConstructor@46['HashMap']
 }
 
-LazyJavaClassDescriptor@48['RandomAccess'] {
-    functions('add': Name@15) = EmptyList@10[empty] // through LazyJavaClassMemberScope@49
+LazyJavaClassDescriptor@47['RandomAccess'] {
+    functions('add': Name@13) = EmptyList@48[empty] // through LazyJavaClassMemberScope@49
     memberIndex = computeMemberIndex$1@50 // through LazyJavaClassMemberScope@49
-    properties('add': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@49
     typeConstructor = LazyJavaClassTypeConstructor@51['RandomAccess']
 }
 
 LazyJavaClassDescriptor@52['Serializable'] {
-    functions('add': Name@15) = EmptyList@10[empty] // through LazyJavaClassMemberScope@53
+    functions('add': Name@13) = EmptyList@48[empty] // through LazyJavaClassMemberScope@53
     memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@53
-    properties('add': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@53
     typeConstructor = LazyJavaClassTypeConstructor@55['Serializable']
 }
 
-LazyJavaClassTypeConstructor@12['AbstractCollection'] {
+LazyJavaClassTypeConstructor@10['AbstractCollection'] {
     parameters = ArrayList@56[1] { LazyJavaTypeParameterDescriptor@57['E'] }
     supertypes = ArrayList@58[1] { LazyJavaClassifierType@59['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@22['AbstractList'] {
+LazyJavaClassTypeConstructor@20['AbstractList'] {
     parameters = ArrayList@60[1] { LazyJavaTypeParameterDescriptor@61['E'] }
     supertypes = ArrayList@62[2] { LazyJavaClassifierType@63['AbstractCollection<E>'], LazyJavaClassifierType@64['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@24['AbstractMap'] {
+LazyJavaClassTypeConstructor@22['AbstractMap'] {
     parameters = ArrayList@65[2] { LazyJavaTypeParameterDescriptor@66['K'], LazyJavaTypeParameterDescriptor@67['V'] }
     supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['Map<K, V>'] }
 }
 
-LazyJavaClassTypeConstructor@39['ArrayList'] {
+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@47['HashMap'] {
+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'], ... }
 }
@@ -98,20 +93,20 @@ LazyJavaClassifierType@63['AbstractCollection<E>'] {
     arguments = ArrayList@88[1] { TypeProjectionImpl@89 }
     classifier = JavaClassImpl@90['AbstractCollection']
     memberScope = SubstitutingScope@91
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
 }
 
 LazyJavaClassifierType@73['AbstractList<E>'] {
     arguments = ArrayList@92[1] { TypeProjectionImpl@93 }
     classifier = JavaClassImpl@94['AbstractList']
     memberScope = SubstitutingScope@95
-    typeConstructor = LazyJavaClassTypeConstructor@22['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
 }
 
 LazyJavaClassifierType@80['AbstractMap<K, V>'] {
     arguments = ArrayList@96[2] { TypeProjectionImpl@97, TypeProjectionImpl@98 }
     classifier = JavaClassImpl@99['AbstractMap']
-    typeConstructor = LazyJavaClassTypeConstructor@24['AbstractMap']
+    typeConstructor = LazyJavaClassTypeConstructor@22['AbstractMap']
 }
 
 LazyJavaClassifierType@100['Cloneable'] {
@@ -167,21 +162,21 @@ LazyJavaClassifierType@131['E'] {
     arguments = ArrayList@132[empty]
     classifier = JavaTypeParameterImpl@133['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@134['E'] {
     arguments = ArrayList@135[empty]
     classifier = JavaTypeParameterImpl@136['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@137['E'] {
     arguments = ArrayList@138[empty]
     classifier = JavaTypeParameterImpl@139['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@140['E'] {
@@ -195,14 +190,14 @@ LazyJavaClassifierType@144['E'] {
     arguments = ArrayList@145[empty]
     classifier = JavaTypeParameterImpl@146['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@147['E'] {
     arguments = ArrayList@148[empty]
     classifier = JavaTypeParameterImpl@149['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
 }
 
 LazyJavaClassifierType@150['E'] {
@@ -223,75 +218,75 @@ LazyJavaClassifierType@156['E'] {
     arguments = ArrayList@157[empty]
     classifier = JavaTypeParameterImpl@158['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@159['E'] {
     arguments = ArrayList@160[empty]
     classifier = JavaTypeParameterImpl@161['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@162['E'] {
     arguments = ArrayList@163[empty]
-    classifier = JavaTypeParameterImpl@149['E']
+    classifier = JavaTypeParameterImpl@142['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
 }
 
 LazyJavaClassifierType@164['E'] {
     arguments = ArrayList@165[empty]
-    classifier = JavaTypeParameterImpl@146['E']
+    classifier = JavaTypeParameterImpl@152['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@166['E'] {
     arguments = ArrayList@167[empty]
-    classifier = JavaTypeParameterImpl@158['E']
+    classifier = JavaTypeParameterImpl@139['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@168['E'] {
     arguments = ArrayList@169[empty]
-    classifier = JavaTypeParameterImpl@129['E']
+    classifier = JavaTypeParameterImpl@158['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@170['E'] {
     arguments = ArrayList@171[empty]
-    classifier = JavaTypeParameterImpl@155['E']
+    classifier = JavaTypeParameterImpl@129['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@172['E'] {
     arguments = ArrayList@173[empty]
-    classifier = JavaTypeParameterImpl@142['E']
+    classifier = JavaTypeParameterImpl@146['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@174['E'] {
     arguments = ArrayList@175[empty]
-    classifier = JavaTypeParameterImpl@161['E']
+    classifier = JavaTypeParameterImpl@133['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@176['E'] {
     arguments = ArrayList@177[empty]
-    classifier = JavaTypeParameterImpl@152['E']
+    classifier = JavaTypeParameterImpl@155['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@178['E'] {
     arguments = ArrayList@179[empty]
-    classifier = JavaTypeParameterImpl@139['E']
+    classifier = JavaTypeParameterImpl@161['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
@@ -300,21 +295,21 @@ LazyJavaClassifierType@180['E'] {
     arguments = ArrayList@181[empty]
     classifier = JavaTypeParameterImpl@136['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@182['E'] {
     arguments = ArrayList@183[empty]
-    classifier = JavaTypeParameterImpl@133['E']
+    classifier = JavaTypeParameterImpl@125['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@184['E'] {
     arguments = ArrayList@185[empty]
-    classifier = JavaTypeParameterImpl@125['E']
+    classifier = JavaTypeParameterImpl@149['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
 }
 
 LazyJavaClassifierType@186['K'] {
@@ -328,59 +323,59 @@ LazyJavaClassifierType@190['K'] {
     arguments = ArrayList@191[empty]
     classifier = JavaTypeParameterImpl@192['K']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
 }
 
-LazyJavaClassifierType@193['K'] {
-    arguments = ArrayList@194[empty]
-    classifier = JavaTypeParameterImpl@195['K']
+LazyJavaClassifierType@194['K'] {
+    arguments = ArrayList@195[empty]
+    classifier = JavaTypeParameterImpl@196['K']
     nullable = 'false': Boolean@111
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
 }
 
-LazyJavaClassifierType@196['K'] {
-    arguments = ArrayList@197[empty]
-    classifier = JavaTypeParameterImpl@198['K']
+LazyJavaClassifierType@197['K'] {
+    arguments = ArrayList@198[empty]
+    classifier = JavaTypeParameterImpl@199['K']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@199
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
 }
 
 LazyJavaClassifierType@200['K'] {
     arguments = ArrayList@201[empty]
-    classifier = JavaTypeParameterImpl@188['K']
+    classifier = JavaTypeParameterImpl@199['K']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
 }
 
 LazyJavaClassifierType@202['K'] {
     arguments = ArrayList@203[empty]
-    classifier = JavaTypeParameterImpl@198['K']
+    classifier = JavaTypeParameterImpl@196['K']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@199
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
 }
 
 LazyJavaClassifierType@204['K'] {
     arguments = ArrayList@205[empty]
     classifier = JavaTypeParameterImpl@192['K']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
 }
 
 LazyJavaClassifierType@206['K'] {
     arguments = ArrayList@207[empty]
-    classifier = JavaTypeParameterImpl@195['K']
+    classifier = JavaTypeParameterImpl@188['K']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
 }
 
-LazyJavaClassifierType@74['List<E>'] {
+LazyJavaClassifierType@64['List<E>'] {
     arguments = ArrayList@208[1] { TypeProjectionImpl@209 }
     classifier = JavaClassImpl@210['List']
     memberScope = SubstitutingScope@211
     typeConstructor = DeserializedClassTypeConstructor@212
 }
 
-LazyJavaClassifierType@64['List<E>'] {
+LazyJavaClassifierType@74['List<E>'] {
     arguments = ArrayList@213[1] { TypeProjectionImpl@214 }
     classifier = JavaClassImpl@215['List']
     memberScope = SubstitutingScope@216
@@ -464,21 +459,21 @@ LazyJavaClassifierType@255['V'] {
     arguments = ArrayList@256[empty]
     classifier = JavaTypeParameterImpl@257['V']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@258
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
 }
 
-LazyJavaClassifierType@259['V'] {
-    arguments = ArrayList@260[empty]
-    classifier = JavaTypeParameterImpl@261['V']
+LazyJavaClassifierType@258['V'] {
+    arguments = ArrayList@259[empty]
+    classifier = JavaTypeParameterImpl@260['V']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@258
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
 }
 
-LazyJavaClassifierType@262['V'] {
-    arguments = ArrayList@263[empty]
-    classifier = JavaTypeParameterImpl@264['V']
+LazyJavaClassifierType@261['V'] {
+    arguments = ArrayList@262[empty]
+    classifier = JavaTypeParameterImpl@263['V']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@258
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@264
 }
 
 LazyJavaClassifierType@265['V'] {
@@ -490,23 +485,23 @@ LazyJavaClassifierType@265['V'] {
 
 LazyJavaClassifierType@267['V'] {
     arguments = ArrayList@268[empty]
-    classifier = JavaTypeParameterImpl@261['V']
+    classifier = JavaTypeParameterImpl@263['V']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@258
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@264
 }
 
 LazyJavaClassifierType@269['V'] {
     arguments = ArrayList@270[empty]
-    classifier = JavaTypeParameterImpl@264['V']
+    classifier = JavaTypeParameterImpl@257['V']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@258
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
 }
 
 LazyJavaClassifierType@271['V'] {
     arguments = ArrayList@272[empty]
-    classifier = JavaTypeParameterImpl@257['V']
+    classifier = JavaTypeParameterImpl@260['V']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@258
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
 }
 
 LazyJavaPackageFragmentProvider@273 {
@@ -535,20 +530,20 @@ LazyJavaPackageFragmentProvider@273 {
     packageFragments('kotlin.io': FqName@301) = null
     packageFragments('kotlin.jvm': FqName@302) = null
     topLevelClasses(JavaClassImpl@90['AbstractCollection']) = LazyJavaClassDescriptor@2['AbstractCollection']
-    topLevelClasses(JavaClassImpl@94['AbstractList']) = LazyJavaClassDescriptor@13['AbstractList']
-    topLevelClasses(JavaClassImpl@99['AbstractMap']) = LazyJavaClassDescriptor@23['AbstractMap']
-    topLevelClasses(JavaClassImpl@303['ArrayList']) = LazyJavaClassDescriptor@25['ArrayList']
-    topLevelClasses(JavaClassImpl@304['HashMap']) = LazyJavaClassDescriptor@40['HashMap']
-    topLevelClasses(JavaClassImpl@245['RandomAccess']) = LazyJavaClassDescriptor@48['RandomAccess']
-    topLevelClasses(JavaClassImpl@248['Serializable']) = LazyJavaClassDescriptor@52['Serializable']
+    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@10[empty] // through LazyPackageFragmentScopeForJavaPackage@306
-    functions('util': Name@310) = EmptyList@10[empty] // 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
 }
 
@@ -556,42 +551,40 @@ 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('add': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@313
     classes('foos': Name@316) = null // through LazyPackageFragmentScopeForJavaPackage@313
     deserializedPackageScope = Empty@308 // through LazyPackageFragmentScopeForJavaPackage@313
-    functions('ArrayList': Name@312) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@313
-    functions('Foo': Name@314) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@313
-    functions('HashMap': Name@315) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@313
-    functions('add': Name@9) = EmptyList@10[empty] // 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@25['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('HashMap': Name@320) = LazyJavaClassDescriptor@40['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@319
+    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@10[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('HashMap': Name@322) = EmptyList@10[empty] // 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'] {
+LazyJavaTypeParameterDescriptor@57['E'] {
     defaultType = JetTypeImpl@324['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
     upperBounds = LinkedHashSet@325[1] { NullableType@326 }
     upperBoundsAsType = NullableType@326
 }
 
-LazyJavaTypeParameterDescriptor@71['E'] {
+LazyJavaTypeParameterDescriptor@61['E'] {
     defaultType = JetTypeImpl@327['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
     upperBounds = LinkedHashSet@328[1] { NullableType@329 }
     upperBoundsAsType = NullableType@329
 }
 
-LazyJavaTypeParameterDescriptor@57['E'] {
+LazyJavaTypeParameterDescriptor@71['E'] {
     defaultType = JetTypeImpl@330['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
     upperBounds = LinkedHashSet@331[1] { NullableType@332 }
     upperBoundsAsType = NullableType@332
 }
@@ -603,21 +596,21 @@ LazyJavaTypeParameterDescriptor@77['K'] {
 }
 
 LazyJavaTypeParameterDescriptor@66['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@199
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
 }
 
 LazyJavaTypeParameterDescriptor@78['V'] {
     defaultType = JetTypeImpl@336['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@258
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
     upperBounds = LinkedHashSet@337[1] { NullableType@338 }
 }
 
 LazyJavaTypeParameterDescriptor@67['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@264
 }
 
 LazyJavaTypeParameterResolver@339 {
-    resolve(JavaTypeParameterImpl@340['E']) = LazyJavaTypeParameterDescriptor@71['E']
+    resolve(JavaTypeParameterImpl@340['E']) = LazyJavaTypeParameterDescriptor@61['E']
 }
 
 LazyJavaTypeParameterResolver@341 {
@@ -625,35 +618,120 @@ LazyJavaTypeParameterResolver@341 {
 }
 
 LazyJavaTypeParameterResolver@343 {
-    resolve(JavaTypeParameterImpl@344['E']) = LazyJavaTypeParameterDescriptor@61['E']
+    resolve(JavaTypeParameterImpl@344['E']) = LazyJavaTypeParameterDescriptor@71['E']
 }
 
 LazyJavaTypeParameterResolver@345 {
-    resolve(JavaTypeParameterImpl@158['E']) = null
-}
-
-LazyJavaTypeParameterResolver@346 {
     resolve(JavaTypeParameterImpl@149['E']) = null
 }
 
-LazyJavaTypeParameterResolver@347 {
+LazyJavaTypeParameterResolver@346 {
     resolve(JavaTypeParameterImpl@129['E']) = null
 }
 
-LazyJavaTypeParameterResolver@348 {
-    resolve(JavaTypeParameterImpl@161['E']) = null
-}
-
-LazyJavaTypeParameterResolver@349 {
+LazyJavaTypeParameterResolver@347 {
     resolve(JavaTypeParameterImpl@125['E']) = null
 }
 
-LazyJavaTypeParameterResolver@350 {
-    resolve(JavaTypeParameterImpl@198['K']) = LazyJavaTypeParameterDescriptor@66['K']
-    resolve(JavaTypeParameterImpl@253['V']) = LazyJavaTypeParameterDescriptor@67['V']
+LazyJavaTypeParameterResolver@348 {
+    resolve(JavaTypeParameterImpl@152['E']) = null
 }
 
-LazyJavaTypeParameterResolver@351 {
-    resolve(JavaTypeParameterImpl@352['K']) = LazyJavaTypeParameterDescriptor@77['K']
-    resolve(JavaTypeParameterImpl@353['V']) = LazyJavaTypeParameterDescriptor@78['V']
+LazyJavaTypeParameterResolver@349 {
+    resolve(JavaTypeParameterImpl@161['E']) = null
+}
+
+LazyJavaTypeParameterResolver@350 {
+    resolve(JavaTypeParameterImpl@351['K']) = LazyJavaTypeParameterDescriptor@77['K']
+    resolve(JavaTypeParameterImpl@352['V']) = LazyJavaTypeParameterDescriptor@78['V']
+}
+
+LazyJavaTypeParameterResolver@353 {
+    resolve(JavaTypeParameterImpl@192['K']) = LazyJavaTypeParameterDescriptor@66['K']
+    resolve(JavaTypeParameterImpl@263['V']) = LazyJavaTypeParameterDescriptor@67['V']
+}
+
+ResolutionTaskHolder@354 {
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
+    <name not found> = ArrayList@357[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]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <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@358 {
+    <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@360 }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@362 {
+    <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
+    <name not found> = ArrayList@365[1] { ResolutionCandidate@364 }
+}
+
+ResolutionTaskHolder@366 {
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@368 }
+}
+
+ResolutionTaskHolder@370 {
+    <name not found> = ArrayList@371[2] { ResolutionCandidate@372, ResolutionCandidate@373 }
+    <name not found> = ArrayList@374[2] { ResolutionCandidate@372, ResolutionCandidate@373 }
+}
+
+ResolutionTaskHolder@375 {
+    <name not found> = ArrayList@376[3] { ResolutionCandidate@377, ResolutionCandidate@378, ResolutionCandidate@379 }
+    <name not found> = ArrayList@380[3] { 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]
+}
+
+ResolutionTaskHolder@381 {
+    <name not found> = ArrayList@382[4] { ResolutionCandidate@383, ResolutionCandidate@384, ResolutionCandidate@385, ... }
+    <name not found> = ArrayList@386[4] { ResolutionCandidate@383, ResolutionCandidate@384, ResolutionCandidate@385, ... }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
 }

compiler/testData/diagnostics/tests/inference/regressions/kt702.lazy.log

@@ -2,22 +2,18 @@ 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
-    properties('cast': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    properties('isInstance': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@8['AnnotatedElement']
+    typeConstructor = LazyJavaClassTypeConstructor@6['AnnotatedElement']
 }
 
-LazyJavaClassDescriptor@9['Class'] {
-    defaultType = JetTypeImpl@10['Class<1>']
-    enumEntryIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@12
-    functions('cast': Name@6) = ArrayList@13[1] { JavaMethodDescriptor@14['cast'] } // through LazyJavaClassMemberScope@12
-    functions('isInstance': Name@7) = ArrayList@15[1] { JavaMethodDescriptor@16['isInstance'] } // through LazyJavaClassMemberScope@12
-    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@12
-    nestedClassIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@12
-    nestedClasses('cast': Name@6) = null // through LazyJavaClassMemberScope@12
-    nestedClasses('isInstance': Name@7) = null // through LazyJavaClassMemberScope@12
-    properties('cast': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    properties('isInstance': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
+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']
 }
@@ -34,8 +30,6 @@ 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
-    properties('cast': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
-    properties('isInstance': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
     typeConstructor = LazyJavaClassTypeConstructor@28['GenericDeclaration']
 }
 
@@ -47,8 +41,6 @@ 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
-    properties('cast': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
-    properties('isInstance': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
     typeConstructor = LazyJavaClassTypeConstructor@34['Serializable']
 }
 
@@ -56,12 +48,10 @@ 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
-    properties('cast': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
-    properties('isInstance': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
     typeConstructor = LazyJavaClassTypeConstructor@38['Type']
 }
 
-LazyJavaClassTypeConstructor@8['AnnotatedElement'] {
+LazyJavaClassTypeConstructor@6['AnnotatedElement'] {
     parameters = ArrayList@39[empty]
     supertypes = ArrayList@40[1] { JetTypeImpl@41['Any'] }
 }
@@ -105,7 +95,7 @@ LazyJavaClassifierType@63['AnnotatedElement'] {
     arguments = ArrayList@64[empty]
     classifier = JavaClassImpl@65['AnnotatedElement']
     memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@8['AnnotatedElement']
+    typeConstructor = LazyJavaClassTypeConstructor@6['AnnotatedElement']
 }
 
 LazyJavaClassifierType@58['Exception'] {
@@ -139,7 +129,7 @@ LazyJavaClassifierType@76['Object'] {
 
 LazyJavaClassifierType@79['Object'] {
     arguments = ArrayList@80[empty]
-    classifier = JavaClassImpl@72['Object']
+    classifier = JavaClassImpl@78['Object']
     memberScope = DeserializedClassMemberScope@73
     nullable = 'true': Boolean@81
     typeConstructor = DeserializedClassTypeConstructor@75
@@ -147,7 +137,7 @@ LazyJavaClassifierType@79['Object'] {
 
 LazyJavaClassifierType@82['Object'] {
     arguments = ArrayList@83[empty]
-    classifier = JavaClassImpl@78['Object']
+    classifier = JavaClassImpl@72['Object']
     memberScope = DeserializedClassMemberScope@73
     nullable = 'true': Boolean@81
     typeConstructor = DeserializedClassTypeConstructor@75
@@ -199,13 +189,13 @@ LazyJavaClassifierType@100['T'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
-LazyJavaClassifierType@50['Throwable'] {
+LazyJavaClassifierType@53['Throwable'] {
     arguments = ArrayList@102[empty]
     classifier = JavaClassImpl@103['Throwable']
     typeConstructor = DeserializedClassTypeConstructor@104
 }
 
-LazyJavaClassifierType@53['Throwable'] {
+LazyJavaClassifierType@50['Throwable'] {
     arguments = ArrayList@105[empty]
     classifier = JavaClassImpl@106['Throwable']
     typeConstructor = DeserializedClassTypeConstructor@104
@@ -259,7 +249,7 @@ LazyJavaPackageFragmentProvider@109 {
     packageFragments('kotlin.io': FqName@152) = null
     packageFragments('kotlin.jvm': FqName@153) = null
     topLevelClasses(JavaClassImpl@65['AnnotatedElement']) = LazyJavaClassDescriptor@0['AnnotatedElement']
-    topLevelClasses(JavaClassImpl@154['Class']) = LazyJavaClassDescriptor@9['Class']
+    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']
@@ -276,20 +266,16 @@ LazyJavaPackageFragment@130['java'] {
 }
 
 LazyJavaPackageFragment@134['lang'] {
-    classes('Class': Name@162) = LazyJavaClassDescriptor@9['Class'] // through LazyPackageFragmentScopeForJavaPackage@163
+    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('cast': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@163
     classes('equals': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@163
     classes('getJavaClass': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@163
-    classes('isInstance': Name@7) = 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('cast': Name@6) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@163
     functions('equals': Name@166) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@163
     functions('getJavaClass': Name@167) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@163
-    functions('isInstance': Name@7) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@163
     functions('propagateIfInstanceOf': Name@169) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@163
     memberIndex = computeMemberIndex$1@170 // through LazyPackageFragmentScopeForJavaPackage@163
 }
@@ -307,3 +293,171 @@ LazyJavaTypeParameterResolver@174 {
 LazyJavaTypeParameterResolver@176 {
     resolve(JavaTypeParameterImpl@98['T']) = null
 }
+
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@183[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]
+}
+
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <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> = ArrayList@191[1] { ResolutionCandidate@190 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <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@192 {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
+    <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@196 {
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
+    <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@200 {
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
+}
+
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
+}
+
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+}
+
+ResolutionTaskHolder@212 {
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
+}
+
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
+}
+
+ResolutionTaskHolder@220 {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
+}
+
+ResolutionTaskHolder@224 {
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
+}
+
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
+}
+
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
+}
+
+ResolutionTaskHolder@236 {
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
+}
+
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
+}

compiler/testData/diagnostics/tests/inference/regressions/kt731.lazy.log

@@ -42,12 +42,65 @@ LazyJavaPackageFragment@17['java'] {
 LazyJavaPackageFragment@19['lang'] {
     classes('A': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
     classes('foo': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('invoke': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('x': Name@43) = 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('invoke': Name@42) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('x': Name@43) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@44 // 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> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <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> = ArrayList@51[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]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
 }

compiler/testData/diagnostics/tests/inference/regressions/kt742.lazy.log

@@ -44,3 +44,168 @@ LazyJavaPackageFragment@15['lang'] {
     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> = ArrayList@43[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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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> = ArrayList@47[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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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> = ArrayList@51[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]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[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]
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@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]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+    <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@66 }
+    <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> = ArrayList@71[1] { ResolutionCandidate@70 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+}

compiler/testData/diagnostics/tests/inference/regressions/kt832.lazy.log

@@ -21,9 +21,26 @@ LazyJavaPackageFragment@7['java'] {
 
 LazyJavaPackageFragment@9['lang'] {
     classes('fooT2': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
     deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
     functions('fooT2': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('invoke': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // 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@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]
+}
+
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+}
+
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
 }

compiler/testData/diagnostics/tests/inference/regressions/kt943.lazy.log

@@ -15,431 +15,500 @@ LazyJavaClassDescriptor@5['Collections'] {
     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('minus': Name@16) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    functions('minus': Name@16) = EmptyList@9[empty] // through LazyJavaStaticClassScope@10
-    functions('sure': Name@17) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    functions('sure': Name@17) = EmptyList@9[empty] // through LazyJavaStaticClassScope@10
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@19 // through LazyJavaStaticClassScope@10
-    nestedClassIndex = LinkedHashMap@20 // through LazyJavaClassMemberScope@7
-    nestedClasses('Any': Name@21) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('Int': Name@22) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('List': Name@23) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('String': Name@24) = null // 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@25) = null // through LazyJavaClassMemberScope@7
+    nestedClasses('inline': Name@24) = null // through LazyJavaClassMemberScope@7
     nestedClasses('max': Name@11) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('minus': Name@16) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('sure': Name@17) = 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('length': Name@26) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    properties('length': Name@26) = 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
-    properties('minus': Name@16) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    properties('minus': Name@16) = EmptyList@9[empty] // through LazyJavaStaticClassScope@10
-    properties('sure': Name@17) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    properties('sure': Name@17) = EmptyList@9[empty] // through LazyJavaStaticClassScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@27['Collections']
+    typeConstructor = LazyJavaClassTypeConstructor@25['Collections']
 }
 
-LazyJavaClassDescriptor@28['Comparator'] {
-    functionTypeForSamInterface = JetTypeImpl@29['Function2<3>']
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@30['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@31['Comparator']
+LazyJavaClassDescriptor@26['Comparator'] {
+    functionTypeForSamInterface = JetTypeImpl@27['Function2<3>']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@28['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@29['Comparator']
 }
 
-LazyJavaClassTypeConstructor@27['Collections'] {
-    supertypes = ArrayList@32[1] { JetTypeImpl@33['Any'] }
+LazyJavaClassTypeConstructor@25['Collections'] {
+    supertypes = ArrayList@30[1] { JetTypeImpl@31['Any'] }
 }
 
-LazyJavaClassTypeConstructor@31['Comparator'] {
-    parameters = ArrayList@34[1] { LazyJavaTypeParameterDescriptor@35['T'] }
-    supertypes = ArrayList@36[1] { JetTypeImpl@33['Any'] }
+LazyJavaClassTypeConstructor@29['Comparator'] {
+    parameters = ArrayList@32[1] { LazyJavaTypeParameterDescriptor@33['T'] }
+    supertypes = ArrayList@34[1] { JetTypeImpl@31['Any'] }
 }
 
-LazyJavaClassifierType@37['Collection<? extends T>'] {
-    arguments = ArrayList@38[1] { TypeProjectionImpl@39 }
-    classifier = JavaClassImpl@40['Collection']
-    memberScope = SubstitutingScope@41
-    nullable = 'false': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@43
+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@44['Collection<? extends T>'] {
-    arguments = ArrayList@45[1] { TypeProjectionImpl@46 }
-    classifier = JavaClassImpl@47['Collection']
-    memberScope = SubstitutingScope@48
-    nullable = 'false': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@43
+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@49['Collection<? extends T>'] {
-    arguments = ArrayList@50[1] { TypeProjectionImpl@51 }
-    classifier = JavaClassImpl@40['Collection']
-    memberScope = SubstitutingScope@52
-    nullable = 'true': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@54
+LazyJavaClassifierType@47['Collection<? extends T>'] {
+    arguments = ArrayList@48[1] { TypeProjectionImpl@49 }
+    classifier = JavaClassImpl@38['Collection']
+    memberScope = SubstitutingScope@50
+    nullable = 'true': Boolean@51
+    typeConstructor = DeserializedClassTypeConstructor@52
 }
 
-LazyJavaClassifierType@55['Collection<? extends T>'] {
-    arguments = ArrayList@56[1] { TypeProjectionImpl@57 }
-    classifier = JavaClassImpl@47['Collection']
-    memberScope = SubstitutingScope@58
-    nullable = 'true': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@54
+LazyJavaClassifierType@53['Collection<? extends T>'] {
+    arguments = ArrayList@54[1] { TypeProjectionImpl@55 }
+    classifier = JavaClassImpl@45['Collection']
+    memberScope = SubstitutingScope@56
+    nullable = 'true': Boolean@51
+    typeConstructor = DeserializedClassTypeConstructor@52
 }
 
-LazyJavaClassifierType@59['Comparable<? super T>'] {
-    arguments = ArrayList@60[1] { TypeProjectionImpl@61 }
-    classifier = JavaClassImpl@62['Comparable']
-    memberScope = SubstitutingScope@63
-    nullable = 'false': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@64
+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@65['Comparable<? super T>'] {
-    arguments = ArrayList@66[1] { TypeProjectionImpl@67 }
-    classifier = JavaClassImpl@62['Comparable']
-    memberScope = SubstitutingScope@68
-    nullable = 'true': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@64
+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@69['Comparator<? super T>'] {
-    arguments = ArrayList@70[1] { TypeProjectionImpl@71 }
-    classifier = JavaClassImpl@72['Comparator']
-    memberScope = SubstitutingScope@73
-    nullable = 'false': Boolean@42
-    typeConstructor = LazyJavaClassTypeConstructor@31['Comparator']
+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@74['Comparator<? super T>'] {
-    arguments = ArrayList@75[1] { TypeProjectionImpl@76 }
-    classifier = JavaClassImpl@72['Comparator']
-    memberScope = SubstitutingScope@77
-    nullable = 'true': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@31['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@78['Object'] {
-    arguments = ArrayList@79[empty]
-    classifier = JavaClassImpl@80['Object']
-    memberScope = DeserializedClassMemberScope@81
-    nullable = 'false': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@82
+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'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaClassImpl@80['Object']
-    memberScope = DeserializedClassMemberScope@81
-    nullable = 'true': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@82
+    classifier = JavaClassImpl@84['Object']
+    typeConstructor = DeserializedClassTypeConstructor@80
 }
 
 LazyJavaClassifierType@85['Object'] {
     classifier = JavaClassImpl@86['Object']
-    typeConstructor = DeserializedClassTypeConstructor@82
+    typeConstructor = DeserializedClassTypeConstructor@80
 }
 
-LazyJavaClassifierType@87['Object'] {
-    classifier = JavaClassImpl@88['Object']
-    typeConstructor = DeserializedClassTypeConstructor@82
+LazyJavaClassifierType@87['T'] {
+    arguments = ArrayList@88[empty]
+    classifier = JavaTypeParameterImpl@89['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@89['T'] {
-    arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@91['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
+LazyJavaClassifierType@91['T'] {
+    arguments = ArrayList@92[empty]
+    classifier = JavaTypeParameterImpl@93['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@93['T'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaTypeParameterImpl@95['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
+LazyJavaClassifierType@94['T'] {
+    arguments = ArrayList@95[empty]
+    classifier = JavaTypeParameterImpl@96['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
-LazyJavaClassifierType@97['T'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@99['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
+LazyJavaClassifierType@98['T'] {
+    arguments = ArrayList@99[empty]
+    classifier = JavaTypeParameterImpl@100['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@100['T'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaTypeParameterImpl@102['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+LazyJavaClassifierType@101['T'] {
+    arguments = ArrayList@102[empty]
+    classifier = JavaTypeParameterImpl@103['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@104['T'] {
     arguments = ArrayList@105[empty]
     classifier = JavaTypeParameterImpl@106['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@107['T'] {
     arguments = ArrayList@108[empty]
     classifier = JavaTypeParameterImpl@109['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@110['T'] {
     arguments = ArrayList@111[empty]
     classifier = JavaTypeParameterImpl@112['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
 }
 
-LazyJavaClassifierType@113['T'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaTypeParameterImpl@115['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
+LazyJavaClassifierType@114['T'] {
+    arguments = ArrayList@115[empty]
+    classifier = JavaTypeParameterImpl@116['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
-LazyJavaClassifierType@116['T'] {
-    arguments = ArrayList@117[empty]
-    classifier = JavaTypeParameterImpl@118['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
+LazyJavaClassifierType@117['T'] {
+    arguments = ArrayList@118[empty]
+    classifier = JavaTypeParameterImpl@119['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
 }
 
-LazyJavaClassifierType@119['T'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaTypeParameterImpl@121['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+LazyJavaClassifierType@120['T'] {
+    arguments = ArrayList@121[empty]
+    classifier = JavaTypeParameterImpl@122['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@122['T'] {
-    arguments = ArrayList@123[empty]
-    classifier = JavaTypeParameterImpl@124['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+LazyJavaClassifierType@123['T'] {
+    arguments = ArrayList@124[empty]
+    classifier = JavaTypeParameterImpl@125['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@125['T'] {
-    arguments = ArrayList@126[empty]
-    classifier = JavaTypeParameterImpl@127['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
+LazyJavaClassifierType@126['T'] {
+    arguments = ArrayList@127[empty]
+    classifier = JavaTypeParameterImpl@116['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@128['T'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@112['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
+    classifier = JavaTypeParameterImpl@93['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@130['T'] {
     arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@106['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    classifier = JavaTypeParameterImpl@125['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@132['T'] {
     arguments = ArrayList@133[empty]
-    classifier = JavaTypeParameterImpl@118['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
+    classifier = JavaTypeParameterImpl@119['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
 }
 
 LazyJavaClassifierType@134['T'] {
     arguments = ArrayList@135[empty]
-    classifier = JavaTypeParameterImpl@95['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
+    classifier = JavaTypeParameterImpl@100['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@136['T'] {
     arguments = ArrayList@137[empty]
     classifier = JavaTypeParameterImpl@109['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@138['T'] {
     arguments = ArrayList@139[empty]
-    classifier = JavaTypeParameterImpl@99['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
+    classifier = JavaTypeParameterImpl@89['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@140['T'] {
     arguments = ArrayList@141[empty]
-    classifier = JavaTypeParameterImpl@91['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
+    classifier = JavaTypeParameterImpl@106['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@142['T'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaTypeParameterImpl@121['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    classifier = JavaTypeParameterImpl@112['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
 }
 
 LazyJavaClassifierType@144['T'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@102['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    classifier = JavaTypeParameterImpl@103['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@146['T'] {
     arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@127['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
+    classifier = JavaTypeParameterImpl@96['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@148['T'] {
     arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@115['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
+    classifier = JavaTypeParameterImpl@122['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@150['T'] {
-    arguments = ArrayList@151[empty]
-    classifier = JavaTypeParameterImpl@124['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+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']
 }
 
-LazyJavaPackageFragmentProvider@152 {
-    packageFragments('<root>': FqName@153) = LazyJavaPackageFragment@154['<root>']
-    packageFragments('Any': FqName@155) = null
-    packageFragments('Comparator': FqName@156) = null
-    packageFragments('Int': FqName@157) = null
-    packageFragments('List': FqName@158) = null
-    packageFragments('String': FqName@159) = null
-    packageFragments('T': FqName@160) = null
-    packageFragments('inline': FqName@161) = null
-    packageFragments('java': FqName@162) = LazyJavaPackageFragment@163['java']
-    packageFragments('java.lang': FqName@164) = LazyJavaPackageFragment@165['lang']
-    packageFragments('java.lang.Any': FqName@166) = null
-    packageFragments('java.lang.Comparator': FqName@167) = null
-    packageFragments('java.lang.Int': FqName@168) = null
-    packageFragments('java.lang.List': FqName@169) = null
-    packageFragments('java.lang.String': FqName@170) = null
-    packageFragments('java.lang.T': FqName@171) = null
-    packageFragments('java.lang.inline': FqName@172) = null
-    packageFragments('java.util': FqName@173) = LazyJavaPackageFragment@174['util']
-    packageFragments('java.util.Any': FqName@175) = null
-    packageFragments('java.util.Collections': FqName@176) = null
-    packageFragments('java.util.Comparator': FqName@177) = null
-    packageFragments('java.util.Int': FqName@178) = null
-    packageFragments('java.util.List': FqName@179) = null
-    packageFragments('java.util.String': FqName@180) = null
-    packageFragments('java.util.T': FqName@181) = null
-    packageFragments('java.util.inline': FqName@182) = null
-    packageFragments('kotlin': FqName@183) = null
-    packageFragments('kotlin.Any': FqName@184) = null
-    packageFragments('kotlin.Comparator': FqName@185) = null
-    packageFragments('kotlin.Int': FqName@186) = null
-    packageFragments('kotlin.List': FqName@187) = null
-    packageFragments('kotlin.String': FqName@188) = null
-    packageFragments('kotlin.T': FqName@189) = null
-    packageFragments('kotlin.inline': FqName@190) = null
-    packageFragments('kotlin.io': FqName@191) = null
-    packageFragments('kotlin.jvm': FqName@192) = null
-    packageFragments('maze': FqName@193) = null
-    packageFragments('maze.Any': FqName@194) = null
-    packageFragments('maze.Comparator': FqName@195) = null
-    packageFragments('maze.Int': FqName@196) = null
-    packageFragments('maze.List': FqName@197) = null
-    packageFragments('maze.String': FqName@198) = null
-    packageFragments('maze.T': FqName@199) = null
-    packageFragments('maze.inline': FqName@200) = null
-    topLevelClasses(JavaClassImpl@201['Collections']) = LazyJavaClassDescriptor@5['Collections']
-    topLevelClasses(JavaClassImpl@202['Comparator']) = LazyJavaClassDescriptor@28['Comparator']
-    topLevelClasses(JavaClassImpl@203['List']) = LazyJavaClassDescriptor@204['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['java'] {
-    classes('lang': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@206
-    classes('util': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@206
-    deserializedPackageScope = Empty@208 // through LazyPackageFragmentScopeForJavaPackage@206
-    functions('lang': Name@209) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@206
-    functions('util': Name@210) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@206
-    memberIndex = computeMemberIndex$1@211 // through LazyPackageFragmentScopeForJavaPackage@206
+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@165['lang'] {
+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('minus': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@212
-    classes('sure': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@212
-    deserializedPackageScope = Empty@208 // 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('minus': Name@16) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@212
-    functions('sure': Name@17) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@212
-    memberIndex = computeMemberIndex$1@213 // through LazyPackageFragmentScopeForJavaPackage@212
+    functions('sure': Name@16) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@212
+    memberIndex = computeMemberIndex$1@216 // through LazyPackageFragmentScopeForJavaPackage@212
 }
 
-LazyJavaPackageFragment@174['util'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('Collections': Name@215) = LazyJavaClassDescriptor@5['Collections'] // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('Comparator': Name@216) = LazyJavaClassDescriptor@28['Comparator'] // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('List': Name@23) = LazyJavaClassDescriptor@204['List'] // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('comparator': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('inline': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('max': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('minus': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('sure': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    deserializedPackageScope = Empty@208 // through LazyPackageFragmentScopeForJavaPackage@214
-    functions('Collections': Name@217) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@214
-    functions('comparator': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@214
-    functions('max': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@214
-    functions('minus': Name@16) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@214
-    functions('sure': Name@17) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@214
-    memberIndex = computeMemberIndex$1@218 // through LazyPackageFragmentScopeForJavaPackage@214
+LazyJavaTypeParameterDescriptor@33['T'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
+    upperBounds = LinkedHashSet@217[1] { NullableType@218 }
+    upperBoundsAsType = NullableType@218
 }
 
 LazyJavaTypeParameterDescriptor@219['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
     upperBounds = LinkedHashSet@220[1] { NullableType@221 }
     upperBoundsAsType = NullableType@221
 }
 
-LazyJavaTypeParameterDescriptor@35['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
-    upperBounds = LinkedHashSet@222[1] { NullableType@223 }
-    upperBoundsAsType = NullableType@223
+LazyJavaTypeParameterDescriptor@222['T'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    upperBounds = LinkedHashSet@223[2] { DelegatingFlexibleType@224, DelegatingFlexibleType@225 }
+    upperBoundsAsType = NotNullType@226
 }
 
-LazyJavaTypeParameterDescriptor@224['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
-    upperBounds = LinkedHashSet@225[2] { DelegatingFlexibleType@226, DelegatingFlexibleType@227 }
-    upperBoundsAsType = NotNullType@228
+LazyJavaTypeParameterResolver@227 {
+    resolve(JavaTypeParameterImpl@228['T']) = LazyJavaTypeParameterDescriptor@33['T']
 }
 
 LazyJavaTypeParameterResolver@229 {
-    resolve(JavaTypeParameterImpl@230['T']) = LazyJavaTypeParameterDescriptor@35['T']
+    resolve(JavaTypeParameterImpl@230['T']) = LazyJavaTypeParameterDescriptor@219['T']
 }
 
 LazyJavaTypeParameterResolver@231 {
-    resolve(JavaTypeParameterImpl@232['T']) = LazyJavaTypeParameterDescriptor@219['T']
+    resolve(JavaTypeParameterImpl@232['T']) = LazyJavaTypeParameterDescriptor@222['T']
 }
 
 LazyJavaTypeParameterResolver@233 {
-    resolve(JavaTypeParameterImpl@234['T']) = LazyJavaTypeParameterDescriptor@224['T']
+    resolve(JavaTypeParameterImpl@112['T']) = null
 }
 
-LazyJavaTypeParameterResolver@235 {
-    resolve(JavaTypeParameterImpl@95['T']) = null
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@236 }
+    <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@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@240 }
+    <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@242 {
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@244 }
+}
+
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@248 }
+}
+
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@252 }
+}
+
+ResolutionTaskHolder@254 {
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@256 }
+}
+
+ResolutionTaskHolder@258 {
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@260 }
+}
+
+ResolutionTaskHolder@262 {
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@264 }
+}
+
+ResolutionTaskHolder@266 {
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@268 }
+}
+
+ResolutionTaskHolder@270 {
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@272 }
+}
+
+ResolutionTaskHolder@274 {
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@276 }
+}
+
+ResolutionTaskHolder@278 {
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@280 }
+}
+
+ResolutionTaskHolder@282 {
+    <name not found> = ArrayList@283[2] { ResolutionCandidate@284, ResolutionCandidate@285 }
+    <name not found> = ArrayList@286[3] { ResolutionCandidate@284, ResolutionCandidate@285, ResolutionCandidate@287 }
+    <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@288 {
+    <name not found> = ArrayList@289[8] { ResolutionCandidate@290, ResolutionCandidate@291, ResolutionCandidate@292, ... }
+    <name not found> = ArrayList@293[8] { ResolutionCandidate@290, ResolutionCandidate@291, ResolutionCandidate@292, ... }
 }

compiler/testData/diagnostics/tests/inference/regressions/kt948.lazy.log

@@ -87,49 +87,49 @@ LazyJavaClassifierType@56['E'] {
     arguments = ArrayList@57[empty]
     classifier = JavaTypeParameterImpl@58['E']
     nullable = 'false': Boolean@43
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
-LazyJavaClassifierType@59['E'] {
-    arguments = ArrayList@60[empty]
-    classifier = JavaTypeParameterImpl@61['E']
+LazyJavaClassifierType@60['E'] {
+    arguments = ArrayList@61[empty]
+    classifier = JavaTypeParameterImpl@62['E']
     nullable = 'false': Boolean@43
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
-LazyJavaClassifierType@62['E'] {
-    arguments = ArrayList@63[empty]
-    classifier = JavaTypeParameterImpl@64['E']
+LazyJavaClassifierType@63['E'] {
+    arguments = ArrayList@64[empty]
+    classifier = JavaTypeParameterImpl@65['E']
     nullable = 'false': Boolean@43
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
 LazyJavaClassifierType@66['E'] {
     arguments = ArrayList@67[empty]
+    classifier = JavaTypeParameterImpl@65['E']
+    nullable = 'true': Boolean@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+}
+
+LazyJavaClassifierType@68['E'] {
+    arguments = ArrayList@69[empty]
+    classifier = JavaTypeParameterImpl@62['E']
+    nullable = 'true': Boolean@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+}
+
+LazyJavaClassifierType@70['E'] {
+    arguments = ArrayList@71[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@64['E']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
-}
-
 LazyJavaClassifierType@72['E'] {
     arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@61['E']
+    classifier = JavaTypeParameterImpl@58['E']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
 LazyJavaClassifierType@24['List<E>'] {
@@ -226,12 +226,12 @@ LazyJavaPackageFragment@105['util'] {
 
 LazyJavaTypeParameterDescriptor@26['E'] {
     defaultType = JetTypeImpl@135['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
     upperBounds = LinkedHashSet@136[1] { NullableType@137 }
 }
 
 LazyJavaTypeParameterDescriptor@21['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
 }
 
 LazyJavaTypeParameterResolver@138 {
@@ -239,5 +239,93 @@ LazyJavaTypeParameterResolver@138 {
 }
 
 LazyJavaTypeParameterResolver@140 {
-    resolve(JavaTypeParameterImpl@64['E']) = LazyJavaTypeParameterDescriptor@21['E']
+    resolve(JavaTypeParameterImpl@54['E']) = LazyJavaTypeParameterDescriptor@21['E']
+}
+
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+}
+
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <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> = ArrayList@156[1] { ResolutionCandidate@155 }
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+}
+
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+}
+
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
+}
+
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
+}
+
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
+}
+
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
+}
+
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
+}
+
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[3] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189 }
+    <name not found> = ArrayList@190[3] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189 }
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
 }

compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.lazy.log

@@ -50,10 +50,73 @@ LazyJavaPackageFragment@21['java'] {
 LazyJavaPackageFragment@23['lang'] {
     classes('aaa': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
     classes('foo': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('plus': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@48
     deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('aaa': Name@51) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('aaa': Name@50) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
     functions('foo': Name@49) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('plus': Name@50) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@48
+    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@48
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+    <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@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[8] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72, ... }
+    <name not found> = ArrayList@73[8] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72, ... }
+}
+
+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]
+    <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@75 {
+    <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]
 }

compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.lazy.log

@@ -44,11 +44,191 @@ 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
-    classes('plus': Name@44) = 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@45) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('plus': Name@44) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@46 // 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> = ArrayList@49[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]
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@53[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]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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> = ArrayList@61[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]
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+    <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@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+    <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[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[8] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
+    <name not found> = ArrayList@111[8] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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@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]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
 }

compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.lazy.log

@@ -55,3 +55,67 @@ LazyJavaPackageFragment@22['lang'] {
     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> = ArrayList@54[1] { ResolutionCandidate@53 }
+    <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@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[2] { ResolutionCandidate@65, ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[2] { ResolutionCandidate@65, ResolutionCandidate@66 }
+    <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> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <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@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]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+}

compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.lazy.log

@@ -44,3 +44,26 @@ LazyJavaPackageFragment@17['lang'] {
     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> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <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> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <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> = ArrayList@51[1] { ResolutionCandidate@50 }
+}

compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.lazy.log

@@ -33,18 +33,94 @@ LazyJavaPackageFragment@14['java'] {
 }
 
 LazyJavaPackageFragment@16['lang'] {
-    classes('add': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('arrayListOf': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('bar': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('f': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('foo': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('invoke': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    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('add': Name@32) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('arrayListOf': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('bar': Name@35) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('f': Name@36) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('foo': Name@37) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('invoke': Name@38) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@39 // 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> = ArrayList@41[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]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[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]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@49[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]
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@53[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]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+    <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> = ArrayList@61[1] { ResolutionCandidate@60 }
+    <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> = ArrayList@65[1] { ResolutionCandidate@64 }
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[2] { ResolutionCandidate@80, ResolutionCandidate@81 }
+    <name not found> = ArrayList@82[2] { ResolutionCandidate@80, ResolutionCandidate@81 }
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[2] { ResolutionCandidate@85, ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[2] { ResolutionCandidate@85, ResolutionCandidate@86 }
 }

compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.lazy.log

@@ -33,7 +33,7 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -47,7 +47,7 @@ LazyJavaClassifierType@25['String'] {
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@13['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -75,7 +75,7 @@ LazyJavaClassifierType@36['Throwable'] {
 
 LazyJavaClassifierType@39['Throwable'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -89,7 +89,7 @@ LazyJavaClassifierType@41['Throwable'] {
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -123,33 +123,78 @@ 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('compareTo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('iterate': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('minus': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('Exception': Name@69) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('compareTo': Name@71) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('iterate': Name@72) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('minus': Name@73) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@76 // 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@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
+    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@81
-    classes('compareTo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('iterate': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('minus': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('Exception': Name@69) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('compareTo': Name@71) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('iterate': Name@72) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('minus': Name@73) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@81
+    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> = ArrayList@84[1] { ResolutionCandidate@83 }
+    <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@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = ArrayList@110[5] { ResolutionCandidate@107, ResolutionCandidate@108, 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]
+}
+
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[7] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
+    <name not found> = ArrayList@116[7] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[8] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
+    <name not found> = ArrayList@122[8] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
 }

compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.lazy.log

@@ -60,3 +60,79 @@ LazyJavaPackageFragment@16['util'] {
     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> = ArrayList@57[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]
+    <name not found> = EmptyList@42[empty]
+    <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@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <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@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+}

compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.lazy.log

@@ -110,24 +110,24 @@ LazyJavaClassifierType@66['E'] {
 
 LazyJavaClassifierType@69['E'] {
     arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@68['E']
+    classifier = JavaTypeParameterImpl@64['E']
     nullable = 'true': Boolean@59
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
 }
 
 LazyJavaClassifierType@71['E'] {
     arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@64['E']
+    classifier = JavaTypeParameterImpl@68['E']
     nullable = 'true': Boolean@59
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
 }
 
-LazyJavaClassifierType@35['List<E>'] {
+LazyJavaClassifierType@30['List<E>'] {
     classifier = JavaClassImpl@73['List']
     typeConstructor = DeserializedClassTypeConstructor@74
 }
 
-LazyJavaClassifierType@30['List<E>'] {
+LazyJavaClassifierType@35['List<E>'] {
     classifier = JavaClassImpl@75['List']
     typeConstructor = DeserializedClassTypeConstructor@74
 }
@@ -180,21 +180,21 @@ LazyJavaClassifierType@93['String'] {
 
 LazyJavaClassifierType@96['String'] {
     arguments = ArrayList@97[empty]
-    classifier = JavaClassImpl@92['String']
+    classifier = JavaClassImpl@88['String']
     nullable = 'true': Boolean@59
     typeConstructor = DeserializedClassTypeConstructor@89
 }
 
 LazyJavaClassifierType@98['String'] {
     arguments = ArrayList@99[empty]
-    classifier = JavaClassImpl@88['String']
+    classifier = JavaClassImpl@95['String']
     nullable = 'true': Boolean@59
     typeConstructor = DeserializedClassTypeConstructor@89
 }
 
 LazyJavaClassifierType@100['String'] {
     arguments = ArrayList@101[empty]
-    classifier = JavaClassImpl@95['String']
+    classifier = JavaClassImpl@92['String']
     nullable = 'true': Boolean@59
     typeConstructor = DeserializedClassTypeConstructor@89
 }
@@ -229,14 +229,14 @@ LazyJavaClassifierType@112['Throwable'] {
 
 LazyJavaClassifierType@114['Throwable'] {
     arguments = ArrayList@115[empty]
-    classifier = JavaClassImpl@104['Throwable']
+    classifier = JavaClassImpl@111['Throwable']
     nullable = 'true': Boolean@59
     typeConstructor = DeserializedClassTypeConstructor@105
 }
 
 LazyJavaClassifierType@116['Throwable'] {
     arguments = ArrayList@117[empty]
-    classifier = JavaClassImpl@111['Throwable']
+    classifier = JavaClassImpl@104['Throwable']
     nullable = 'true': Boolean@59
     typeConstructor = DeserializedClassTypeConstructor@105
 }
@@ -386,3 +386,210 @@ LazyJavaTypeParameterDescriptor@32['E'] {
 LazyJavaTypeParameterResolver@229 {
     resolve(JavaTypeParameterImpl@230['E']) = LazyJavaTypeParameterDescriptor@32['E']
 }
+
+ResolutionTaskHolder@231 {
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@234[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]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+}
+
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
+    <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]
+}
+
+ResolutionTaskHolder@239 {
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
+    <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@243 {
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
+    <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@247 {
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
+    <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@251 {
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
+    <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@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
+    <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@259 {
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
+    <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@263 {
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@265 }
+}
+
+ResolutionTaskHolder@267 {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
+}
+
+ResolutionTaskHolder@271 {
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
+}
+
+ResolutionTaskHolder@275 {
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@277 }
+}
+
+ResolutionTaskHolder@279 {
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
+}
+
+ResolutionTaskHolder@283 {
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
+}
+
+ResolutionTaskHolder@287 {
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@289 }
+}
+
+ResolutionTaskHolder@291 {
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@293 }
+}
+
+ResolutionTaskHolder@295 {
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@297 }
+}
+
+ResolutionTaskHolder@299 {
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@301 }
+}
+
+ResolutionTaskHolder@303 {
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@305 }
+}
+
+ResolutionTaskHolder@307 {
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@309 }
+}
+
+ResolutionTaskHolder@311 {
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@313 }
+}
+
+ResolutionTaskHolder@315 {
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@317 }
+}
+
+ResolutionTaskHolder@319 {
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@321 }
+}
+
+ResolutionTaskHolder@323 {
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@325 }
+}
+
+ResolutionTaskHolder@327 {
+    <name not found> = ArrayList@328[3] { ResolutionCandidate@329, ResolutionCandidate@330, ResolutionCandidate@331 }
+    <name not found> = ArrayList@332[3] { ResolutionCandidate@329, ResolutionCandidate@330, ResolutionCandidate@331 }
+    <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@333 {
+    <name not found> = ArrayList@334[4] { ResolutionCandidate@335, ResolutionCandidate@336, ResolutionCandidate@337, ... }
+    <name not found> = ArrayList@338[5] { ResolutionCandidate@335, ResolutionCandidate@336, ResolutionCandidate@337, ... }
+    <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@339 {
+    <name not found> = ArrayList@340[4] { ResolutionCandidate@341, ResolutionCandidate@342, ResolutionCandidate@343, ... }
+    <name not found> = ArrayList@344[5] { ResolutionCandidate@341, ResolutionCandidate@342, ResolutionCandidate@343, ... }
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+    <name not found> = EmptyList@209[empty]
+}

compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.lazy.log

@@ -98,21 +98,21 @@ LazyJavaClassifierType@70['E'] {
     arguments = ArrayList@71[empty]
     classifier = JavaTypeParameterImpl@72['E']
     nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
-LazyJavaClassifierType@73['E'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@75['E']
+LazyJavaClassifierType@74['E'] {
+    arguments = ArrayList@75[empty]
+    classifier = JavaTypeParameterImpl@76['E']
     nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
-LazyJavaClassifierType@76['E'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@78['E']
+LazyJavaClassifierType@77['E'] {
+    arguments = ArrayList@78[empty]
+    classifier = JavaTypeParameterImpl@79['E']
     nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaClassifierType@80['E'] {
@@ -124,9 +124,9 @@ LazyJavaClassifierType@80['E'] {
 
 LazyJavaClassifierType@84['E'] {
     arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@72['E']
+    classifier = JavaTypeParameterImpl@79['E']
     nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaClassifierType@86['E'] {
@@ -138,16 +138,16 @@ LazyJavaClassifierType@86['E'] {
 
 LazyJavaClassifierType@88['E'] {
     arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@75['E']
+    classifier = JavaTypeParameterImpl@72['E']
     nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaClassifierType@90['E'] {
     arguments = ArrayList@91[empty]
-    classifier = JavaTypeParameterImpl@78['E']
+    classifier = JavaTypeParameterImpl@76['E']
     nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaClassifierType@92['E'] {
@@ -172,12 +172,12 @@ LazyJavaClassifierType@99['Serializable'] {
     typeConstructor = LazyJavaClassTypeConstructor@21['Serializable']
 }
 
-LazyJavaClassifierType@30['Set<E>'] {
+LazyJavaClassifierType@38['Set<E>'] {
     classifier = JavaClassImpl@101['Set']
     typeConstructor = DeserializedClassTypeConstructor@102
 }
 
-LazyJavaClassifierType@38['Set<E>'] {
+LazyJavaClassifierType@30['Set<E>'] {
     classifier = JavaClassImpl@103['Set']
     typeConstructor = DeserializedClassTypeConstructor@102
 }
@@ -205,14 +205,14 @@ LazyJavaClassifierType@111['String'] {
 
 LazyJavaClassifierType@114['String'] {
     arguments = ArrayList@115[empty]
-    classifier = JavaClassImpl@110['String']
+    classifier = JavaClassImpl@106['String']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@107
 }
 
 LazyJavaClassifierType@116['String'] {
     arguments = ArrayList@117[empty]
-    classifier = JavaClassImpl@106['String']
+    classifier = JavaClassImpl@110['String']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@107
 }
@@ -254,14 +254,14 @@ LazyJavaClassifierType@130['Throwable'] {
 
 LazyJavaClassifierType@132['Throwable'] {
     arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@129['Throwable']
+    classifier = JavaClassImpl@126['Throwable']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@123
 }
 
 LazyJavaClassifierType@134['Throwable'] {
     arguments = ArrayList@135[empty]
-    classifier = JavaClassImpl@126['Throwable']
+    classifier = JavaClassImpl@129['Throwable']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@123
 }
@@ -339,26 +339,87 @@ LazyJavaPackageFragment@164['util'] {
 
 LazyJavaTypeParameterDescriptor@35['E'] {
     defaultType = JetTypeImpl@193['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
     upperBounds = LinkedHashSet@194[1] { NullableType@195 }
 }
 
-LazyJavaTypeParameterDescriptor@27['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
+LazyJavaTypeParameterDescriptor@23['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
-LazyJavaTypeParameterDescriptor@23['E'] {
+LazyJavaTypeParameterDescriptor@27['E'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaTypeParameterResolver@196 {
-    resolve(JavaTypeParameterImpl@197['E']) = LazyJavaTypeParameterDescriptor@35['E']
+    resolve(JavaTypeParameterImpl@68['E']) = LazyJavaTypeParameterDescriptor@23['E']
+}
+
+LazyJavaTypeParameterResolver@197 {
+    resolve(JavaTypeParameterImpl@82['E']) = LazyJavaTypeParameterDescriptor@27['E']
 }
 
 LazyJavaTypeParameterResolver@198 {
-    resolve(JavaTypeParameterImpl@82['E']) = LazyJavaTypeParameterDescriptor@23['E']
+    resolve(JavaTypeParameterImpl@199['E']) = LazyJavaTypeParameterDescriptor@35['E']
 }
 
-LazyJavaTypeParameterResolver@199 {
-    resolve(JavaTypeParameterImpl@78['E']) = LazyJavaTypeParameterDescriptor@27['E']
+ResolutionTaskHolder@200 {
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@203[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]
+    <name not found> = EmptyList@181[empty]
+    <name not found> = EmptyList@181[empty]
+    <name not found> = EmptyList@181[empty]
+}
+
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
+}
+
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+}
+
+ResolutionTaskHolder@212 {
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
+}
+
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
+}
+
+ResolutionTaskHolder@220 {
+    <name not found> = ArrayList@221[4] { ResolutionCandidate@222, ResolutionCandidate@223, ResolutionCandidate@224, ... }
+    <name not found> = ArrayList@225[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]
+}
+
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[4] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
+    <name not found> = ArrayList@231[5] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
+    <name not found> = EmptyList@181[empty]
+    <name not found> = EmptyList@181[empty]
+    <name not found> = EmptyList@181[empty]
+    <name not found> = EmptyList@181[empty]
 }

compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.lazy.log

@@ -33,14 +33,14 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@13['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -75,14 +75,14 @@ LazyJavaClassifierType@36['Throwable'] {
 
 LazyJavaClassifierType@39['Throwable'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -172,3 +172,191 @@ LazyJavaPackageFragment@70['lang'] {
     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> = ArrayList@111[1] { ResolutionCandidate@110 }
+    <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@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+    <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@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+    <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@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+    <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@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+    <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@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+    <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@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+    <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@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+    <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@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+    <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@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+}
+
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+}
+
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+}
+
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+}
+
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[4] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
+    <name not found> = ArrayList@177[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]
+}
+
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[4] { ResolutionCandidate@180, ResolutionCandidate@181, ResolutionCandidate@182, ... }
+    <name not found> = ArrayList@183[5] { ResolutionCandidate@180, ResolutionCandidate@181, ResolutionCandidate@182, ... }
+    <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@184 {
+    <name not found> = ArrayList@185[4] { ResolutionCandidate@186, ResolutionCandidate@187, ResolutionCandidate@188, ... }
+    <name not found> = ArrayList@189[5] { ResolutionCandidate@186, ResolutionCandidate@187, ResolutionCandidate@188, ... }
+    <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@190 {
+    <name not found> = ArrayList@191[4] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
+    <name not found> = ArrayList@195[5] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
+    <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@196 {
+    <name not found> = ArrayList@197[4] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
+    <name not found> = ArrayList@201[5] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
+    <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@202 {
+    <name not found> = ArrayList@203[4] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
+    <name not found> = ArrayList@207[5] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
+    <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@208 {
+    <name not found> = ArrayList@209[4] { ResolutionCandidate@210, ResolutionCandidate@211, ResolutionCandidate@212, ... }
+    <name not found> = ArrayList@213[5] { ResolutionCandidate@210, ResolutionCandidate@211, ResolutionCandidate@212, ... }
+    <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@214 {
+    <name not found> = ArrayList@215[4] { ResolutionCandidate@216, ResolutionCandidate@217, ResolutionCandidate@218, ... }
+    <name not found> = ArrayList@219[5] { ResolutionCandidate@216, ResolutionCandidate@217, ResolutionCandidate@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]
+}

compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.lazy.log

@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,7 +79,7 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -93,7 +93,7 @@ LazyJavaClassifierType@43['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -158,3 +158,164 @@ LazyJavaPackageFragment@61['lang'] {
     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> = ArrayList@100[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]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+    <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]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+    <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@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+    <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@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@116[1] { 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]
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+}
+
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+}
+
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
+}
+
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+}
+
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+}
+
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+}
+
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+}
+
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
+}
+
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
+}
+
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
+}
+
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[4] { ResolutionCandidate@175, ResolutionCandidate@176, ResolutionCandidate@177, ... }
+    <name not found> = ArrayList@178[5] { ResolutionCandidate@175, ResolutionCandidate@176, ResolutionCandidate@177, ... }
+    <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@179 {
+    <name not found> = ArrayList@180[4] { ResolutionCandidate@181, ResolutionCandidate@182, ResolutionCandidate@183, ... }
+    <name not found> = ArrayList@184[5] { ResolutionCandidate@181, ResolutionCandidate@182, ResolutionCandidate@183, ... }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+}

compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.lazy.log

@@ -71,63 +71,63 @@ LazyJavaClassifierType@54['K'] {
     arguments = ArrayList@55[empty]
     classifier = JavaTypeParameterImpl@56['K']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
-LazyJavaClassifierType@57['K'] {
-    arguments = ArrayList@58[empty]
-    classifier = JavaTypeParameterImpl@59['K']
+LazyJavaClassifierType@58['K'] {
+    arguments = ArrayList@59[empty]
+    classifier = JavaTypeParameterImpl@60['K']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
-LazyJavaClassifierType@60['K'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaTypeParameterImpl@62['K']
+LazyJavaClassifierType@61['K'] {
+    arguments = ArrayList@62[empty]
+    classifier = JavaTypeParameterImpl@63['K']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@64['K'] {
     arguments = ArrayList@65[empty]
     classifier = JavaTypeParameterImpl@66['K']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@67['K'] {
     arguments = ArrayList@68[empty]
+    classifier = JavaTypeParameterImpl@56['K']
+    nullable = 'true': Boolean@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+}
+
+LazyJavaClassifierType@70['K'] {
+    arguments = ArrayList@71[empty]
     classifier = JavaTypeParameterImpl@51['K']
     nullable = 'true': Boolean@69
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
-LazyJavaClassifierType@70['K'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@62['K']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-}
-
 LazyJavaClassifierType@72['K'] {
     arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@66['K']
+    classifier = JavaTypeParameterImpl@60['K']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@74['K'] {
     arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@59['K']
+    classifier = JavaTypeParameterImpl@63['K']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@76['K'] {
     arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@56['K']
+    classifier = JavaTypeParameterImpl@66['K']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@78['Map<? extends K, ? extends V>'] {
@@ -195,56 +195,56 @@ LazyJavaClassifierType@117['V'] {
     arguments = ArrayList@118[empty]
     classifier = JavaTypeParameterImpl@119['V']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@120['V'] {
     arguments = ArrayList@121[empty]
     classifier = JavaTypeParameterImpl@122['V']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@123['V'] {
     arguments = ArrayList@124[empty]
     classifier = JavaTypeParameterImpl@125['V']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@126['V'] {
     arguments = ArrayList@127[empty]
-    classifier = JavaTypeParameterImpl@115['V']
+    classifier = JavaTypeParameterImpl@122['V']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@128['V'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@119['V']
+    classifier = JavaTypeParameterImpl@115['V']
     nullable = 'true': Boolean@69
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
 }
 
 LazyJavaClassifierType@130['V'] {
     arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@122['V']
+    classifier = JavaTypeParameterImpl@119['V']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@132['V'] {
     arguments = ArrayList@133[empty]
-    classifier = JavaTypeParameterImpl@111['V']
+    classifier = JavaTypeParameterImpl@125['V']
     nullable = 'true': Boolean@69
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@134['V'] {
     arguments = ArrayList@135[empty]
-    classifier = JavaTypeParameterImpl@125['V']
+    classifier = JavaTypeParameterImpl@111['V']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaPackageFragmentProvider@136 {
@@ -310,48 +310,47 @@ LazyJavaPackageFragment@159['java'] {
 
 LazyJavaPackageFragment@163['lang'] {
     classes('HashMap': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('containsKey': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('defaultValue': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('get': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('defaultValue': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@197
     classes('getOrElse1': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('invoke': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('println': Name@202) = 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('containsKey': Name@198) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('defaultValue': Name@199) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('get': Name@200) = 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('invoke': Name@201) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('println': Name@202) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    memberIndex = computeMemberIndex$1@203 // 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@204) = LazyJavaClassDescriptor@10['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@205
-    deserializedPackageScope = Empty@192 // through LazyPackageFragmentScopeForJavaPackage@205
-    functions('HashMap': Name@206) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@205
-    memberIndex = computeMemberIndex$1@207 // through LazyPackageFragmentScopeForJavaPackage@205
+    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@208['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-    upperBounds = LinkedHashSet@209[1] { NullableType@210 }
+    defaultType = JetTypeImpl@205['K']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    upperBounds = LinkedHashSet@206[1] { NullableType@207 }
 }
 
 LazyJavaTypeParameterDescriptor@26['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaTypeParameterDescriptor@32['V'] {
-    defaultType = JetTypeImpl@211['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
-    upperBounds = LinkedHashSet@212[1] { NullableType@213 }
+    defaultType = JetTypeImpl@208['V']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
+    upperBounds = LinkedHashSet@209[1] { NullableType@210 }
 }
 
 LazyJavaTypeParameterDescriptor@27['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+}
+
+LazyJavaTypeParameterResolver@211 {
+    resolve(JavaTypeParameterImpl@212['K']) = LazyJavaTypeParameterDescriptor@26['K']
+    resolve(JavaTypeParameterImpl@213['V']) = LazyJavaTypeParameterDescriptor@27['V']
 }
 
 LazyJavaTypeParameterResolver@214 {
@@ -359,7 +358,76 @@ LazyJavaTypeParameterResolver@214 {
     resolve(JavaTypeParameterImpl@216['V']) = LazyJavaTypeParameterDescriptor@32['V']
 }
 
-LazyJavaTypeParameterResolver@217 {
-    resolve(JavaTypeParameterImpl@218['K']) = LazyJavaTypeParameterDescriptor@26['K']
-    resolve(JavaTypeParameterImpl@219['V']) = LazyJavaTypeParameterDescriptor@27['V']
+ResolutionTaskHolder@217 {
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
+    <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@221 {
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
+    <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@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@227 }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
+}
+
+ResolutionTaskHolder@233 {
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
+}
+
+ResolutionTaskHolder@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
+}
+
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@243 }
+}
+
+ResolutionTaskHolder@245 {
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
+}
+
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@251 }
+}
+
+ResolutionTaskHolder@253 {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@255 }
+}
+
+ResolutionTaskHolder@257 {
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@259 }
+}
+
+ResolutionTaskHolder@261 {
+    <name not found> = ArrayList@262[4] { ResolutionCandidate@263, ResolutionCandidate@264, ResolutionCandidate@265, ... }
+    <name not found> = ArrayList@266[4] { ResolutionCandidate@263, ResolutionCandidate@264, ResolutionCandidate@265, ... }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
 }

compiler/testData/diagnostics/tests/inference/upperBounds/nonNullUpperBound.lazy.log

@@ -33,14 +33,14 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -82,14 +82,14 @@ LazyJavaClassifierType@39['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -151,3 +151,59 @@ LazyJavaPackageFragment@57['lang'] {
     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> = ArrayList@87[1] { ResolutionCandidate@86 }
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+    <name not found> = ArrayList@113[5] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[4] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+    <name not found> = ArrayList@119[5] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+}

compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.lazy.log

@@ -45,3 +45,31 @@ LazyJavaPackageFragment@19['lang'] {
     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> = ArrayList@46[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@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+    <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> = ArrayList@54[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+}

compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.lazy.log

@@ -63,3 +63,131 @@ LazyJavaPackageFragment@25['lang'] {
     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> = ArrayList@59[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]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+    <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@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+    <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> = ArrayList@71[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]
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+    <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@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+    <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> = ArrayList@83[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]
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+}
+
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+}
+
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+}