Updated lazy log tests

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

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

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

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

compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.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@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
 }
@@ -149,25 +149,28 @@ LazyJavaPackageFragment@64['lang'] {
 
 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]
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[4] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@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, ... }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[4] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+null {
+    <name not found> = ArrayList@103[2] { ResolutionCandidate@91, ResolutionCandidate@92 }
+    <name not found> = ArrayList@104[5] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+    <name not found> = ArrayList@105[5] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]

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

@@ -46,9 +46,12 @@ LazyJavaPackageFragment@18['lang'] {
 
 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]
+}
+
+null {
+    <name not found> = ArrayList@43[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }

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

@@ -82,14 +82,14 @@ LazyJavaClassifierType@39['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -151,43 +151,46 @@ LazyJavaPackageFragment@64['lang'] {
 
 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]
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[2] { ResolutionCandidate@95, ResolutionCandidate@96 }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@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]
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@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]
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@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, ... }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[4] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+null {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@113[2] { ResolutionCandidate@95, ResolutionCandidate@96 }
+    <name not found> = ArrayList@114[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = ArrayList@115[5] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+    <name not found> = ArrayList@116[5] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]

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

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

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

@@ -45,16 +45,19 @@ LazyJavaPackageFragment@16['lang'] {
 
 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 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@44[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]

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

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

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

@@ -126,7 +126,7 @@ LazyJavaClassifierType@102['E'] {
     arguments = ArrayList@103[empty]
     classifier = JavaTypeParameterImpl@104['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@105['E'] {
@@ -140,28 +140,28 @@ LazyJavaClassifierType@108['E'] {
     arguments = ArrayList@109[empty]
     classifier = JavaTypeParameterImpl@110['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@111['E'] {
     arguments = ArrayList@112[empty]
     classifier = JavaTypeParameterImpl@113['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
-LazyJavaClassifierType@115['E'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaTypeParameterImpl@117['E']
+LazyJavaClassifierType@114['E'] {
+    arguments = ArrayList@115[empty]
+    classifier = JavaTypeParameterImpl@116['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
 }
 
 LazyJavaClassifierType@118['E'] {
     arguments = ArrayList@119[empty]
     classifier = JavaTypeParameterImpl@120['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
 }
 
 LazyJavaClassifierType@121['E'] {
@@ -175,105 +175,105 @@ LazyJavaClassifierType@124['E'] {
     arguments = ArrayList@125[empty]
     classifier = JavaTypeParameterImpl@126['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
 }
 
 LazyJavaClassifierType@127['E'] {
     arguments = ArrayList@128[empty]
     classifier = JavaTypeParameterImpl@129['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@130['E'] {
     arguments = ArrayList@131[empty]
     classifier = JavaTypeParameterImpl@132['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
 }
 
 LazyJavaClassifierType@133['E'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@110['E']
+    classifier = JavaTypeParameterImpl@104['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@135['E'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@113['E']
+    classifier = JavaTypeParameterImpl@123['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@137['E'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@120['E']
+    classifier = JavaTypeParameterImpl@113['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@139['E'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@100['E']
+    classifier = JavaTypeParameterImpl@132['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
 }
 
 LazyJavaClassifierType@141['E'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@107['E']
+    classifier = JavaTypeParameterImpl@96['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@143['E'] {
     arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@132['E']
+    classifier = JavaTypeParameterImpl@126['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
 }
 
 LazyJavaClassifierType@145['E'] {
     arguments = ArrayList@146[empty]
-    classifier = JavaTypeParameterImpl@96['E']
+    classifier = JavaTypeParameterImpl@110['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@147['E'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@104['E']
+    classifier = JavaTypeParameterImpl@100['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@149['E'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@129['E']
+    classifier = JavaTypeParameterImpl@120['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
 }
 
 LazyJavaClassifierType@151['E'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@117['E']
+    classifier = JavaTypeParameterImpl@129['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@153['E'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@123['E']
+    classifier = JavaTypeParameterImpl@116['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
 }
 
 LazyJavaClassifierType@155['E'] {
     arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@126['E']
+    classifier = JavaTypeParameterImpl@107['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@52['List<E>'] {
@@ -393,67 +393,61 @@ LazyJavaPackageFragment@201['util'] {
     memberIndex = computeMemberIndex$1@230 // through LazyPackageFragmentScopeForJavaPackage@228
 }
 
-LazyJavaTypeParameterDescriptor@45['E'] {
+LazyJavaTypeParameterDescriptor@54['E'] {
     defaultType = JetTypeImpl@231['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
     upperBounds = LinkedHashSet@232[1] { NullableType@233 }
     upperBoundsAsType = NullableType@233
 }
 
-LazyJavaTypeParameterDescriptor@54['E'] {
+LazyJavaTypeParameterDescriptor@49['E'] {
     defaultType = JetTypeImpl@234['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
     upperBounds = LinkedHashSet@235[1] { NullableType@236 }
     upperBoundsAsType = NullableType@236
 }
 
-LazyJavaTypeParameterDescriptor@49['E'] {
+LazyJavaTypeParameterDescriptor@45['E'] {
     defaultType = JetTypeImpl@237['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
     upperBounds = LinkedHashSet@238[1] { NullableType@239 }
     upperBoundsAsType = NullableType@239
 }
 
 LazyJavaTypeParameterResolver@240 {
-    resolve(JavaTypeParameterImpl@241['E']) = LazyJavaTypeParameterDescriptor@45['E']
+    resolve(JavaTypeParameterImpl@241['E']) = LazyJavaTypeParameterDescriptor@54['E']
 }
 
 LazyJavaTypeParameterResolver@242 {
-    resolve(JavaTypeParameterImpl@243['E']) = LazyJavaTypeParameterDescriptor@49['E']
+    resolve(JavaTypeParameterImpl@243['E']) = LazyJavaTypeParameterDescriptor@45['E']
 }
 
 LazyJavaTypeParameterResolver@244 {
-    resolve(JavaTypeParameterImpl@245['E']) = LazyJavaTypeParameterDescriptor@54['E']
+    resolve(JavaTypeParameterImpl@245['E']) = LazyJavaTypeParameterDescriptor@49['E']
 }
 
 LazyJavaTypeParameterResolver@246 {
-    resolve(JavaTypeParameterImpl@123['E']) = null
+    resolve(JavaTypeParameterImpl@129['E']) = null
 }
 
 LazyJavaTypeParameterResolver@247 {
-    resolve(JavaTypeParameterImpl@110['E']) = null
+    resolve(JavaTypeParameterImpl@104['E']) = null
 }
 
 LazyJavaTypeParameterResolver@248 {
-    resolve(JavaTypeParameterImpl@113['E']) = null
-}
-
-LazyJavaTypeParameterResolver@249 {
     resolve(JavaTypeParameterImpl@120['E']) = null
 }
 
-LazyJavaTypeParameterResolver@250 {
+LazyJavaTypeParameterResolver@249 {
     resolve(JavaTypeParameterImpl@107['E']) = null
 }
 
+LazyJavaTypeParameterResolver@250 {
+    resolve(JavaTypeParameterImpl@116['E']) = null
+}
+
 ResolutionTaskHolder@251 {
     <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = 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]
@@ -479,12 +473,8 @@ ResolutionTaskHolder@251 {
     <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]
+ResolutionTaskHolder@254 {
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -502,57 +492,70 @@ ResolutionTaskHolder@255 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
+ResolutionTaskHolder@257 {
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@260 {
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
 ResolutionTaskHolder@263 {
     <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <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@266 {
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
 }
 
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
+ResolutionTaskHolder@269 {
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
+}
+
+ResolutionTaskHolder@272 {
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
 }
 
 ResolutionTaskHolder@275 {
     <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <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@278 {
+    <name not found> = ArrayList@279[2] { ResolutionCandidate@280, ResolutionCandidate@281 }
 }
 
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
+ResolutionTaskHolder@282 {
+    <name not found> = ArrayList@283[3] { ResolutionCandidate@284, ResolutionCandidate@285, ResolutionCandidate@286 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }
 
-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 }
+null {
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@277 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@265 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@259 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@256 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@262 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@253 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@274 }
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@271 }
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@268 }
+    <name not found> = ArrayList@296[2] { ResolutionCandidate@280, ResolutionCandidate@281 }
+    <name not found> = ArrayList@297[3] { ResolutionCandidate@284, ResolutionCandidate@285, ResolutionCandidate@286 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]

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

@@ -115,14 +115,14 @@ LazyJavaClassifierType@79['E'] {
     arguments = ArrayList@80[empty]
     classifier = JavaTypeParameterImpl@81['E']
     nullable = 'false': Boolean@59
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@82['E'] {
     arguments = ArrayList@83[empty]
     classifier = JavaTypeParameterImpl@84['E']
     nullable = 'false': Boolean@59
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@85['E'] {
@@ -141,28 +141,28 @@ LazyJavaClassifierType@89['E'] {
 
 LazyJavaClassifierType@91['E'] {
     arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@84['E']
+    classifier = JavaTypeParameterImpl@73['E']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@93['E'] {
     arguments = ArrayList@94[empty]
-    classifier = JavaTypeParameterImpl@73['E']
+    classifier = JavaTypeParameterImpl@84['E']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@95['E'] {
     arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@77['E']
+    classifier = JavaTypeParameterImpl@81['E']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@97['E'] {
     arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@81['E']
+    classifier = JavaTypeParameterImpl@77['E']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
@@ -225,7 +225,7 @@ LazyJavaClassifierType@119['String'] {
 
 LazyJavaClassifierType@122['String'] {
     arguments = ArrayList@123[empty]
-    classifier = JavaClassImpl@121['String']
+    classifier = JavaClassImpl@118['String']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@115
 }
@@ -239,7 +239,7 @@ LazyJavaClassifierType@124['String'] {
 
 LazyJavaClassifierType@126['String'] {
     arguments = ArrayList@127[empty]
-    classifier = JavaClassImpl@118['String']
+    classifier = JavaClassImpl@121['String']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@115
 }
@@ -267,21 +267,21 @@ LazyJavaClassifierType@135['Throwable'] {
 
 LazyJavaClassifierType@138['Throwable'] {
     arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@130['Throwable']
+    classifier = JavaClassImpl@134['Throwable']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@140['Throwable'] {
     arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@134['Throwable']
+    classifier = JavaClassImpl@137['Throwable']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@142['Throwable'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaClassImpl@137['Throwable']
+    classifier = JavaClassImpl@130['Throwable']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@131
 }
@@ -376,40 +376,32 @@ LazyJavaPackageFragment@181['util'] {
 
 LazyJavaTypeParameterDescriptor@34['E'] {
     defaultType = JetTypeImpl@215['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
     upperBounds = LinkedHashSet@216[1] { NullableType@217 }
 }
 
 LazyJavaTypeParameterDescriptor@25['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
 LazyJavaTypeParameterDescriptor@29['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
 LazyJavaTypeParameterResolver@218 {
-    resolve(JavaTypeParameterImpl@219['E']) = LazyJavaTypeParameterDescriptor@34['E']
+    resolve(JavaTypeParameterImpl@87['E']) = LazyJavaTypeParameterDescriptor@29['E']
 }
 
-LazyJavaTypeParameterResolver@220 {
-    resolve(JavaTypeParameterImpl@221['E']) = LazyJavaTypeParameterDescriptor@25['E']
+LazyJavaTypeParameterResolver@219 {
+    resolve(JavaTypeParameterImpl@220['E']) = LazyJavaTypeParameterDescriptor@25['E']
 }
 
-LazyJavaTypeParameterResolver@222 {
-    resolve(JavaTypeParameterImpl@73['E']) = LazyJavaTypeParameterDescriptor@29['E']
+LazyJavaTypeParameterResolver@221 {
+    resolve(JavaTypeParameterImpl@222['E']) = LazyJavaTypeParameterDescriptor@34['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]
@@ -443,17 +435,8 @@ ResolutionTaskHolder@223 {
     <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]
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
@@ -464,66 +447,43 @@ ResolutionTaskHolder@227 {
     <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]
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
+}
+
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
 }
 
 ResolutionTaskHolder@235 {
     <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = 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@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
 }
 
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
+}
+
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
 }
 
 ResolutionTaskHolder@247 {
     <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <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]
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[3] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254 }
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
@@ -534,9 +494,52 @@ ResolutionTaskHolder@259 {
     <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, ... }
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[4] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+}
+
+null {
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@269[3] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254 }
+    <name not found> = ArrayList@270[5] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]
     <name not found> = EmptyList@201[empty]

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

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

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

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

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

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

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

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

@@ -123,49 +123,49 @@ LazyJavaClassifierType@100['E'] {
     arguments = ArrayList@101[empty]
     classifier = JavaTypeParameterImpl@102['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
-LazyJavaClassifierType@104['E'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaTypeParameterImpl@106['E']
+LazyJavaClassifierType@103['E'] {
+    arguments = ArrayList@104[empty]
+    classifier = JavaTypeParameterImpl@105['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
 LazyJavaClassifierType@107['E'] {
     arguments = ArrayList@108[empty]
     classifier = JavaTypeParameterImpl@109['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
-LazyJavaClassifierType@111['E'] {
-    arguments = ArrayList@112[empty]
-    classifier = JavaTypeParameterImpl@113['E']
+LazyJavaClassifierType@110['E'] {
+    arguments = ArrayList@111[empty]
+    classifier = JavaTypeParameterImpl@112['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
 }
 
 LazyJavaClassifierType@114['E'] {
     arguments = ArrayList@115[empty]
     classifier = JavaTypeParameterImpl@116['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@117['E'] {
     arguments = ArrayList@118[empty]
     classifier = JavaTypeParameterImpl@119['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@120['E'] {
     arguments = ArrayList@121[empty]
     classifier = JavaTypeParameterImpl@122['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
 }
 
 LazyJavaClassifierType@123['E'] {
@@ -179,115 +179,115 @@ LazyJavaClassifierType@126['E'] {
     arguments = ArrayList@127[empty]
     classifier = JavaTypeParameterImpl@128['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
 LazyJavaClassifierType@129['E'] {
     arguments = ArrayList@130[empty]
     classifier = JavaTypeParameterImpl@131['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
 LazyJavaClassifierType@132['E'] {
     arguments = ArrayList@133[empty]
     classifier = JavaTypeParameterImpl@134['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@135['E'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@98['E']
+    classifier = JavaTypeParameterImpl@105['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
 LazyJavaClassifierType@137['E'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@134['E']
+    classifier = JavaTypeParameterImpl@116['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@139['E'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@113['E']
+    classifier = JavaTypeParameterImpl@119['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@141['E'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@128['E']
+    classifier = JavaTypeParameterImpl@125['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@143['E'] {
     arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@122['E']
+    classifier = JavaTypeParameterImpl@134['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@145['E'] {
     arguments = ArrayList@146[empty]
-    classifier = JavaTypeParameterImpl@125['E']
+    classifier = JavaTypeParameterImpl@102['E']
     nullable = 'true': Boolean@90
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@147['E'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@106['E']
+    classifier = JavaTypeParameterImpl@122['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
 }
 
 LazyJavaClassifierType@149['E'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@102['E']
+    classifier = JavaTypeParameterImpl@112['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
 }
 
 LazyJavaClassifierType@151['E'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@119['E']
+    classifier = JavaTypeParameterImpl@128['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
 LazyJavaClassifierType@153['E'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@131['E']
+    classifier = JavaTypeParameterImpl@98['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@155['E'] {
     arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@116['E']
+    classifier = JavaTypeParameterImpl@109['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
 LazyJavaClassifierType@157['E'] {
     arguments = ArrayList@158[empty]
-    classifier = JavaTypeParameterImpl@109['E']
+    classifier = JavaTypeParameterImpl@131['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
-LazyJavaClassifierType@54['List<E>'] {
+LazyJavaClassifierType@59['List<E>'] {
     arguments = ArrayList@159[1] { TypeProjectionImpl@160 }
     classifier = JavaClassImpl@161['List']
     memberScope = SubstitutingScope@162
     typeConstructor = DeserializedClassTypeConstructor@163
 }
 
-LazyJavaClassifierType@59['List<E>'] {
+LazyJavaClassifierType@54['List<E>'] {
     arguments = ArrayList@164[1] { TypeProjectionImpl@165 }
     classifier = JavaClassImpl@166['List']
     memberScope = SubstitutingScope@167
@@ -442,21 +442,21 @@ LazyJavaPackageFragment@218['util'] {
     memberIndex = computeMemberIndex$1@267 // through LazyPackageFragmentScopeForJavaPackage@261
 }
 
-LazyJavaTypeParameterDescriptor@56['E'] {
+LazyJavaTypeParameterDescriptor@51['E'] {
     defaultType = JetTypeImpl@268['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
     upperBounds = LinkedHashSet@269[1] { NullableType@270 }
     upperBoundsAsType = NullableType@270
 }
 
-LazyJavaTypeParameterDescriptor@51['E'] {
+LazyJavaTypeParameterDescriptor@47['E'] {
     defaultType = JetTypeImpl@271['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
     upperBounds = LinkedHashSet@272[1] { NullableType@273 }
     upperBoundsAsType = NullableType@273
 }
 
-LazyJavaTypeParameterDescriptor@47['E'] {
+LazyJavaTypeParameterDescriptor@56['E'] {
     defaultType = JetTypeImpl@274['E']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
     upperBounds = LinkedHashSet@275[1] { NullableType@276 }
@@ -464,27 +464,27 @@ LazyJavaTypeParameterDescriptor@47['E'] {
 }
 
 LazyJavaTypeParameterResolver@277 {
-    resolve(JavaTypeParameterImpl@278['E']) = LazyJavaTypeParameterDescriptor@56['E']
+    resolve(JavaTypeParameterImpl@112['E']) = LazyJavaTypeParameterDescriptor@47['E']
+}
+
+LazyJavaTypeParameterResolver@278 {
+    resolve(JavaTypeParameterImpl@128['E']) = LazyJavaTypeParameterDescriptor@51['E']
 }
 
 LazyJavaTypeParameterResolver@279 {
-    resolve(JavaTypeParameterImpl@125['E']) = LazyJavaTypeParameterDescriptor@47['E']
-}
-
-LazyJavaTypeParameterResolver@280 {
-    resolve(JavaTypeParameterImpl@106['E']) = LazyJavaTypeParameterDescriptor@51['E']
+    resolve(JavaTypeParameterImpl@280['E']) = LazyJavaTypeParameterDescriptor@56['E']
 }
 
 LazyJavaTypeParameterResolver@281 {
-    resolve(JavaTypeParameterImpl@102['E']) = null
+    resolve(JavaTypeParameterImpl@131['E']) = null
 }
 
 LazyJavaTypeParameterResolver@282 {
-    resolve(JavaTypeParameterImpl@134['E']) = null
+    resolve(JavaTypeParameterImpl@98['E']) = null
 }
 
 LazyJavaTypeParameterResolver@283 {
-    resolve(JavaTypeParameterImpl@131['E']) = null
+    resolve(JavaTypeParameterImpl@105['E']) = null
 }
 
 LazyJavaTypeParameterResolver@284 {
@@ -492,360 +492,363 @@ LazyJavaTypeParameterResolver@284 {
 }
 
 LazyJavaTypeParameterResolver@285 {
-    resolve(JavaTypeParameterImpl@98['E']) = null
+    resolve(JavaTypeParameterImpl@122['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]
+ResolutionTaskHolder@289 {
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
     <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 }
+ResolutionTaskHolder@292 {
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@295 {
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@298 {
     <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-    <name not found> = 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]
+ResolutionTaskHolder@301 {
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
     <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 }
+ResolutionTaskHolder@304 {
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@307 {
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@310 {
     <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
-    <name not found> = 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]
+ResolutionTaskHolder@313 {
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
     <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 }
+ResolutionTaskHolder@316 {
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@319 {
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@322 {
     <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
-    <name not found> = 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]
+ResolutionTaskHolder@325 {
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
     <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 }
+ResolutionTaskHolder@328 {
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@331 {
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@334 {
     <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
-    <name not found> = 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]
+ResolutionTaskHolder@337 {
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
     <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 }
+ResolutionTaskHolder@340 {
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@343 {
+    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@346 {
     <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
-    <name not found> = 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]
+ResolutionTaskHolder@349 {
+    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
     <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 }
+ResolutionTaskHolder@352 {
+    <name not found> = ArrayList@353[1] { ResolutionCandidate@354 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@355 {
+    <name not found> = ArrayList@356[1] { ResolutionCandidate@357 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@358 {
     <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
-    <name not found> = 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]
+ResolutionTaskHolder@361 {
+    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
     <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@364 {
+    <name not found> = ArrayList@365[1] { ResolutionCandidate@366 }
+}
+
+ResolutionTaskHolder@367 {
+    <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
 }
 
 ResolutionTaskHolder@370 {
     <name not found> = ArrayList@371[1] { ResolutionCandidate@372 }
-    <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@373 {
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
 }
 
-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@376 {
+    <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
+}
+
+ResolutionTaskHolder@379 {
+    <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
 }
 
 ResolutionTaskHolder@382 {
     <name not found> = ArrayList@383[1] { ResolutionCandidate@384 }
-    <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@385 {
+    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
 }
 
-ResolutionTaskHolder@390 {
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@392 }
+ResolutionTaskHolder@388 {
+    <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
+}
+
+ResolutionTaskHolder@391 {
+    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
 }
 
 ResolutionTaskHolder@394 {
     <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
-    <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@397 {
+    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
 }
 
-ResolutionTaskHolder@402 {
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@404 }
+ResolutionTaskHolder@400 {
+    <name not found> = ArrayList@401[1] { ResolutionCandidate@402 }
+}
+
+ResolutionTaskHolder@403 {
+    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
 }
 
 ResolutionTaskHolder@406 {
     <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
-    <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@409 {
+    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
 }
 
-ResolutionTaskHolder@414 {
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@416 }
+ResolutionTaskHolder@412 {
+    <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
+}
+
+ResolutionTaskHolder@415 {
+    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
 }
 
 ResolutionTaskHolder@418 {
     <name not found> = ArrayList@419[1] { ResolutionCandidate@420 }
-    <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@421 {
+    <name not found> = ArrayList@422[1] { ResolutionCandidate@423 }
 }
 
-ResolutionTaskHolder@426 {
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@428 }
+ResolutionTaskHolder@424 {
+    <name not found> = ArrayList@425[2] { ResolutionCandidate@426, ResolutionCandidate@427 }
 }
 
-ResolutionTaskHolder@430 {
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@432 }
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@432 }
+ResolutionTaskHolder@428 {
+    <name not found> = ArrayList@429[3] { ResolutionCandidate@430, ResolutionCandidate@431, ResolutionCandidate@432 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@434 {
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@436 }
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@436 }
+ResolutionTaskHolder@433 {
+    <name not found> = ArrayList@434[3] { ResolutionCandidate@435, ResolutionCandidate@436, ResolutionCandidate@437 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
 }
 
-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 }
+null {
+    <name not found> = ArrayList@438[1] { ResolutionCandidate@366 }
+    <name not found> = ArrayList@439[1] { ResolutionCandidate@387 }
+    <name not found> = ArrayList@440[1] { ResolutionCandidate@405 }
+    <name not found> = ArrayList@441[1] { ResolutionCandidate@372 }
+    <name not found> = ArrayList@442[1] { ResolutionCandidate@423 }
+    <name not found> = ArrayList@443[1] { ResolutionCandidate@417 }
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@402 }
+    <name not found> = ArrayList@445[1] { ResolutionCandidate@348 }
+    <name not found> = ArrayList@446[1] { ResolutionCandidate@339 }
+    <name not found> = ArrayList@447[1] { ResolutionCandidate@336 }
+    <name not found> = ArrayList@448[1] { ResolutionCandidate@321 }
+    <name not found> = ArrayList@449[1] { ResolutionCandidate@309 }
+    <name not found> = ArrayList@450[1] { ResolutionCandidate@294 }
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@342 }
+    <name not found> = ArrayList@452[1] { ResolutionCandidate@351 }
+    <name not found> = ArrayList@453[1] { ResolutionCandidate@300 }
+    <name not found> = ArrayList@454[1] { ResolutionCandidate@306 }
+    <name not found> = ArrayList@455[1] { ResolutionCandidate@399 }
+    <name not found> = ArrayList@456[1] { ResolutionCandidate@375 }
+    <name not found> = ArrayList@457[1] { ResolutionCandidate@393 }
+    <name not found> = ArrayList@458[1] { ResolutionCandidate@315 }
+    <name not found> = ArrayList@459[1] { ResolutionCandidate@324 }
+    <name not found> = ArrayList@460[1] { ResolutionCandidate@360 }
+    <name not found> = ArrayList@461[1] { ResolutionCandidate@345 }
+    <name not found> = ArrayList@462[1] { ResolutionCandidate@354 }
+    <name not found> = ArrayList@463[1] { ResolutionCandidate@363 }
+    <name not found> = ArrayList@464[1] { ResolutionCandidate@327 }
+    <name not found> = ArrayList@465[1] { ResolutionCandidate@312 }
+    <name not found> = ArrayList@466[1] { ResolutionCandidate@381 }
+    <name not found> = ArrayList@467[1] { ResolutionCandidate@396 }
+    <name not found> = ArrayList@468[1] { ResolutionCandidate@420 }
+    <name not found> = ArrayList@469[1] { ResolutionCandidate@357 }
+    <name not found> = ArrayList@470[1] { ResolutionCandidate@288 }
+    <name not found> = ArrayList@471[1] { ResolutionCandidate@291 }
+    <name not found> = ArrayList@472[1] { ResolutionCandidate@318 }
+    <name not found> = ArrayList@473[1] { ResolutionCandidate@378 }
+    <name not found> = ArrayList@474[1] { ResolutionCandidate@414 }
+    <name not found> = ArrayList@475[1] { ResolutionCandidate@303 }
+    <name not found> = ArrayList@476[1] { ResolutionCandidate@297 }
+    <name not found> = ArrayList@477[1] { ResolutionCandidate@330 }
+    <name not found> = ArrayList@478[1] { ResolutionCandidate@333 }
+    <name not found> = ArrayList@479[1] { ResolutionCandidate@384 }
+    <name not found> = ArrayList@480[1] { ResolutionCandidate@390 }
+    <name not found> = ArrayList@481[1] { ResolutionCandidate@408 }
+    <name not found> = ArrayList@482[1] { ResolutionCandidate@369 }
+    <name not found> = ArrayList@483[1] { ResolutionCandidate@411 }
+    <name not found> = ArrayList@484[2] { ResolutionCandidate@426, ResolutionCandidate@427 }
+    <name not found> = ArrayList@485[3] { ResolutionCandidate@430, ResolutionCandidate@431, ResolutionCandidate@432 }
+    <name not found> = ArrayList@486[3] { ResolutionCandidate@435, ResolutionCandidate@436, ResolutionCandidate@437 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]

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

@@ -151,7 +151,7 @@ LazyJavaClassifierType@91['T'] {
     arguments = ArrayList@92[empty]
     classifier = JavaTypeParameterImpl@93['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@94['T'] {
@@ -165,89 +165,89 @@ LazyJavaClassifierType@97['T'] {
     arguments = ArrayList@98[empty]
     classifier = JavaTypeParameterImpl@99['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@101['T'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaTypeParameterImpl@103['T']
+LazyJavaClassifierType@100['T'] {
+    arguments = ArrayList@101[empty]
+    classifier = JavaTypeParameterImpl@102['T']
     nullable = 'false': Boolean@33
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
-LazyJavaClassifierType@104['T'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaTypeParameterImpl@106['T']
-    nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@107['T'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaTypeParameterImpl@109['T']
-    nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@110['T'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaTypeParameterImpl@112['T']
+LazyJavaClassifierType@103['T'] {
+    arguments = ArrayList@104[empty]
+    classifier = JavaTypeParameterImpl@105['T']
     nullable = 'false': Boolean@33
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
+LazyJavaClassifierType@106['T'] {
+    arguments = ArrayList@107[empty]
+    classifier = JavaTypeParameterImpl@108['T']
+    nullable = 'false': Boolean@33
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+}
+
+LazyJavaClassifierType@109['T'] {
+    arguments = ArrayList@110[empty]
+    classifier = JavaTypeParameterImpl@111['T']
+    nullable = 'false': Boolean@33
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
+}
+
 LazyJavaClassifierType@113['T'] {
     arguments = ArrayList@114[empty]
     classifier = JavaTypeParameterImpl@115['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@116['T'] {
     arguments = ArrayList@117[empty]
     classifier = JavaTypeParameterImpl@118['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@119['T'] {
     arguments = ArrayList@120[empty]
-    classifier = JavaTypeParameterImpl@99['T']
+    classifier = JavaTypeParameterImpl@111['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@121['T'] {
     arguments = ArrayList@122[empty]
-    classifier = JavaTypeParameterImpl@106['T']
+    classifier = JavaTypeParameterImpl@102['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@123['T'] {
     arguments = ArrayList@124[empty]
-    classifier = JavaTypeParameterImpl@103['T']
+    classifier = JavaTypeParameterImpl@105['T']
     nullable = 'true': Boolean@44
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@125['T'] {
     arguments = ArrayList@126[empty]
-    classifier = JavaTypeParameterImpl@93['T']
+    classifier = JavaTypeParameterImpl@86['T']
     nullable = 'true': Boolean@44
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@127['T'] {
     arguments = ArrayList@128[empty]
-    classifier = JavaTypeParameterImpl@112['T']
+    classifier = JavaTypeParameterImpl@115['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@129['T'] {
     arguments = ArrayList@130[empty]
-    classifier = JavaTypeParameterImpl@115['T']
+    classifier = JavaTypeParameterImpl@99['T']
     nullable = 'true': Boolean@44
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
@@ -256,42 +256,42 @@ LazyJavaClassifierType@131['T'] {
     arguments = ArrayList@132[empty]
     classifier = JavaTypeParameterImpl@118['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@133['T'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@86['T']
+    classifier = JavaTypeParameterImpl@96['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@135['T'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@96['T']
+    classifier = JavaTypeParameterImpl@93['T']
     nullable = 'true': Boolean@44
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@137['T'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@89['T']
+    classifier = JavaTypeParameterImpl@108['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@139['T'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@109['T']
+    classifier = JavaTypeParameterImpl@82['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@141['T'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@82['T']
+    classifier = JavaTypeParameterImpl@89['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaPackageFragmentProvider@143 {
@@ -368,7 +368,7 @@ LazyJavaPackageFragment@167['util'] {
 }
 
 LazyJavaTypeParameterDescriptor@26['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
     upperBounds = LinkedHashSet@199[1] { NullableType@200 }
     upperBoundsAsType = NullableType@200
 }
@@ -390,39 +390,42 @@ LazyJavaTypeParameterResolver@209 {
 }
 
 LazyJavaTypeParameterResolver@211 {
-    resolve(JavaTypeParameterImpl@212['T']) = LazyJavaTypeParameterDescriptor@204['T']
+    resolve(JavaTypeParameterImpl@212['T']) = LazyJavaTypeParameterDescriptor@201['T']
 }
 
 LazyJavaTypeParameterResolver@213 {
-    resolve(JavaTypeParameterImpl@214['T']) = LazyJavaTypeParameterDescriptor@201['T']
+    resolve(JavaTypeParameterImpl@214['T']) = LazyJavaTypeParameterDescriptor@204['T']
 }
 
 LazyJavaTypeParameterResolver@215 {
-    resolve(JavaTypeParameterImpl@99['T']) = null
+    resolve(JavaTypeParameterImpl@115['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@219 {
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
 }
 
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
 }
 
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[2] { ResolutionCandidate@230, ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[3] { ResolutionCandidate@230, ResolutionCandidate@231, ResolutionCandidate@233 }
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[2] { ResolutionCandidate@227, ResolutionCandidate@228 }
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+}
+
+null {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@232[3] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@233 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]

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

@@ -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
 }
@@ -147,67 +147,70 @@ LazyJavaPackageFragment@62['lang'] {
 
 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]
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <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 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[4] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
     <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]
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[4] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
 }
 
-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, ... }
+null {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@124[5] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
+    <name not found> = ArrayList@125[5] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
+    <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]
     <name not found> = EmptyList@79[empty]

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

@@ -40,7 +40,23 @@ LazyJavaPackageFragment@9['lang'] {
 
 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]
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -64,10 +80,6 @@ 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]
 }
 
 ResolutionTaskHolder@41 {
@@ -79,18 +91,6 @@ 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]
 }
 
 ResolutionTaskHolder@42 {
@@ -102,11 +102,14 @@ 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]
 }
 
-ResolutionTaskHolder@43 {
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]

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

@@ -172,15 +172,18 @@ LazyJavaTypeParameterResolver@124 {
 
 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]
+}
+
+null {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
     <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]
     <name not found> = EmptyList@5[empty]

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

@@ -93,59 +93,59 @@ LazyJavaClassifierType@57['E'] {
     arguments = ArrayList@58[empty]
     classifier = JavaTypeParameterImpl@59['E']
     nullable = 'false': Boolean@34
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
 }
 
-LazyJavaClassifierType@60['E'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaTypeParameterImpl@62['E']
+LazyJavaClassifierType@61['E'] {
+    arguments = ArrayList@62[empty]
+    classifier = JavaTypeParameterImpl@63['E']
     nullable = 'false': Boolean@34
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
 }
 
-LazyJavaClassifierType@63['E'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaTypeParameterImpl@65['E']
+LazyJavaClassifierType@64['E'] {
+    arguments = ArrayList@65[empty]
+    classifier = JavaTypeParameterImpl@66['E']
     nullable = 'false': Boolean@34
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@67['E'] {
     arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@59['E']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-}
-
-LazyJavaClassifierType@70['E'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@65['E']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
-}
-
-LazyJavaClassifierType@72['E'] {
-    arguments = ArrayList@73[empty]
     classifier = JavaTypeParameterImpl@51['E']
     nullable = 'true': Boolean@69
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
 }
 
+LazyJavaClassifierType@70['E'] {
+    arguments = ArrayList@71[empty]
+    classifier = JavaTypeParameterImpl@63['E']
+    nullable = 'true': Boolean@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
+}
+
+LazyJavaClassifierType@72['E'] {
+    arguments = ArrayList@73[empty]
+    classifier = JavaTypeParameterImpl@66['E']
+    nullable = 'true': Boolean@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
+}
+
 LazyJavaClassifierType@74['E'] {
     arguments = ArrayList@75[empty]
+    classifier = JavaTypeParameterImpl@59['E']
+    nullable = 'true': Boolean@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+}
+
+LazyJavaClassifierType@76['E'] {
+    arguments = ArrayList@77[empty]
     classifier = JavaTypeParameterImpl@55['E']
     nullable = 'true': Boolean@69
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
-LazyJavaClassifierType@76['E'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@62['E']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-}
-
-LazyJavaClassifierType@23['List<E>'] {
+LazyJavaClassifierType@18['List<E>'] {
     arguments = ArrayList@78[1] { TypeProjectionImpl@79 }
     classifier = JavaClassImpl@80['List']
     memberScope = SubstitutingScope@81
@@ -153,7 +153,7 @@ LazyJavaClassifierType@23['List<E>'] {
     typeConstructor = DeserializedClassTypeConstructor@82
 }
 
-LazyJavaClassifierType@18['List<E>'] {
+LazyJavaClassifierType@23['List<E>'] {
     arguments = ArrayList@83[1] { TypeProjectionImpl@84 }
     classifier = JavaClassImpl@85['List']
     memberScope = SubstitutingScope@86
@@ -261,16 +261,16 @@ LazyJavaPackageFragment@119['util'] {
 }
 
 LazyJavaTypeParameterDescriptor@20['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
     upperBounds = LinkedHashSet@156[1] { NullableType@157 }
 }
 
-LazyJavaTypeParameterDescriptor@15['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
+LazyJavaTypeParameterDescriptor@11['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
 }
 
-LazyJavaTypeParameterDescriptor@11['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+LazyJavaTypeParameterDescriptor@15['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
 }
 
 LazyJavaTypeParameterResolver@158 {
@@ -287,47 +287,50 @@ LazyJavaTypeParameterResolver@162 {
 
 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]
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
     <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]
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
     <name not found> = EmptyList@144[empty]
     <name not found> = EmptyList@144[empty]
 }
 
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
+}
+
 ResolutionTaskHolder@176 {
     <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <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@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
 }
 
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+null {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@166 }
+    <name not found> = EmptyList@144[empty]
+    <name not found> = EmptyList@144[empty]
+    <name not found> = EmptyList@144[empty]
+    <name not found> = EmptyList@144[empty]
+    <name not found> = EmptyList@144[empty]
+    <name not found> = EmptyList@144[empty]
 }

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

@@ -38,10 +38,6 @@ LazyJavaPackageFragment@9['lang'] {
 
 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]
@@ -59,31 +55,38 @@ ResolutionTaskHolder@33 {
     <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]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <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@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <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@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+null {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
 }

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

@@ -158,14 +158,14 @@ LazyJavaClassifierType@90['Cloneable'] {
     typeConstructor = DeserializedClassTypeConstructor@114
 }
 
-LazyJavaClassifierType@98['Closeable'] {
+LazyJavaClassifierType@93['Closeable'] {
     arguments = ArrayList@115[empty]
     classifier = JavaClassImpl@116['Closeable']
     memberScope = LazyJavaClassMemberScope@18
     typeConstructor = LazyJavaClassTypeConstructor@20['Closeable']
 }
 
-LazyJavaClassifierType@93['Closeable'] {
+LazyJavaClassifierType@98['Closeable'] {
     arguments = ArrayList@117[empty]
     classifier = JavaClassImpl@118['Closeable']
     memberScope = LazyJavaClassMemberScope@18
@@ -202,14 +202,14 @@ LazyJavaClassifierType@131['K'] {
     arguments = ArrayList@132[empty]
     classifier = JavaTypeParameterImpl@133['K']
     nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
-LazyJavaClassifierType@135['K'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@137['K']
+LazyJavaClassifierType@134['K'] {
+    arguments = ArrayList@135[empty]
+    classifier = JavaTypeParameterImpl@136['K']
     nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@137
 }
 
 LazyJavaClassifierType@138['K'] {
@@ -221,35 +221,35 @@ LazyJavaClassifierType@138['K'] {
 
 LazyJavaClassifierType@141['K'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@130['K']
+    classifier = JavaTypeParameterImpl@133['K']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@144['K'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@140['K']
+    classifier = JavaTypeParameterImpl@125['K']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@146['K'] {
     arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@137['K']
+    classifier = JavaTypeParameterImpl@130['K']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@148['K'] {
     arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@133['K']
+    classifier = JavaTypeParameterImpl@136['K']
     nullable = 'true': Boolean@143
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@137
 }
 
 LazyJavaClassifierType@150['K'] {
     arguments = ArrayList@151[empty]
-    classifier = JavaTypeParameterImpl@125['K']
+    classifier = JavaTypeParameterImpl@140['K']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
@@ -409,14 +409,14 @@ LazyJavaClassifierType@223['V'] {
 
 LazyJavaClassifierType@226['V'] {
     arguments = ArrayList@227[empty]
-    classifier = JavaTypeParameterImpl@211['V']
+    classifier = JavaTypeParameterImpl@225['V']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
 }
 
 LazyJavaClassifierType@228['V'] {
     arguments = ArrayList@229[empty]
-    classifier = JavaTypeParameterImpl@215['V']
+    classifier = JavaTypeParameterImpl@218['V']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
 }
@@ -430,14 +430,14 @@ LazyJavaClassifierType@230['V'] {
 
 LazyJavaClassifierType@232['V'] {
     arguments = ArrayList@233[empty]
-    classifier = JavaTypeParameterImpl@225['V']
+    classifier = JavaTypeParameterImpl@211['V']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
 }
 
 LazyJavaClassifierType@234['V'] {
     arguments = ArrayList@235[empty]
-    classifier = JavaTypeParameterImpl@218['V']
+    classifier = JavaTypeParameterImpl@215['V']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
 }
@@ -492,7 +492,7 @@ LazyJavaPackageFragmentProvider@236 {
     topLevelClasses(JavaClassImpl@105['AbstractMap']) = LazyJavaClassDescriptor@2['AbstractMap']
     topLevelClasses(JavaClassImpl@108['Appendable']) = LazyJavaClassDescriptor@8['Appendable']
     topLevelClasses(JavaClassImpl@110['AutoCloseable']) = LazyJavaClassDescriptor@13['AutoCloseable']
-    topLevelClasses(JavaClassImpl@116['Closeable']) = LazyJavaClassDescriptor@17['Closeable']
+    topLevelClasses(JavaClassImpl@118['Closeable']) = LazyJavaClassDescriptor@17['Closeable']
     topLevelClasses(JavaClassImpl@120['FilterOutputStream']) = LazyJavaClassDescriptor@21['FilterOutputStream']
     topLevelClasses(JavaClassImpl@288['HashMap']) = LazyJavaClassDescriptor@25['HashMap']
     topLevelClasses(JavaClassImpl@194['OutputStream']) = LazyJavaClassDescriptor@36['OutputStream']
@@ -542,7 +542,7 @@ LazyJavaTypeParameterDescriptor@85['K'] {
 }
 
 LazyJavaTypeParameterDescriptor@69['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@137
 }
 
 LazyJavaTypeParameterDescriptor@86['V'] {
@@ -567,20 +567,10 @@ LazyJavaTypeParameterResolver@318 {
 
 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]
+ResolutionTaskHolder@326 {
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
@@ -591,9 +581,8 @@ ResolutionTaskHolder@327 {
     <name not found> = EmptyList@4[empty]
 }
 
-ResolutionTaskHolder@331 {
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@333 }
+ResolutionTaskHolder@329 {
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
@@ -601,193 +590,207 @@ ResolutionTaskHolder@331 {
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
+}
+
+ResolutionTaskHolder@332 {
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
 }
 
 ResolutionTaskHolder@335 {
     <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
-    <name not found> = 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]
+ResolutionTaskHolder@338 {
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
     <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 }
+ResolutionTaskHolder@341 {
+    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
+}
+
+ResolutionTaskHolder@344 {
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
 }
 
 ResolutionTaskHolder@347 {
     <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
-    <name not found> = 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]
+ResolutionTaskHolder@350 {
+    <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
     <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 }
+ResolutionTaskHolder@353 {
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
+}
+
+ResolutionTaskHolder@356 {
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
 }
 
 ResolutionTaskHolder@359 {
     <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
-    <name not found> = 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]
+ResolutionTaskHolder@362 {
+    <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
     <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@365 {
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
+}
+
+ResolutionTaskHolder@368 {
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@370 }
 }
 
 ResolutionTaskHolder@371 {
     <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
-    <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@374 {
+    <name not found> = ArrayList@375[1] { ResolutionCandidate@376 }
 }
 
-ResolutionTaskHolder@379 {
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@381 }
+ResolutionTaskHolder@377 {
+    <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
+}
+
+ResolutionTaskHolder@380 {
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@382 }
 }
 
 ResolutionTaskHolder@383 {
     <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
-    <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@386 {
+    <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
 }
 
-ResolutionTaskHolder@391 {
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@393 }
+ResolutionTaskHolder@389 {
+    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
+}
+
+ResolutionTaskHolder@392 {
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@394 }
 }
 
 ResolutionTaskHolder@395 {
     <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
-    <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@398 {
+    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
 }
 
-ResolutionTaskHolder@403 {
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@405 }
+ResolutionTaskHolder@401 {
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
+}
+
+ResolutionTaskHolder@404 {
+    <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
 }
 
 ResolutionTaskHolder@407 {
     <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
-    <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@410 {
+    <name not found> = ArrayList@411[4] { ResolutionCandidate@412, ResolutionCandidate@413, ResolutionCandidate@414, ... }
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
 }
 
 ResolutionTaskHolder@415 {
-    <name not found> = 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]
     <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 {
+null {
+    <name not found> = ArrayList@416[10] { ResolutionCandidate@323, ResolutionCandidate@324, ResolutionCandidate@325, ... }
+    <name not found> = ArrayList@417[1] { ResolutionCandidate@373 }
+    <name not found> = ArrayList@418[1] { ResolutionCandidate@334 }
+    <name not found> = ArrayList@419[1] { ResolutionCandidate@331 }
+    <name not found> = ArrayList@420[1] { ResolutionCandidate@382 }
+    <name not found> = ArrayList@421[1] { ResolutionCandidate@337 }
+    <name not found> = ArrayList@422[1] { ResolutionCandidate@391 }
+    <name not found> = ArrayList@423[1] { ResolutionCandidate@328 }
+    <name not found> = ArrayList@424[1] { ResolutionCandidate@364 }
+    <name not found> = ArrayList@425[1] { ResolutionCandidate@379 }
+    <name not found> = ArrayList@426[1] { ResolutionCandidate@385 }
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@349 }
+    <name not found> = ArrayList@428[1] { ResolutionCandidate@400 }
+    <name not found> = ArrayList@429[1] { ResolutionCandidate@346 }
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@406 }
+    <name not found> = ArrayList@431[1] { ResolutionCandidate@355 }
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@370 }
+    <name not found> = ArrayList@433[1] { ResolutionCandidate@343 }
+    <name not found> = ArrayList@434[1] { ResolutionCandidate@376 }
+    <name not found> = ArrayList@435[1] { ResolutionCandidate@352 }
+    <name not found> = ArrayList@436[1] { ResolutionCandidate@409 }
+    <name not found> = ArrayList@437[1] { ResolutionCandidate@340 }
+    <name not found> = ArrayList@438[1] { ResolutionCandidate@394 }
+    <name not found> = ArrayList@439[1] { ResolutionCandidate@358 }
+    <name not found> = ArrayList@440[1] { ResolutionCandidate@388 }
+    <name not found> = ArrayList@441[1] { ResolutionCandidate@361 }
+    <name not found> = ArrayList@442[1] { ResolutionCandidate@367 }
+    <name not found> = ArrayList@443[1] { ResolutionCandidate@403 }
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@397 }
+    <name not found> = ArrayList@445[4] { ResolutionCandidate@412, ResolutionCandidate@413, ResolutionCandidate@414, ... }
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]
     <name not found> = EmptyList@4[empty]

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

@@ -37,21 +37,21 @@ 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@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -168,3 +168,123 @@ LazyJavaPackageFragment@59['lang'] {
     functions('foo': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
     memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
 }
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[4] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+null {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@143[5] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}

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

@@ -35,25 +35,28 @@ LazyJavaPackageFragment@10['java'] {
 
 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@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
 ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@44[8] { ResolutionCandidate@45, ResolutionCandidate@46, ResolutionCandidate@47, ... }
 }
 
-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, ... }
+null {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@52[8] { ResolutionCandidate@45, ResolutionCandidate@46, ResolutionCandidate@47, ... }
 }

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@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
-LazyJavaClassifierType@67['E'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@69['E']
+LazyJavaClassifierType@68['E'] {
+    arguments = ArrayList@69[empty]
+    classifier = JavaTypeParameterImpl@70['E']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+}
+
+LazyJavaClassifierType@71['E'] {
+    arguments = ArrayList@72[empty]
+    classifier = JavaTypeParameterImpl@73['E']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+}
+
+LazyJavaClassifierType@75['E'] {
+    arguments = ArrayList@76[empty]
+    classifier = JavaTypeParameterImpl@77['E']
     nullable = 'false': Boolean@48
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
-LazyJavaClassifierType@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@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@81['E'] {
     arguments = ArrayList@82[empty]
+    classifier = JavaTypeParameterImpl@66['E']
+    nullable = 'true': Boolean@54
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+}
+
+LazyJavaClassifierType@83['E'] {
+    arguments = ArrayList@84[empty]
+    classifier = JavaTypeParameterImpl@80['E']
+    nullable = 'true': Boolean@54
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+}
+
+LazyJavaClassifierType@85['E'] {
+    arguments = ArrayList@86[empty]
     classifier = JavaTypeParameterImpl@62['E']
     nullable = 'true': Boolean@54
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
-LazyJavaClassifierType@83['E'] {
-    arguments = ArrayList@84[empty]
-    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@69['E']
+    classifier = JavaTypeParameterImpl@77['E']
     nullable = 'true': Boolean@54
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
 LazyJavaClassifierType@89['E'] {
     arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@76['E']
+    classifier = JavaTypeParameterImpl@70['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@91['E'] {
     arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@72['E']
+    classifier = JavaTypeParameterImpl@73['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@24['List<E>'] {
@@ -325,16 +325,16 @@ LazyJavaPackageFragment@152['util'] {
 
 LazyJavaTypeParameterDescriptor@26['E'] {
     defaultType = JetTypeImpl@205['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
     upperBounds = LinkedHashSet@206[1] { NullableType@207 }
 }
 
-LazyJavaTypeParameterDescriptor@17['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+LazyJavaTypeParameterDescriptor@21['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
-LazyJavaTypeParameterDescriptor@21['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+LazyJavaTypeParameterDescriptor@17['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaTypeParameterResolver@208 {
@@ -342,158 +342,161 @@ LazyJavaTypeParameterResolver@208 {
 }
 
 LazyJavaTypeParameterResolver@210 {
-    resolve(JavaTypeParameterImpl@80['E']) = LazyJavaTypeParameterDescriptor@21['E']
+    resolve(JavaTypeParameterImpl@211['E']) = LazyJavaTypeParameterDescriptor@17['E']
 }
 
-LazyJavaTypeParameterResolver@211 {
-    resolve(JavaTypeParameterImpl@212['E']) = LazyJavaTypeParameterDescriptor@17['E']
+LazyJavaTypeParameterResolver@212 {
+    resolve(JavaTypeParameterImpl@62['E']) = LazyJavaTypeParameterDescriptor@21['E']
 }
 
 ResolutionTaskHolder@213 {
     <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = 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]
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
     <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 }
+ResolutionTaskHolder@219 {
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
     <name not found> = EmptyList@186[empty]
     <name not found> = EmptyList@186[empty]
+}
+
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
     <name not found> = EmptyList@186[empty]
     <name not found> = EmptyList@186[empty]
 }
 
 ResolutionTaskHolder@225 {
     <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = 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]
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
     <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 }
+ResolutionTaskHolder@231 {
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
     <name not found> = EmptyList@186[empty]
     <name not found> = EmptyList@186[empty]
+}
+
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
     <name not found> = EmptyList@186[empty]
     <name not found> = EmptyList@186[empty]
 }
 
 ResolutionTaskHolder@237 {
     <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <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@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
 }
 
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
+ResolutionTaskHolder@243 {
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
+}
+
+ResolutionTaskHolder@246 {
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
 }
 
 ResolutionTaskHolder@249 {
     <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <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@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
 }
 
-ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@259 }
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
+}
+
+ResolutionTaskHolder@258 {
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
 }
 
 ResolutionTaskHolder@261 {
     <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <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@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
 }
 
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@271 }
+ResolutionTaskHolder@267 {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
+}
+
+ResolutionTaskHolder@270 {
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
 }
 
 ResolutionTaskHolder@273 {
     <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-    <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@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
 }
 
-ResolutionTaskHolder@281 {
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@283 }
+ResolutionTaskHolder@279 {
+    <name not found> = ArrayList@280[3] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283 }
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
 }
 
-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 }
+null {
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@306[3] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283 }
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
+    <name not found> = EmptyList@186[empty]
     <name not found> = EmptyList@186[empty]
     <name not found> = EmptyList@186[empty]
     <name not found> = EmptyList@186[empty]

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

@@ -79,87 +79,90 @@ LazyJavaPackageFragment@30['util'] {
 
 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@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <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@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
 }
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <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@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[2] { ResolutionCandidate@101, ResolutionCandidate@102 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[2] { ResolutionCandidate@105, ResolutionCandidate@106 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[2] { ResolutionCandidate@111, ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[2] { ResolutionCandidate@111, ResolutionCandidate@112 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[7] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[7] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
+}
+
+null {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@132[2] { ResolutionCandidate@105, ResolutionCandidate@106 }
+    <name not found> = ArrayList@133[2] { ResolutionCandidate@101, ResolutionCandidate@102 }
+    <name not found> = ArrayList@134[7] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+    <name not found> = ArrayList@135[7] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
+    <name not found> = ArrayList@136[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
-
-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

@@ -97,41 +97,44 @@ LazyJavaTypeParameterResolver@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@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <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]
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[2] { ResolutionCandidate@96, ResolutionCandidate@97 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
+    <name not found> = EmptyList@59[empty]
+    <name not found> = EmptyList@59[empty]
+}
+
+null {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@107[2] { ResolutionCandidate@96, ResolutionCandidate@97 }
+    <name not found> = ArrayList@108[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]
     <name not found> = EmptyList@59[empty]

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

@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,14 +79,14 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -149,42 +149,45 @@ LazyJavaPackageFragment@64['lang'] {
 
 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@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
 ResolutionTaskHolder@99 {
     <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <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@102 {
+    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
 }
 
-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]
+null {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@112[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]

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

@@ -40,10 +40,6 @@ LazyJavaPackageFragment@15['lang'] {
 
 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]
@@ -61,17 +57,24 @@ ResolutionTaskHolder@34 {
     <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@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }

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

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

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

@@ -133,56 +133,56 @@ LazyJavaClassifierType@105['E'] {
     arguments = ArrayList@106[empty]
     classifier = JavaTypeParameterImpl@107['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
-LazyJavaClassifierType@109['E'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaTypeParameterImpl@111['E']
+LazyJavaClassifierType@108['E'] {
+    arguments = ArrayList@109[empty]
+    classifier = JavaTypeParameterImpl@110['E']
     nullable = 'false': Boolean@82
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
-LazyJavaClassifierType@112['E'] {
-    arguments = ArrayList@113[empty]
-    classifier = JavaTypeParameterImpl@114['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@115['E'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaTypeParameterImpl@117['E']
+LazyJavaClassifierType@111['E'] {
+    arguments = ArrayList@112[empty]
+    classifier = JavaTypeParameterImpl@113['E']
     nullable = 'false': Boolean@82
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
-LazyJavaClassifierType@118['E'] {
-    arguments = ArrayList@119[empty]
-    classifier = JavaTypeParameterImpl@120['E']
+LazyJavaClassifierType@114['E'] {
+    arguments = ArrayList@115[empty]
+    classifier = JavaTypeParameterImpl@116['E']
+    nullable = 'false': Boolean@82
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+}
+
+LazyJavaClassifierType@117['E'] {
+    arguments = ArrayList@118[empty]
+    classifier = JavaTypeParameterImpl@119['E']
     nullable = 'false': Boolean@82
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
-LazyJavaClassifierType@121['E'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaTypeParameterImpl@123['E']
+LazyJavaClassifierType@120['E'] {
+    arguments = ArrayList@121[empty]
+    classifier = JavaTypeParameterImpl@122['E']
     nullable = 'false': Boolean@82
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
-LazyJavaClassifierType@124['E'] {
-    arguments = ArrayList@125[empty]
-    classifier = JavaTypeParameterImpl@126['E']
+LazyJavaClassifierType@123['E'] {
+    arguments = ArrayList@124[empty]
+    classifier = JavaTypeParameterImpl@125['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@127['E'] {
     arguments = ArrayList@128[empty]
     classifier = JavaTypeParameterImpl@129['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@130['E'] {
@@ -194,79 +194,79 @@ LazyJavaClassifierType@130['E'] {
 
 LazyJavaClassifierType@133['E'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@120['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@135['E'] {
-    arguments = ArrayList@136[empty]
     classifier = JavaTypeParameterImpl@132['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
-LazyJavaClassifierType@137['E'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@126['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@139['E'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@107['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@141['E'] {
-    arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@111['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@143['E'] {
-    arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@96['E']
+LazyJavaClassifierType@135['E'] {
+    arguments = ArrayList@136[empty]
+    classifier = JavaTypeParameterImpl@119['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
-LazyJavaClassifierType@145['E'] {
-    arguments = ArrayList@146[empty]
+LazyJavaClassifierType@137['E'] {
+    arguments = ArrayList@138[empty]
+    classifier = JavaTypeParameterImpl@125['E']
+    nullable = 'true': Boolean@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+}
+
+LazyJavaClassifierType@139['E'] {
+    arguments = ArrayList@140[empty]
     classifier = JavaTypeParameterImpl@100['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
+LazyJavaClassifierType@141['E'] {
+    arguments = ArrayList@142[empty]
+    classifier = JavaTypeParameterImpl@96['E']
+    nullable = 'true': Boolean@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+}
+
+LazyJavaClassifierType@143['E'] {
+    arguments = ArrayList@144[empty]
+    classifier = JavaTypeParameterImpl@116['E']
+    nullable = 'true': Boolean@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+}
+
+LazyJavaClassifierType@145['E'] {
+    arguments = ArrayList@146[empty]
+    classifier = JavaTypeParameterImpl@129['E']
+    nullable = 'true': Boolean@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+}
+
 LazyJavaClassifierType@147['E'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@123['E']
+    classifier = JavaTypeParameterImpl@110['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@149['E'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@129['E']
+    classifier = JavaTypeParameterImpl@122['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@151['E'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@114['E']
+    classifier = JavaTypeParameterImpl@113['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@153['E'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@117['E']
+    classifier = JavaTypeParameterImpl@107['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@155['E'] {
@@ -390,9 +390,9 @@ LazyJavaPackageFragment@210['util'] {
     memberIndex = computeMemberIndex$1@237 // through LazyPackageFragmentScopeForJavaPackage@235
 }
 
-LazyJavaTypeParameterDescriptor@45['E'] {
+LazyJavaTypeParameterDescriptor@54['E'] {
     defaultType = JetTypeImpl@238['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
     upperBounds = LinkedHashSet@239[1] { NullableType@240 }
     upperBoundsAsType = NullableType@240
 }
@@ -404,9 +404,9 @@ LazyJavaTypeParameterDescriptor@49['E'] {
     upperBoundsAsType = NullableType@243
 }
 
-LazyJavaTypeParameterDescriptor@54['E'] {
+LazyJavaTypeParameterDescriptor@45['E'] {
     defaultType = JetTypeImpl@244['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
     upperBounds = LinkedHashSet@245[1] { NullableType@246 }
     upperBoundsAsType = NullableType@246
 }
@@ -416,44 +416,35 @@ LazyJavaTypeParameterResolver@247 {
 }
 
 LazyJavaTypeParameterResolver@249 {
-    resolve(JavaTypeParameterImpl@250['E']) = LazyJavaTypeParameterDescriptor@54['E']
+    resolve(JavaTypeParameterImpl@250['E']) = LazyJavaTypeParameterDescriptor@45['E']
 }
 
 LazyJavaTypeParameterResolver@251 {
-    resolve(JavaTypeParameterImpl@252['E']) = LazyJavaTypeParameterDescriptor@45['E']
+    resolve(JavaTypeParameterImpl@252['E']) = LazyJavaTypeParameterDescriptor@54['E']
 }
 
 LazyJavaTypeParameterResolver@253 {
-    resolve(JavaTypeParameterImpl@114['E']) = null
-}
-
-LazyJavaTypeParameterResolver@254 {
-    resolve(JavaTypeParameterImpl@132['E']) = null
-}
-
-LazyJavaTypeParameterResolver@255 {
     resolve(JavaTypeParameterImpl@129['E']) = null
 }
 
+LazyJavaTypeParameterResolver@254 {
+    resolve(JavaTypeParameterImpl@104['E']) = null
+}
+
+LazyJavaTypeParameterResolver@255 {
+    resolve(JavaTypeParameterImpl@113['E']) = null
+}
+
 LazyJavaTypeParameterResolver@256 {
-    resolve(JavaTypeParameterImpl@123['E']) = null
+    resolve(JavaTypeParameterImpl@132['E']) = null
 }
 
 LazyJavaTypeParameterResolver@257 {
-    resolve(JavaTypeParameterImpl@96['E']) = null
+    resolve(JavaTypeParameterImpl@119['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]
@@ -464,59 +455,71 @@ ResolutionTaskHolder@258 {
     <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@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
 }
 
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@268 }
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
+}
+
+ResolutionTaskHolder@267 {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
 }
 
 ResolutionTaskHolder@270 {
     <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-    <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@273 {
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
 }
 
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@280 }
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
+}
+
+ResolutionTaskHolder@279 {
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
 }
 
 ResolutionTaskHolder@282 {
     <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-    <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@285 {
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
 }
 
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@292 }
+ResolutionTaskHolder@288 {
+    <name not found> = ArrayList@289[2] { ResolutionCandidate@290, ResolutionCandidate@291 }
 }
 
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@296 }
+ResolutionTaskHolder@292 {
+    <name not found> = ArrayList@293[3] { ResolutionCandidate@294, ResolutionCandidate@295, ResolutionCandidate@296 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }
 
-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 }
+null {
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@284 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@275 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@287 }
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@307[2] { ResolutionCandidate@290, ResolutionCandidate@291 }
+    <name not found> = ArrayList@308[3] { ResolutionCandidate@294, ResolutionCandidate@295, ResolutionCandidate@296 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]

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

@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@20['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
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -157,51 +157,33 @@ LazyJavaPackageFragment@68['lang'] {
 
 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]
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
     <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@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
 ResolutionTaskHolder@107 {
     <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <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@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
-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]
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[4] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
@@ -212,7 +194,28 @@ ResolutionTaskHolder@119 {
     <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, ... }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[8] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122, ... }
+}
+
+null {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@129[5] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
+    <name not found> = ArrayList@130[8] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122, ... }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
 }

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

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

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@71
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
-LazyJavaClassifierType@72['E'] {
-    arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@74['E']
+LazyJavaClassifierType@71['E'] {
+    arguments = ArrayList@72[empty]
+    classifier = JavaTypeParameterImpl@73['E']
     nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@75['E'] {
@@ -119,14 +119,14 @@ LazyJavaClassifierType@75['E'] {
 
 LazyJavaClassifierType@78['E'] {
     arguments = ArrayList@79[empty]
-    classifier = JavaTypeParameterImpl@70['E']
+    classifier = JavaTypeParameterImpl@73['E']
     nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@80['E'] {
     arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@66['E']
+    classifier = JavaTypeParameterImpl@70['E']
     nullable = 'true': Boolean@61
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
@@ -140,7 +140,7 @@ LazyJavaClassifierType@82['E'] {
 
 LazyJavaClassifierType@84['E'] {
     arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@74['E']
+    classifier = JavaTypeParameterImpl@66['E']
     nullable = 'true': Boolean@61
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
@@ -194,7 +194,7 @@ LazyJavaClassifierType@104['String'] {
 
 LazyJavaClassifierType@107['String'] {
     arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@106['String']
+    classifier = JavaClassImpl@103['String']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@100
 }
@@ -208,7 +208,7 @@ LazyJavaClassifierType@109['String'] {
 
 LazyJavaClassifierType@111['String'] {
     arguments = ArrayList@112[empty]
-    classifier = JavaClassImpl@103['String']
+    classifier = JavaClassImpl@106['String']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@100
 }
@@ -236,14 +236,14 @@ LazyJavaClassifierType@120['Throwable'] {
 
 LazyJavaClassifierType@123['Throwable'] {
     arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@122['Throwable']
+    classifier = JavaClassImpl@119['Throwable']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@116
 }
 
 LazyJavaClassifierType@125['Throwable'] {
     arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@119['Throwable']
+    classifier = JavaClassImpl@122['Throwable']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@116
 }
@@ -366,7 +366,7 @@ LazyJavaTypeParameterDescriptor@35['E'] {
 }
 
 LazyJavaTypeParameterDescriptor@30['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaTypeParameterResolver@217 {
@@ -374,145 +374,99 @@ LazyJavaTypeParameterResolver@217 {
 }
 
 LazyJavaTypeParameterResolver@219 {
-    resolve(JavaTypeParameterImpl@70['E']) = LazyJavaTypeParameterDescriptor@30['E']
+    resolve(JavaTypeParameterImpl@73['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]
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
     <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 }
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
+}
+
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
 }
 
 ResolutionTaskHolder@232 {
     <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = 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]
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
     <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 }
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
+}
+
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
 }
 
 ResolutionTaskHolder@244 {
     <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = 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@247 {
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
 }
 
-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@250 {
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
+}
+
+ResolutionTaskHolder@253 {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
 }
 
 ResolutionTaskHolder@256 {
     <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <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@259 {
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
 }
 
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@266 }
+ResolutionTaskHolder@262 {
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
+}
+
+ResolutionTaskHolder@265 {
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
 }
 
 ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-    <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> = ArrayList@269[3] { ResolutionCandidate@270, ResolutionCandidate@271, ResolutionCandidate@272 }
     <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]
+ResolutionTaskHolder@273 {
+    <name not found> = ArrayList@274[4] { ResolutionCandidate@275, ResolutionCandidate@276, ResolutionCandidate@277, ... }
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
@@ -523,18 +477,67 @@ ResolutionTaskHolder@290 {
     <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]
+ResolutionTaskHolder@278 {
+    <name not found> = ArrayList@279[4] { ResolutionCandidate@280, ResolutionCandidate@281, ResolutionCandidate@282, ... }
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
 }
 
-ResolutionTaskHolder@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, ... }
+ResolutionTaskHolder@283 {
+    <name not found> = ArrayList@284[4] { ResolutionCandidate@285, ResolutionCandidate@286, ResolutionCandidate@287, ... }
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+}
+
+null {
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@264 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@252 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@261 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@267 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@304[3] { ResolutionCandidate@270, ResolutionCandidate@271, ResolutionCandidate@272 }
+    <name not found> = ArrayList@305[5] { ResolutionCandidate@280, ResolutionCandidate@281, ResolutionCandidate@282, ... }
+    <name not found> = ArrayList@306[5] { ResolutionCandidate@275, ResolutionCandidate@276, ResolutionCandidate@277, ... }
+    <name not found> = ArrayList@307[5] { ResolutionCandidate@285, ResolutionCandidate@286, ResolutionCandidate@287, ... }
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
+    <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]
     <name not found> = EmptyList@198[empty]

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

@@ -37,10 +37,6 @@ LazyJavaPackageFragment@12['lang'] {
 
 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]
@@ -58,12 +54,8 @@ ResolutionTaskHolder@31 {
     <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]
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -81,25 +73,36 @@ ResolutionTaskHolder@35 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <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 }
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@36 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }

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

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

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

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

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@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
 }
 
-LazyJavaClassifierType@60['E'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaTypeParameterImpl@62['E']
+LazyJavaClassifierType@61['E'] {
+    arguments = ArrayList@62[empty]
+    classifier = JavaTypeParameterImpl@63['E']
     nullable = 'false': Boolean@44
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
-LazyJavaClassifierType@63['E'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaTypeParameterImpl@65['E']
+LazyJavaClassifierType@64['E'] {
+    arguments = ArrayList@65[empty]
+    classifier = JavaTypeParameterImpl@66['E']
     nullable = 'false': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@67['E'] {
     arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@62['E']
+    classifier = JavaTypeParameterImpl@66['E']
     nullable = 'true': Boolean@50
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@69['E'] {
     arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@55['E']
+    classifier = JavaTypeParameterImpl@63['E']
     nullable = 'true': Boolean@50
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@71['E'] {
     arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@59['E']
+    classifier = JavaTypeParameterImpl@55['E']
     nullable = 'true': Boolean@50
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@73['E'] {
     arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@65['E']
+    classifier = JavaTypeParameterImpl@59['E']
     nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
 }
 
 LazyJavaClassifierType@22['List<E>'] {
@@ -246,7 +246,7 @@ LazyJavaTypeParameterDescriptor@24['E'] {
 }
 
 LazyJavaTypeParameterDescriptor@19['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
 }
 
 LazyJavaTypeParameterResolver@148 {
@@ -254,30 +254,33 @@ LazyJavaTypeParameterResolver@148 {
 }
 
 LazyJavaTypeParameterResolver@150 {
-    resolve(JavaTypeParameterImpl@65['E']) = LazyJavaTypeParameterDescriptor@19['E']
+    resolve(JavaTypeParameterImpl@59['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]
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
     <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 }
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[3] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161 }
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+}
+
+null {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@164[3] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161 }
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
     <name not found> = EmptyList@133[empty]
     <name not found> = EmptyList@133[empty]
     <name not found> = EmptyList@133[empty]

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

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

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

@@ -47,15 +47,6 @@ LazyJavaPackageFragment@18['lang'] {
 
 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]
@@ -66,16 +57,28 @@ ResolutionTaskHolder@41 {
     <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]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@34[empty]
+}
+
+null {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }

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

@@ -135,43 +135,56 @@ LazyJavaTypeParameterResolver@95 {
 
 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]
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
     <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 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
 ResolutionTaskHolder@109 {
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+}
+
+ResolutionTaskHolder@115 {
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@116 {
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
@@ -179,17 +192,6 @@ ResolutionTaskHolder@113 {
 }
 
 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]
@@ -200,20 +202,21 @@ ResolutionTaskHolder@121 {
     <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 {
+null {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@105 }
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]

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

@@ -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
 }
@@ -163,15 +163,6 @@ LazyJavaPackageFragment@59['lang'] {
 
 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]
@@ -182,28 +173,40 @@ ResolutionTaskHolder@94 {
     <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]
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
     <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]
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
     <name not found> = EmptyList@86[empty]
 }
 
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+}
+
 ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@107[4] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
 }
 
-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, ... }
+null {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@115[5] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]

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

@@ -42,48 +42,51 @@ LazyJavaPackageFragment@15['lang'] {
 
 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@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <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@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <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@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[7] { ResolutionCandidate@57, ResolutionCandidate@58, 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@60 {
+    <name not found> = ArrayList@61[7] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
 }
 
-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, ... }
+null {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@71[7] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
+    <name not found> = ArrayList@72[7] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }

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

@@ -66,92 +66,95 @@ LazyJavaPackageFragment@28['util'] {
 
 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]
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <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]
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
 }
 
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+}
+
 ResolutionTaskHolder@68 {
     <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <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@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
 ResolutionTaskHolder@80 {
     <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <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@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
 ResolutionTaskHolder@92 {
     <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <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@95 {
+    <name not found> = ArrayList@96[7] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
 }
 
 ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@101[7] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[7] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
 }
 
-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, ... }
+null {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@123[7] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = ArrayList@124[7] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
+    <name not found> = ArrayList@125[7] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
 }

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

@@ -40,9 +40,12 @@ LazyJavaPackageFragment@15['lang'] {
 
 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]
+}
+
+null {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }

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

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

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

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

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

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

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

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

@@ -108,56 +108,56 @@ LazyJavaClassifierType@71['E'] {
     arguments = ArrayList@72[empty]
     classifier = JavaTypeParameterImpl@73['E']
     nullable = 'false': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@74['E'] {
     arguments = ArrayList@75[empty]
     classifier = JavaTypeParameterImpl@76['E']
     nullable = 'false': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
 }
 
-LazyJavaClassifierType@78['E'] {
-    arguments = ArrayList@79[empty]
-    classifier = JavaTypeParameterImpl@80['E']
+LazyJavaClassifierType@77['E'] {
+    arguments = ArrayList@78[empty]
+    classifier = JavaTypeParameterImpl@79['E']
     nullable = 'false': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaClassifierType@81['E'] {
     arguments = ArrayList@82[empty]
-    classifier = JavaTypeParameterImpl@64['E']
+    classifier = JavaTypeParameterImpl@73['E']
     nullable = 'true': Boolean@83
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@84['E'] {
     arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@80['E']
+    classifier = JavaTypeParameterImpl@79['E']
     nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaClassifierType@86['E'] {
     arguments = ArrayList@87[empty]
-    classifier = JavaTypeParameterImpl@69['E']
+    classifier = JavaTypeParameterImpl@76['E']
     nullable = 'true': Boolean@83
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
 }
 
 LazyJavaClassifierType@88['E'] {
     arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@73['E']
+    classifier = JavaTypeParameterImpl@69['E']
     nullable = 'true': Boolean@83
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
 }
 
 LazyJavaClassifierType@90['E'] {
     arguments = ArrayList@91[empty]
-    classifier = JavaTypeParameterImpl@76['E']
+    classifier = JavaTypeParameterImpl@64['E']
     nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@37['List<E>'] {
@@ -276,7 +276,7 @@ LazyJavaTypeParameterDescriptor@34['E'] {
 }
 
 LazyJavaTypeParameterDescriptor@25['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaTypeParameterDescriptor@29['E'] {
@@ -284,48 +284,51 @@ LazyJavaTypeParameterDescriptor@29['E'] {
 }
 
 LazyJavaTypeParameterResolver@170 {
-    resolve(JavaTypeParameterImpl@171['E']) = LazyJavaTypeParameterDescriptor@34['E']
+    resolve(JavaTypeParameterImpl@171['E']) = LazyJavaTypeParameterDescriptor@29['E']
 }
 
 LazyJavaTypeParameterResolver@172 {
-    resolve(JavaTypeParameterImpl@173['E']) = LazyJavaTypeParameterDescriptor@29['E']
+    resolve(JavaTypeParameterImpl@173['E']) = LazyJavaTypeParameterDescriptor@25['E']
 }
 
 LazyJavaTypeParameterResolver@174 {
-    resolve(JavaTypeParameterImpl@175['E']) = LazyJavaTypeParameterDescriptor@25['E']
+    resolve(JavaTypeParameterImpl@175['E']) = LazyJavaTypeParameterDescriptor@34['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]
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
     <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@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
+}
+
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
 }
 
 ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@189[2] { ResolutionCandidate@190, ResolutionCandidate@191 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
 }
 
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[2] { ResolutionCandidate@194, ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[2] { ResolutionCandidate@194, ResolutionCandidate@195 }
+null {
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@196[2] { ResolutionCandidate@190, ResolutionCandidate@191 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]

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

@@ -40,15 +40,6 @@ LazyJavaPackageFragment@14['lang'] {
 
 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]
@@ -59,26 +50,38 @@ ResolutionTaskHolder@35 {
     <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]
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <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]
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@28[empty]
 }
 
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <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 }
+null {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
 }

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

@@ -110,23 +110,23 @@ LazyJavaClassifierType@71['E'] {
     arguments = ArrayList@72[empty]
     classifier = JavaTypeParameterImpl@73['E']
     nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
-LazyJavaClassifierType@75['E'] {
-    arguments = ArrayList@76[empty]
-    classifier = JavaTypeParameterImpl@77['E']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
-}
-
-LazyJavaClassifierType@78['E'] {
-    arguments = ArrayList@79[empty]
-    classifier = JavaTypeParameterImpl@80['E']
+LazyJavaClassifierType@74['E'] {
+    arguments = ArrayList@75[empty]
+    classifier = JavaTypeParameterImpl@76['E']
     nullable = 'false': Boolean@48
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
+LazyJavaClassifierType@77['E'] {
+    arguments = ArrayList@78[empty]
+    classifier = JavaTypeParameterImpl@79['E']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
+}
+
 LazyJavaClassifierType@81['E'] {
     arguments = ArrayList@82[empty]
     classifier = JavaTypeParameterImpl@70['E']
@@ -136,37 +136,37 @@ LazyJavaClassifierType@81['E'] {
 
 LazyJavaClassifierType@83['E'] {
     arguments = ArrayList@84[empty]
-    classifier = JavaTypeParameterImpl@80['E']
+    classifier = JavaTypeParameterImpl@79['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaClassifierType@85['E'] {
     arguments = ArrayList@86[empty]
-    classifier = JavaTypeParameterImpl@73['E']
+    classifier = JavaTypeParameterImpl@66['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@87['E'] {
     arguments = ArrayList@88[empty]
-    classifier = JavaTypeParameterImpl@62['E']
+    classifier = JavaTypeParameterImpl@73['E']
     nullable = 'true': Boolean@54
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
 LazyJavaClassifierType@89['E'] {
     arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@66['E']
+    classifier = JavaTypeParameterImpl@62['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
 LazyJavaClassifierType@91['E'] {
     arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@77['E']
+    classifier = JavaTypeParameterImpl@76['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@24['List<E>'] {
@@ -331,34 +331,28 @@ LazyJavaTypeParameterDescriptor@26['E'] {
     upperBounds = LinkedHashSet@202[1] { NullableType@203 }
 }
 
-LazyJavaTypeParameterDescriptor@17['E'] {
+LazyJavaTypeParameterDescriptor@21['E'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
-LazyJavaTypeParameterDescriptor@21['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+LazyJavaTypeParameterDescriptor@17['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaTypeParameterResolver@204 {
-    resolve(JavaTypeParameterImpl@205['E']) = LazyJavaTypeParameterDescriptor@26['E']
+    resolve(JavaTypeParameterImpl@73['E']) = LazyJavaTypeParameterDescriptor@21['E']
+}
+
+LazyJavaTypeParameterResolver@205 {
+    resolve(JavaTypeParameterImpl@79['E']) = LazyJavaTypeParameterDescriptor@17['E']
 }
 
 LazyJavaTypeParameterResolver@206 {
-    resolve(JavaTypeParameterImpl@62['E']) = LazyJavaTypeParameterDescriptor@17['E']
-}
-
-LazyJavaTypeParameterResolver@207 {
-    resolve(JavaTypeParameterImpl@73['E']) = LazyJavaTypeParameterDescriptor@21['E']
+    resolve(JavaTypeParameterImpl@207['E']) = LazyJavaTypeParameterDescriptor@26['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]
@@ -366,297 +360,218 @@ ResolutionTaskHolder@208 {
     <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]
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
     <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 }
+ResolutionTaskHolder@214 {
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
+}
+
+ResolutionTaskHolder@217 {
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
 }
 
 ResolutionTaskHolder@220 {
     <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = 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]
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
     <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 }
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
+}
+
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
 }
 
 ResolutionTaskHolder@232 {
     <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = 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]
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
     <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 }
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
+}
+
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
 }
 
 ResolutionTaskHolder@244 {
     <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = 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@247 {
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
 }
 
-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@250 {
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
+}
+
+ResolutionTaskHolder@253 {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
 }
 
 ResolutionTaskHolder@256 {
     <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <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@259 {
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
 }
 
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@266 }
+ResolutionTaskHolder@262 {
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
+}
+
+ResolutionTaskHolder@265 {
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
 }
 
 ResolutionTaskHolder@268 {
     <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-    <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@271 {
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
 }
 
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@278 }
+ResolutionTaskHolder@274 {
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
+}
+
+ResolutionTaskHolder@277 {
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
 }
 
 ResolutionTaskHolder@280 {
     <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-    <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@283 {
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
 }
 
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@290 }
+ResolutionTaskHolder@286 {
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
+}
+
+ResolutionTaskHolder@289 {
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
 }
 
 ResolutionTaskHolder@292 {
     <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-    <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@295 {
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
 }
 
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@302 }
+ResolutionTaskHolder@298 {
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
+}
+
+ResolutionTaskHolder@301 {
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
 }
 
 ResolutionTaskHolder@304 {
     <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
-    <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@307 {
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
 }
 
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@314 }
+ResolutionTaskHolder@310 {
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
+}
+
+ResolutionTaskHolder@313 {
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
 }
 
 ResolutionTaskHolder@316 {
     <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
-    <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@319 {
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
 }
 
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@326 }
+ResolutionTaskHolder@322 {
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
+}
+
+ResolutionTaskHolder@325 {
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
 }
 
 ResolutionTaskHolder@328 {
     <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
-    <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@331 {
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
 }
 
-ResolutionTaskHolder@336 {
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@338 }
+ResolutionTaskHolder@334 {
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
+}
+
+ResolutionTaskHolder@337 {
+    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
 }
 
 ResolutionTaskHolder@340 {
     <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
-    <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@343 {
+    <name not found> = ArrayList@344[3] { ResolutionCandidate@345, ResolutionCandidate@346, ResolutionCandidate@347 }
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
 }
 
 ResolutionTaskHolder@348 {
-    <name not found> = ArrayList@349[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> = ArrayList@349[3] { ResolutionCandidate@350, ResolutionCandidate@351, ResolutionCandidate@352 }
     <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]
+ResolutionTaskHolder@353 {
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
@@ -683,7 +598,95 @@ ResolutionTaskHolder@400 {
     <name not found> = EmptyList@180[empty]
 }
 
-ResolutionTaskHolder@401 {
+ResolutionTaskHolder@354 {
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+}
+
+null {
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@356[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@358[1] { ResolutionCandidate@300 }
+    <name not found> = ArrayList@359[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@360[1] { ResolutionCandidate@282 }
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@362[1] { ResolutionCandidate@339 }
+    <name not found> = ArrayList@363[1] { ResolutionCandidate@279 }
+    <name not found> = ArrayList@364[1] { ResolutionCandidate@324 }
+    <name not found> = ArrayList@365[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@333 }
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@368[1] { ResolutionCandidate@285 }
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@336 }
+    <name not found> = ArrayList@370[1] { ResolutionCandidate@267 }
+    <name not found> = ArrayList@371[1] { ResolutionCandidate@273 }
+    <name not found> = ArrayList@372[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@373[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@306 }
+    <name not found> = ArrayList@375[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@376[1] { ResolutionCandidate@318 }
+    <name not found> = ArrayList@377[1] { ResolutionCandidate@342 }
+    <name not found> = ArrayList@378[1] { ResolutionCandidate@321 }
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@270 }
+    <name not found> = ArrayList@380[1] { ResolutionCandidate@213 }
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@216 }
+    <name not found> = ArrayList@382[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@383[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@384[1] { ResolutionCandidate@330 }
+    <name not found> = ArrayList@385[1] { ResolutionCandidate@315 }
+    <name not found> = ArrayList@386[1] { ResolutionCandidate@291 }
+    <name not found> = ArrayList@387[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@388[1] { ResolutionCandidate@309 }
+    <name not found> = ArrayList@389[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@390[1] { ResolutionCandidate@261 }
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@297 }
+    <name not found> = ArrayList@392[1] { ResolutionCandidate@264 }
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@276 }
+    <name not found> = ArrayList@394[1] { ResolutionCandidate@252 }
+    <name not found> = ArrayList@395[1] { ResolutionCandidate@294 }
+    <name not found> = ArrayList@396[1] { ResolutionCandidate@288 }
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@303 }
+    <name not found> = ArrayList@398[1] { ResolutionCandidate@312 }
+    <name not found> = ArrayList@399[1] { ResolutionCandidate@327 }
+    <name not found> = ArrayList@400[3] { ResolutionCandidate@350, ResolutionCandidate@351, ResolutionCandidate@352 }
+    <name not found> = ArrayList@401[3] { ResolutionCandidate@345, ResolutionCandidate@346, ResolutionCandidate@347 }
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
+    <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]
     <name not found> = EmptyList@180[empty]

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

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

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

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

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

@@ -50,32 +50,27 @@ LazyJavaPackageFragment@12['lang'] {
 
 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]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -83,79 +78,87 @@ ResolutionTaskHolder@54 {
 
 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]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <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@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@40[empty]
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <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@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
 ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@83[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[7] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
 }
 
-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@97 {
+    <name not found> = ArrayList@98[7] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
 }
 
-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, ... }
+null {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@114[7] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <name not found> = ArrayList@115[7] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
+    <name not found> = ArrayList@116[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
+    <name not found> = ArrayList@117[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
 }

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

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

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

@@ -159,12 +159,6 @@ LazyJavaPackageFragment@68['lang'] {
 
 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]
@@ -172,33 +166,42 @@ ResolutionTaskHolder@96 {
     <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]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <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@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <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@111 {
+    <name not found> = ArrayList@112[4] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
 }
 
-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]
+null {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@121[5] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]

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

@@ -127,42 +127,42 @@ LazyJavaClassifierType@102['E'] {
     arguments = ArrayList@103[empty]
     classifier = JavaTypeParameterImpl@104['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@105['E'] {
     arguments = ArrayList@106[empty]
     classifier = JavaTypeParameterImpl@107['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
-LazyJavaClassifierType@109['E'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaTypeParameterImpl@111['E']
+LazyJavaClassifierType@108['E'] {
+    arguments = ArrayList@109[empty]
+    classifier = JavaTypeParameterImpl@110['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
-LazyJavaClassifierType@112['E'] {
-    arguments = ArrayList@113[empty]
-    classifier = JavaTypeParameterImpl@114['E']
+LazyJavaClassifierType@111['E'] {
+    arguments = ArrayList@112[empty]
+    classifier = JavaTypeParameterImpl@113['E']
     nullable = 'false': Boolean@82
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
-LazyJavaClassifierType@115['E'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaTypeParameterImpl@117['E']
+LazyJavaClassifierType@114['E'] {
+    arguments = ArrayList@115[empty]
+    classifier = JavaTypeParameterImpl@116['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
-LazyJavaClassifierType@118['E'] {
-    arguments = ArrayList@119[empty]
-    classifier = JavaTypeParameterImpl@120['E']
+LazyJavaClassifierType@117['E'] {
+    arguments = ArrayList@118[empty]
+    classifier = JavaTypeParameterImpl@119['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
 
 LazyJavaClassifierType@121['E'] {
@@ -176,7 +176,7 @@ LazyJavaClassifierType@124['E'] {
     arguments = ArrayList@125[empty]
     classifier = JavaTypeParameterImpl@126['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
 
 LazyJavaClassifierType@127['E'] {
@@ -190,91 +190,91 @@ LazyJavaClassifierType@130['E'] {
     arguments = ArrayList@131[empty]
     classifier = JavaTypeParameterImpl@132['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@133['E'] {
     arguments = ArrayList@134[empty]
+    classifier = JavaTypeParameterImpl@107['E']
+    nullable = 'true': Boolean@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+}
+
+LazyJavaClassifierType@135['E'] {
+    arguments = ArrayList@136[empty]
+    classifier = JavaTypeParameterImpl@119['E']
+    nullable = 'true': Boolean@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
+}
+
+LazyJavaClassifierType@137['E'] {
+    arguments = ArrayList@138[empty]
+    classifier = JavaTypeParameterImpl@100['E']
+    nullable = 'true': Boolean@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+}
+
+LazyJavaClassifierType@139['E'] {
+    arguments = ArrayList@140[empty]
     classifier = JavaTypeParameterImpl@96['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
-LazyJavaClassifierType@135['E'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@114['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@137['E'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@123['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@139['E'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@120['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
 LazyJavaClassifierType@141['E'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@129['E']
+    classifier = JavaTypeParameterImpl@132['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@143['E'] {
     arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@100['E']
+    classifier = JavaTypeParameterImpl@110['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@145['E'] {
     arguments = ArrayList@146[empty]
-    classifier = JavaTypeParameterImpl@117['E']
+    classifier = JavaTypeParameterImpl@116['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@147['E'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@107['E']
+    classifier = JavaTypeParameterImpl@126['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
 
 LazyJavaClassifierType@149['E'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@104['E']
+    classifier = JavaTypeParameterImpl@113['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@151['E'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@126['E']
+    classifier = JavaTypeParameterImpl@129['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@153['E'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@111['E']
+    classifier = JavaTypeParameterImpl@104['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@155['E'] {
     arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@132['E']
+    classifier = JavaTypeParameterImpl@123['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@52['List<E>'] {
@@ -439,27 +439,27 @@ LazyJavaPackageFragment@219['util'] {
 
 LazyJavaTypeParameterDescriptor@54['E'] {
     defaultType = JetTypeImpl@270['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
     upperBounds = LinkedHashSet@271[1] { NullableType@272 }
     upperBoundsAsType = NullableType@272
 }
 
-LazyJavaTypeParameterDescriptor@49['E'] {
+LazyJavaTypeParameterDescriptor@45['E'] {
     defaultType = JetTypeImpl@273['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
     upperBounds = LinkedHashSet@274[1] { NullableType@275 }
     upperBoundsAsType = NullableType@275
 }
 
-LazyJavaTypeParameterDescriptor@45['E'] {
+LazyJavaTypeParameterDescriptor@49['E'] {
     defaultType = JetTypeImpl@276['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
     upperBounds = LinkedHashSet@277[1] { NullableType@278 }
     upperBoundsAsType = NullableType@278
 }
 
 LazyJavaTypeParameterResolver@279 {
-    resolve(JavaTypeParameterImpl@280['E']) = LazyJavaTypeParameterDescriptor@54['E']
+    resolve(JavaTypeParameterImpl@280['E']) = LazyJavaTypeParameterDescriptor@45['E']
 }
 
 LazyJavaTypeParameterResolver@281 {
@@ -467,241 +467,244 @@ LazyJavaTypeParameterResolver@281 {
 }
 
 LazyJavaTypeParameterResolver@283 {
-    resolve(JavaTypeParameterImpl@284['E']) = LazyJavaTypeParameterDescriptor@45['E']
+    resolve(JavaTypeParameterImpl@284['E']) = LazyJavaTypeParameterDescriptor@54['E']
 }
 
 LazyJavaTypeParameterResolver@285 {
-    resolve(JavaTypeParameterImpl@120['E']) = null
+    resolve(JavaTypeParameterImpl@129['E']) = null
 }
 
 LazyJavaTypeParameterResolver@286 {
-    resolve(JavaTypeParameterImpl@100['E']) = null
+    resolve(JavaTypeParameterImpl@116['E']) = null
 }
 
 LazyJavaTypeParameterResolver@287 {
-    resolve(JavaTypeParameterImpl@123['E']) = null
+    resolve(JavaTypeParameterImpl@119['E']) = null
 }
 
 LazyJavaTypeParameterResolver@288 {
-    resolve(JavaTypeParameterImpl@107['E']) = null
+    resolve(JavaTypeParameterImpl@113['E']) = null
 }
 
 LazyJavaTypeParameterResolver@289 {
-    resolve(JavaTypeParameterImpl@117['E']) = null
+    resolve(JavaTypeParameterImpl@107['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]
 }
 
-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]
+ResolutionTaskHolder@293 {
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@300 }
+ResolutionTaskHolder@296 {
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@299 {
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
 ResolutionTaskHolder@302 {
     <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
-    <name not found> = 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]
 }
 
-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]
+ResolutionTaskHolder@305 {
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
     <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 }
+ResolutionTaskHolder@308 {
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@311 {
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
 ResolutionTaskHolder@314 {
     <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
-    <name not found> = 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@317 {
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
 }
 
-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@320 {
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
+}
+
+ResolutionTaskHolder@323 {
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
 }
 
 ResolutionTaskHolder@326 {
     <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
-    <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@329 {
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
 }
 
-ResolutionTaskHolder@334 {
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@336 }
+ResolutionTaskHolder@332 {
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
+}
+
+ResolutionTaskHolder@335 {
+    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
 }
 
 ResolutionTaskHolder@338 {
     <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
-    <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@341 {
+    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
 }
 
-ResolutionTaskHolder@346 {
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@348 }
+ResolutionTaskHolder@344 {
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
+}
+
+ResolutionTaskHolder@347 {
+    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
 }
 
 ResolutionTaskHolder@350 {
     <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
-    <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@353 {
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
 }
 
-ResolutionTaskHolder@358 {
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@360 }
+ResolutionTaskHolder@356 {
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
+}
+
+ResolutionTaskHolder@359 {
+    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
 }
 
 ResolutionTaskHolder@362 {
     <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
-    <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@365 {
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
 }
 
-ResolutionTaskHolder@370 {
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@372 }
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@372 }
+ResolutionTaskHolder@368 {
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@370 }
+}
+
+ResolutionTaskHolder@371 {
+    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
 }
 
 ResolutionTaskHolder@374 {
     <name not found> = ArrayList@375[1] { ResolutionCandidate@376 }
-    <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@377 {
+    <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
 }
 
-ResolutionTaskHolder@382 {
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@384 }
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@384 }
+ResolutionTaskHolder@380 {
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@382 }
+}
+
+ResolutionTaskHolder@383 {
+    <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
 }
 
 ResolutionTaskHolder@386 {
     <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
-    <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@389 {
+    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
 }
 
-ResolutionTaskHolder@394 {
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@396 }
+ResolutionTaskHolder@392 {
+    <name not found> = ArrayList@393[2] { ResolutionCandidate@394, ResolutionCandidate@395 }
 }
 
-ResolutionTaskHolder@398 {
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@400 }
+ResolutionTaskHolder@396 {
+    <name not found> = ArrayList@397[3] { ResolutionCandidate@398, ResolutionCandidate@399, ResolutionCandidate@400 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }
 
-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 }
+null {
+    <name not found> = ArrayList@401[1] { ResolutionCandidate@307 }
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@340 }
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@328 }
+    <name not found> = ArrayList@404[1] { ResolutionCandidate@391 }
+    <name not found> = ArrayList@405[1] { ResolutionCandidate@382 }
+    <name not found> = ArrayList@406[1] { ResolutionCandidate@358 }
+    <name not found> = ArrayList@407[1] { ResolutionCandidate@337 }
+    <name not found> = ArrayList@408[1] { ResolutionCandidate@316 }
+    <name not found> = ArrayList@409[1] { ResolutionCandidate@325 }
+    <name not found> = ArrayList@410[1] { ResolutionCandidate@367 }
+    <name not found> = ArrayList@411[1] { ResolutionCandidate@304 }
+    <name not found> = ArrayList@412[1] { ResolutionCandidate@292 }
+    <name not found> = ArrayList@413[1] { ResolutionCandidate@331 }
+    <name not found> = ArrayList@414[1] { ResolutionCandidate@319 }
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@361 }
+    <name not found> = ArrayList@416[1] { ResolutionCandidate@295 }
+    <name not found> = ArrayList@417[1] { ResolutionCandidate@313 }
+    <name not found> = ArrayList@418[1] { ResolutionCandidate@298 }
+    <name not found> = ArrayList@419[1] { ResolutionCandidate@364 }
+    <name not found> = ArrayList@420[1] { ResolutionCandidate@373 }
+    <name not found> = ArrayList@421[1] { ResolutionCandidate@370 }
+    <name not found> = ArrayList@422[1] { ResolutionCandidate@334 }
+    <name not found> = ArrayList@423[1] { ResolutionCandidate@310 }
+    <name not found> = ArrayList@424[1] { ResolutionCandidate@343 }
+    <name not found> = ArrayList@425[1] { ResolutionCandidate@385 }
+    <name not found> = ArrayList@426[1] { ResolutionCandidate@322 }
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@301 }
+    <name not found> = ArrayList@428[1] { ResolutionCandidate@349 }
+    <name not found> = ArrayList@429[1] { ResolutionCandidate@352 }
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@388 }
+    <name not found> = ArrayList@431[1] { ResolutionCandidate@376 }
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@355 }
+    <name not found> = ArrayList@433[1] { ResolutionCandidate@346 }
+    <name not found> = ArrayList@434[1] { ResolutionCandidate@379 }
+    <name not found> = ArrayList@435[2] { ResolutionCandidate@394, ResolutionCandidate@395 }
+    <name not found> = ArrayList@436[3] { ResolutionCandidate@398, ResolutionCandidate@399, ResolutionCandidate@400 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]

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

@@ -117,14 +117,14 @@ LazyJavaClassifierType@81['E'] {
     arguments = ArrayList@82[empty]
     classifier = JavaTypeParameterImpl@83['E']
     nullable = 'false': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
-LazyJavaClassifierType@84['E'] {
-    arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@86['E']
+LazyJavaClassifierType@85['E'] {
+    arguments = ArrayList@86[empty]
+    classifier = JavaTypeParameterImpl@87['E']
     nullable = 'false': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaClassifierType@88['E'] {
@@ -143,14 +143,14 @@ LazyJavaClassifierType@92['E'] {
 
 LazyJavaClassifierType@95['E'] {
     arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@86['E']
+    classifier = JavaTypeParameterImpl@94['E']
     nullable = 'true': Boolean@97
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
 }
 
 LazyJavaClassifierType@98['E'] {
     arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@83['E']
+    classifier = JavaTypeParameterImpl@87['E']
     nullable = 'true': Boolean@97
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
@@ -164,9 +164,9 @@ LazyJavaClassifierType@100['E'] {
 
 LazyJavaClassifierType@102['E'] {
     arguments = ArrayList@103[empty]
-    classifier = JavaTypeParameterImpl@94['E']
+    classifier = JavaTypeParameterImpl@83['E']
     nullable = 'true': Boolean@97
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@104['E'] {
@@ -333,12 +333,12 @@ LazyJavaTypeParameterDescriptor@47['E'] {
     upperBounds = LinkedHashSet@215[1] { NullableType@216 }
 }
 
-LazyJavaTypeParameterDescriptor@42['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
+LazyJavaTypeParameterDescriptor@38['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
-LazyJavaTypeParameterDescriptor@38['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+LazyJavaTypeParameterDescriptor@42['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaTypeParameterResolver@217 {
@@ -355,71 +355,74 @@ LazyJavaTypeParameterResolver@221 {
 
 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]
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
     <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]
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
 }
 
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
+}
+
 ResolutionTaskHolder@235 {
     <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <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@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
 }
 
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
+}
+
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
 }
 
 ResolutionTaskHolder@247 {
     <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <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@250 {
+    <name not found> = ArrayList@251[4] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
 }
 
 ResolutionTaskHolder@255 {
-    <name not found> = 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]
     <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 {
+null {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@265[4] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]

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

@@ -42,26 +42,29 @@ LazyJavaPackageFragment@15['lang'] {
 
 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]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <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@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }

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

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

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

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

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@13['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@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -151,35 +151,38 @@ LazyJavaPackageFragment@66['lang'] {
 
 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@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[2] { ResolutionCandidate@103, ResolutionCandidate@104 }
 }
 
-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]
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+}
+
+null {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@113[2] { ResolutionCandidate@103, ResolutionCandidate@104 }
+    <name not found> = ArrayList@114[5] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]

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

@@ -147,7 +147,7 @@ LazyJavaClassifierType@99['Runnable'] {
 
 LazyJavaClassifierType@102['Runnable'] {
     arguments = ArrayList@103[empty]
-    classifier = JavaClassImpl@101['Runnable']
+    classifier = JavaClassImpl@95['Runnable']
     nullable = 'true': Boolean@104
     typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
@@ -161,14 +161,14 @@ LazyJavaClassifierType@105['Runnable'] {
 
 LazyJavaClassifierType@107['Runnable'] {
     arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@95['Runnable']
+    classifier = JavaClassImpl@88['Runnable']
     nullable = 'true': Boolean@104
     typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
 
 LazyJavaClassifierType@109['Runnable'] {
     arguments = ArrayList@110[empty]
-    classifier = JavaClassImpl@88['Runnable']
+    classifier = JavaClassImpl@101['Runnable']
     nullable = 'true': Boolean@104
     typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
@@ -217,35 +217,35 @@ LazyJavaClassifierType@126['String'] {
 
 LazyJavaClassifierType@129['String'] {
     arguments = ArrayList@130[empty]
-    classifier = JavaClassImpl@122['String']
+    classifier = JavaClassImpl@128['String']
     nullable = 'true': Boolean@104
     typeConstructor = DeserializedClassTypeConstructor@116
 }
 
 LazyJavaClassifierType@131['String'] {
     arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@128['String']
+    classifier = JavaClassImpl@115['String']
     nullable = 'true': Boolean@104
     typeConstructor = DeserializedClassTypeConstructor@116
 }
 
 LazyJavaClassifierType@133['String'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaClassImpl@115['String']
+    classifier = JavaClassImpl@125['String']
     nullable = 'true': Boolean@104
     typeConstructor = DeserializedClassTypeConstructor@116
 }
 
 LazyJavaClassifierType@135['String'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaClassImpl@119['String']
+    classifier = JavaClassImpl@122['String']
     nullable = 'true': Boolean@104
     typeConstructor = DeserializedClassTypeConstructor@116
 }
 
 LazyJavaClassifierType@137['String'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaClassImpl@125['String']
+    classifier = JavaClassImpl@119['String']
     nullable = 'true': Boolean@104
     typeConstructor = DeserializedClassTypeConstructor@116
 }
@@ -368,113 +368,116 @@ LazyJavaPackageFragment@168['lang'] {
 }
 
 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> = ArrayList@218[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
 }
 
-ResolutionTaskHolder@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]
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
     <name not found> = EmptyList@3[empty]
+}
+
+ResolutionTaskHolder@225 {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
     <name not found> = EmptyList@3[empty]
 }
 
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
+}
+
 ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[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> = ArrayList@232[2] { ResolutionCandidate@233, ResolutionCandidate@234 }
     <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]
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[2] { ResolutionCandidate@237, ResolutionCandidate@238 }
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
 }
 
-ResolutionTaskHolder@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 }
+ResolutionTaskHolder@239 {
+    <name not found> = ArrayList@240[2] { ResolutionCandidate@241, ResolutionCandidate@242 }
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
+}
+
+ResolutionTaskHolder@243 {
+    <name not found> = ArrayList@244[2] { ResolutionCandidate@245, ResolutionCandidate@246 }
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+}
+
+ResolutionTaskHolder@247 {
+    <name not found> = ArrayList@248[8] { ResolutionCandidate@249, ResolutionCandidate@250, ResolutionCandidate@251, ... }
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
 }
 
 ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@253[8] { ResolutionCandidate@254, ResolutionCandidate@255, ResolutionCandidate@256, ... }
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
 }
 
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
+ResolutionTaskHolder@257 {
+    <name not found> = ArrayList@258[8] { ResolutionCandidate@259, ResolutionCandidate@260, ResolutionCandidate@261, ... }
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
 }
 
-ResolutionTaskHolder@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]
+ResolutionTaskHolder@262 {
+    <name not found> = ArrayList@263[8] { ResolutionCandidate@264, ResolutionCandidate@265, ResolutionCandidate@266, ... }
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
 }
 
-ResolutionTaskHolder@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@267 {
+    <name not found> = ArrayList@268[8] { ResolutionCandidate@269, ResolutionCandidate@270, ResolutionCandidate@271, ... }
 }
 
-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@272 {
+    <name not found> = ArrayList@273[8] { ResolutionCandidate@274, ResolutionCandidate@275, ResolutionCandidate@276, ... }
 }
 
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[2] { ResolutionCandidate@281, ResolutionCandidate@282 }
-    <name not found> = ArrayList@283[2] { ResolutionCandidate@281, ResolutionCandidate@282 }
+null {
+    <name not found> = ArrayList@277[13] { ResolutionCandidate@254, ResolutionCandidate@255, ResolutionCandidate@278, ... }
+    <name not found> = ArrayList@279[13] { ResolutionCandidate@259, ResolutionCandidate@260, ResolutionCandidate@280, ... }
+    <name not found> = ArrayList@281[13] { ResolutionCandidate@264, ResolutionCandidate@265, ResolutionCandidate@282, ... }
+    <name not found> = ArrayList@283[13] { ResolutionCandidate@249, ResolutionCandidate@250, ResolutionCandidate@284, ... }
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@224 }
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@227 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@290[2] { ResolutionCandidate@245, ResolutionCandidate@246 }
+    <name not found> = ArrayList@291[2] { ResolutionCandidate@241, ResolutionCandidate@242 }
+    <name not found> = ArrayList@292[2] { ResolutionCandidate@237, ResolutionCandidate@238 }
+    <name not found> = ArrayList@293[2] { ResolutionCandidate@233, ResolutionCandidate@234 }
+    <name not found> = ArrayList@294[8] { ResolutionCandidate@274, ResolutionCandidate@275, ResolutionCandidate@276, ... }
+    <name not found> = ArrayList@295[8] { ResolutionCandidate@269, ResolutionCandidate@270, ResolutionCandidate@271, ... }
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
     <name not found> = EmptyList@3[empty]
 }
-
-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,14 +33,14 @@ 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
 }
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[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
 }
@@ -164,34 +164,41 @@ LazyJavaPackageFragment@68['lang'] {
 
 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]
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+}
+
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[4] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
 }
 
-ResolutionTaskHolder@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]
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[4] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
 }
 
-ResolutionTaskHolder@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, ... }
+ResolutionTaskHolder@121 {
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
@@ -210,28 +217,7 @@ ResolutionTaskHolder@114 {
     <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]
+ResolutionTaskHolder@122 {
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
@@ -242,7 +228,24 @@ ResolutionTaskHolder@126 {
     <name not found> = EmptyList@92[empty]
 }
 
-ResolutionTaskHolder@127 {
+null {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@126[5] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
+    <name not found> = ArrayList@127[5] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]
     <name not found> = EmptyList@92[empty]

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

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

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

@@ -65,44 +65,30 @@ LazyJavaPackageFragment@25['lang'] {
 
 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]
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
     <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]
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
     <name not found> = EmptyList@48[empty]
 }
 
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+}
+
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <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]
+ResolutionTaskHolder@72 {
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
@@ -121,7 +107,24 @@ ResolutionTaskHolder@77 {
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@78 {
+ResolutionTaskHolder@73 {
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+}
+
+null {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@62 }
+    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]

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

@@ -57,54 +57,38 @@ LazyJavaPackageFragment@21['lang'] {
 
 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]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <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]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@40[empty]
 }
 
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <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@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-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]
+ResolutionTaskHolder@70 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -123,7 +107,26 @@ ResolutionTaskHolder@77 {
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@78 {
+ResolutionTaskHolder@71 {
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+}
+
+null {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@66 }
+    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]

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

@@ -59,8 +59,6 @@ LazyJavaPackageFragment@21['lang'] {
 
 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]
@@ -70,83 +68,54 @@ ResolutionTaskHolder@50 {
     <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]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <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@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <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@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
-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]
+ResolutionTaskHolder@83 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -197,7 +166,7 @@ ResolutionTaskHolder@94 {
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@95 {
+ResolutionTaskHolder@84 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -222,6 +191,40 @@ ResolutionTaskHolder@95 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
+}
+
+null {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@79 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]

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

@@ -59,76 +59,45 @@ LazyJavaPackageFragment@21['lang'] {
 
 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> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@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]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = 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@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
 ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <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]
@@ -179,7 +148,7 @@ ResolutionTaskHolder@81 {
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@82 {
+ResolutionTaskHolder@74 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -204,6 +173,40 @@ ResolutionTaskHolder@82 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
+}
+
+null {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@69 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]

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

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

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

@@ -56,96 +56,99 @@ LazyJavaPackageFragment@21['lang'] {
 
 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]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <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 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
 ResolutionTaskHolder@62 {
     <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <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@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
 }
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <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@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
-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]
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[2] { ResolutionCandidate@85, ResolutionCandidate@86 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@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]
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[2] { ResolutionCandidate@89, ResolutionCandidate@90 }
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[2] { ResolutionCandidate@93, ResolutionCandidate@94 }
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+}
+
+null {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@106[2] { ResolutionCandidate@89, ResolutionCandidate@90 }
+    <name not found> = ArrayList@107[2] { ResolutionCandidate@93, ResolutionCandidate@94 }
+    <name not found> = ArrayList@108[2] { ResolutionCandidate@85, ResolutionCandidate@86 }
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]
     <name not found> = EmptyList@43[empty]

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

@@ -46,15 +46,6 @@ LazyJavaPackageFragment@17['lang'] {
 
 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]
@@ -65,23 +56,22 @@ ResolutionTaskHolder@41 {
     <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]
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -89,119 +79,238 @@ ResolutionTaskHolder@49 {
 
 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]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
     <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@35[empty]
 }
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = 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]
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
     <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
     <name not found> = EmptyList@35[empty]
 }
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = 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@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
-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@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
 }
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@99 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@100 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
 
 ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@102 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@103 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@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]
+ResolutionTaskHolder@104 {
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -228,29 +337,7 @@ ResolutionTaskHolder@117 {
     <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]
+ResolutionTaskHolder@105 {
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -261,7 +348,68 @@ ResolutionTaskHolder@118 {
     <name not found> = EmptyList@35[empty]
 }
 
-ResolutionTaskHolder@119 {
+null {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@85 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
     <name not found> = EmptyList@35[empty]
@@ -293,148 +441,3 @@ ResolutionTaskHolder@119 {
     <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

@@ -42,92 +42,67 @@ LazyJavaPackageFragment@15['lang'] {
 
 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]
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
     <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]
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
     <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = 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]
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <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]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@29[empty]
 }
 
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+}
+
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <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@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
 }
 
 ResolutionTaskHolder@71 {
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <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]
+ResolutionTaskHolder@74 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -138,9 +113,7 @@ ResolutionTaskHolder@87 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@88 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@75 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -151,9 +124,7 @@ ResolutionTaskHolder@88 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@76 {
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -164,7 +135,39 @@ ResolutionTaskHolder@89 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@90 {
+ResolutionTaskHolder@77 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+null {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@61 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]

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

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

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

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

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

@@ -44,10 +44,6 @@ LazyJavaPackageFragment@17['lang'] {
 
 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]
@@ -65,25 +61,32 @@ ResolutionTaskHolder@39 {
     <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]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <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]
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@33[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@33[empty]
+}
+
+null {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
     <name not found> = EmptyList@33[empty]
 }

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

@@ -162,28 +162,28 @@ LazyJavaClassifierType@131['E'] {
     arguments = ArrayList@132[empty]
     classifier = JavaTypeParameterImpl@133['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@134['E'] {
     arguments = ArrayList@135[empty]
     classifier = JavaTypeParameterImpl@136['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@137['E'] {
     arguments = ArrayList@138[empty]
     classifier = JavaTypeParameterImpl@139['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
 }
 
-LazyJavaClassifierType@140['E'] {
-    arguments = ArrayList@141[empty]
-    classifier = JavaTypeParameterImpl@142['E']
+LazyJavaClassifierType@141['E'] {
+    arguments = ArrayList@142[empty]
+    classifier = JavaTypeParameterImpl@143['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@144['E'] {
@@ -197,14 +197,14 @@ LazyJavaClassifierType@147['E'] {
     arguments = ArrayList@148[empty]
     classifier = JavaTypeParameterImpl@149['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@150['E'] {
     arguments = ArrayList@151[empty]
     classifier = JavaTypeParameterImpl@152['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@153['E'] {
@@ -225,91 +225,91 @@ LazyJavaClassifierType@159['E'] {
     arguments = ArrayList@160[empty]
     classifier = JavaTypeParameterImpl@161['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
 }
 
 LazyJavaClassifierType@162['E'] {
     arguments = ArrayList@163[empty]
-    classifier = JavaTypeParameterImpl@142['E']
+    classifier = JavaTypeParameterImpl@161['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
 }
 
 LazyJavaClassifierType@164['E'] {
     arguments = ArrayList@165[empty]
-    classifier = JavaTypeParameterImpl@152['E']
+    classifier = JavaTypeParameterImpl@158['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@166['E'] {
     arguments = ArrayList@167[empty]
-    classifier = JavaTypeParameterImpl@139['E']
+    classifier = JavaTypeParameterImpl@129['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@168['E'] {
     arguments = ArrayList@169[empty]
-    classifier = JavaTypeParameterImpl@158['E']
+    classifier = JavaTypeParameterImpl@136['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@170['E'] {
     arguments = ArrayList@171[empty]
-    classifier = JavaTypeParameterImpl@129['E']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-}
-
-LazyJavaClassifierType@172['E'] {
-    arguments = ArrayList@173[empty]
-    classifier = JavaTypeParameterImpl@146['E']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-}
-
-LazyJavaClassifierType@174['E'] {
-    arguments = ArrayList@175[empty]
-    classifier = JavaTypeParameterImpl@133['E']
+    classifier = JavaTypeParameterImpl@152['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
+LazyJavaClassifierType@172['E'] {
+    arguments = ArrayList@173[empty]
+    classifier = JavaTypeParameterImpl@125['E']
+    nullable = 'true': Boolean@117
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+}
+
+LazyJavaClassifierType@174['E'] {
+    arguments = ArrayList@175[empty]
+    classifier = JavaTypeParameterImpl@139['E']
+    nullable = 'true': Boolean@117
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
+}
+
 LazyJavaClassifierType@176['E'] {
     arguments = ArrayList@177[empty]
-    classifier = JavaTypeParameterImpl@155['E']
+    classifier = JavaTypeParameterImpl@133['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@178['E'] {
     arguments = ArrayList@179[empty]
-    classifier = JavaTypeParameterImpl@161['E']
+    classifier = JavaTypeParameterImpl@143['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@180['E'] {
     arguments = ArrayList@181[empty]
-    classifier = JavaTypeParameterImpl@136['E']
+    classifier = JavaTypeParameterImpl@146['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@182['E'] {
     arguments = ArrayList@183[empty]
-    classifier = JavaTypeParameterImpl@125['E']
+    classifier = JavaTypeParameterImpl@149['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@184['E'] {
     arguments = ArrayList@185[empty]
-    classifier = JavaTypeParameterImpl@149['E']
+    classifier = JavaTypeParameterImpl@155['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@186['K'] {
@@ -323,33 +323,33 @@ LazyJavaClassifierType@190['K'] {
     arguments = ArrayList@191[empty]
     classifier = JavaTypeParameterImpl@192['K']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
 }
 
-LazyJavaClassifierType@194['K'] {
-    arguments = ArrayList@195[empty]
-    classifier = JavaTypeParameterImpl@196['K']
+LazyJavaClassifierType@193['K'] {
+    arguments = ArrayList@194[empty]
+    classifier = JavaTypeParameterImpl@195['K']
     nullable = 'false': Boolean@111
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
 }
 
-LazyJavaClassifierType@197['K'] {
-    arguments = ArrayList@198[empty]
-    classifier = JavaTypeParameterImpl@199['K']
+LazyJavaClassifierType@196['K'] {
+    arguments = ArrayList@197[empty]
+    classifier = JavaTypeParameterImpl@198['K']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@199
 }
 
 LazyJavaClassifierType@200['K'] {
     arguments = ArrayList@201[empty]
-    classifier = JavaTypeParameterImpl@199['K']
+    classifier = JavaTypeParameterImpl@188['K']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
 }
 
 LazyJavaClassifierType@202['K'] {
     arguments = ArrayList@203[empty]
-    classifier = JavaTypeParameterImpl@196['K']
+    classifier = JavaTypeParameterImpl@195['K']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
 }
@@ -358,24 +358,24 @@ LazyJavaClassifierType@204['K'] {
     arguments = ArrayList@205[empty]
     classifier = JavaTypeParameterImpl@192['K']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
 }
 
 LazyJavaClassifierType@206['K'] {
     arguments = ArrayList@207[empty]
-    classifier = JavaTypeParameterImpl@188['K']
+    classifier = JavaTypeParameterImpl@198['K']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@199
 }
 
-LazyJavaClassifierType@64['List<E>'] {
+LazyJavaClassifierType@74['List<E>'] {
     arguments = ArrayList@208[1] { TypeProjectionImpl@209 }
     classifier = JavaClassImpl@210['List']
     memberScope = SubstitutingScope@211
     typeConstructor = DeserializedClassTypeConstructor@212
 }
 
-LazyJavaClassifierType@74['List<E>'] {
+LazyJavaClassifierType@64['List<E>'] {
     arguments = ArrayList@213[1] { TypeProjectionImpl@214 }
     classifier = JavaClassImpl@215['List']
     memberScope = SubstitutingScope@216
@@ -478,16 +478,16 @@ LazyJavaClassifierType@261['V'] {
 
 LazyJavaClassifierType@265['V'] {
     arguments = ArrayList@266[empty]
-    classifier = JavaTypeParameterImpl@253['V']
+    classifier = JavaTypeParameterImpl@263['V']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@264
 }
 
 LazyJavaClassifierType@267['V'] {
     arguments = ArrayList@268[empty]
-    classifier = JavaTypeParameterImpl@263['V']
+    classifier = JavaTypeParameterImpl@260['V']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@264
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
 }
 
 LazyJavaClassifierType@269['V'] {
@@ -499,7 +499,7 @@ LazyJavaClassifierType@269['V'] {
 
 LazyJavaClassifierType@271['V'] {
     arguments = ArrayList@272[empty]
-    classifier = JavaTypeParameterImpl@260['V']
+    classifier = JavaTypeParameterImpl@253['V']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
 }
@@ -568,16 +568,16 @@ LazyJavaPackageFragment@294['util'] {
     memberIndex = computeMemberIndex$1@323 // through LazyPackageFragmentScopeForJavaPackage@319
 }
 
-LazyJavaTypeParameterDescriptor@57['E'] {
+LazyJavaTypeParameterDescriptor@61['E'] {
     defaultType = JetTypeImpl@324['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
     upperBounds = LinkedHashSet@325[1] { NullableType@326 }
     upperBoundsAsType = NullableType@326
 }
 
-LazyJavaTypeParameterDescriptor@61['E'] {
+LazyJavaTypeParameterDescriptor@57['E'] {
     defaultType = JetTypeImpl@327['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
     upperBounds = LinkedHashSet@328[1] { NullableType@329 }
     upperBoundsAsType = NullableType@329
 }
@@ -596,7 +596,7 @@ LazyJavaTypeParameterDescriptor@77['K'] {
 }
 
 LazyJavaTypeParameterDescriptor@66['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@199
 }
 
 LazyJavaTypeParameterDescriptor@78['V'] {
@@ -610,11 +610,11 @@ LazyJavaTypeParameterDescriptor@67['V'] {
 }
 
 LazyJavaTypeParameterResolver@339 {
-    resolve(JavaTypeParameterImpl@340['E']) = LazyJavaTypeParameterDescriptor@61['E']
+    resolve(JavaTypeParameterImpl@340['E']) = LazyJavaTypeParameterDescriptor@57['E']
 }
 
 LazyJavaTypeParameterResolver@341 {
-    resolve(JavaTypeParameterImpl@342['E']) = LazyJavaTypeParameterDescriptor@57['E']
+    resolve(JavaTypeParameterImpl@342['E']) = LazyJavaTypeParameterDescriptor@61['E']
 }
 
 LazyJavaTypeParameterResolver@343 {
@@ -622,46 +622,37 @@ LazyJavaTypeParameterResolver@343 {
 }
 
 LazyJavaTypeParameterResolver@345 {
-    resolve(JavaTypeParameterImpl@149['E']) = null
-}
-
-LazyJavaTypeParameterResolver@346 {
-    resolve(JavaTypeParameterImpl@129['E']) = null
-}
-
-LazyJavaTypeParameterResolver@347 {
-    resolve(JavaTypeParameterImpl@125['E']) = null
-}
-
-LazyJavaTypeParameterResolver@348 {
     resolve(JavaTypeParameterImpl@152['E']) = null
 }
 
-LazyJavaTypeParameterResolver@349 {
+LazyJavaTypeParameterResolver@346 {
     resolve(JavaTypeParameterImpl@161['E']) = null
 }
 
-LazyJavaTypeParameterResolver@350 {
-    resolve(JavaTypeParameterImpl@351['K']) = LazyJavaTypeParameterDescriptor@77['K']
-    resolve(JavaTypeParameterImpl@352['V']) = LazyJavaTypeParameterDescriptor@78['V']
+LazyJavaTypeParameterResolver@347 {
+    resolve(JavaTypeParameterImpl@155['E']) = null
 }
 
-LazyJavaTypeParameterResolver@353 {
-    resolve(JavaTypeParameterImpl@192['K']) = LazyJavaTypeParameterDescriptor@66['K']
+LazyJavaTypeParameterResolver@348 {
+    resolve(JavaTypeParameterImpl@149['E']) = null
+}
+
+LazyJavaTypeParameterResolver@349 {
+    resolve(JavaTypeParameterImpl@158['E']) = null
+}
+
+LazyJavaTypeParameterResolver@350 {
+    resolve(JavaTypeParameterImpl@198['K']) = LazyJavaTypeParameterDescriptor@66['K']
     resolve(JavaTypeParameterImpl@263['V']) = LazyJavaTypeParameterDescriptor@67['V']
 }
 
+LazyJavaTypeParameterResolver@351 {
+    resolve(JavaTypeParameterImpl@352['K']) = LazyJavaTypeParameterDescriptor@77['K']
+    resolve(JavaTypeParameterImpl@353['V']) = LazyJavaTypeParameterDescriptor@78['V']
+}
+
 ResolutionTaskHolder@354 {
     <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
-    <name not found> = 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]
@@ -672,39 +663,37 @@ ResolutionTaskHolder@354 {
     <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]
+ResolutionTaskHolder@357 {
+    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
     <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@360 {
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
+}
+
+ResolutionTaskHolder@363 {
+    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
 }
 
 ResolutionTaskHolder@366 {
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@368 }
+    <name not found> = ArrayList@367[2] { ResolutionCandidate@368, ResolutionCandidate@369 }
 }
 
 ResolutionTaskHolder@370 {
-    <name not found> = ArrayList@371[2] { ResolutionCandidate@372, ResolutionCandidate@373 }
-    <name not found> = ArrayList@374[2] { ResolutionCandidate@372, ResolutionCandidate@373 }
+    <name not found> = ArrayList@371[3] { ResolutionCandidate@372, ResolutionCandidate@373, ResolutionCandidate@374 }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
 }
 
 ResolutionTaskHolder@375 {
-    <name not found> = ArrayList@376[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> = ArrayList@376[4] { ResolutionCandidate@377, ResolutionCandidate@378, ResolutionCandidate@379, ... }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
@@ -715,9 +704,23 @@ ResolutionTaskHolder@375 {
     <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, ... }
+null {
+    <name not found> = ArrayList@380[1] { ResolutionCandidate@359 }
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@365 }
+    <name not found> = ArrayList@382[1] { ResolutionCandidate@362 }
+    <name not found> = ArrayList@383[1] { ResolutionCandidate@356 }
+    <name not found> = ArrayList@384[2] { ResolutionCandidate@368, ResolutionCandidate@369 }
+    <name not found> = ArrayList@385[3] { ResolutionCandidate@372, ResolutionCandidate@373, ResolutionCandidate@374 }
+    <name not found> = ArrayList@386[4] { ResolutionCandidate@377, ResolutionCandidate@378, ResolutionCandidate@379, ... }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]

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

@@ -129,7 +129,7 @@ LazyJavaClassifierType@76['Object'] {
 
 LazyJavaClassifierType@79['Object'] {
     arguments = ArrayList@80[empty]
-    classifier = JavaClassImpl@78['Object']
+    classifier = JavaClassImpl@72['Object']
     memberScope = DeserializedClassMemberScope@73
     nullable = 'true': Boolean@81
     typeConstructor = DeserializedClassTypeConstructor@75
@@ -137,7 +137,7 @@ LazyJavaClassifierType@79['Object'] {
 
 LazyJavaClassifierType@82['Object'] {
     arguments = ArrayList@83[empty]
-    classifier = JavaClassImpl@72['Object']
+    classifier = JavaClassImpl@78['Object']
     memberScope = DeserializedClassMemberScope@73
     nullable = 'true': Boolean@81
     typeConstructor = DeserializedClassTypeConstructor@75
@@ -189,13 +189,13 @@ LazyJavaClassifierType@100['T'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
-LazyJavaClassifierType@53['Throwable'] {
+LazyJavaClassifierType@50['Throwable'] {
     arguments = ArrayList@102[empty]
     classifier = JavaClassImpl@103['Throwable']
     typeConstructor = DeserializedClassTypeConstructor@104
 }
 
-LazyJavaClassifierType@50['Throwable'] {
+LazyJavaClassifierType@53['Throwable'] {
     arguments = ArrayList@105[empty]
     classifier = JavaClassImpl@106['Throwable']
     typeConstructor = DeserializedClassTypeConstructor@104
@@ -296,9 +296,26 @@ LazyJavaTypeParameterResolver@176 {
 
 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> = ArrayList@180[1] { ResolutionCandidate@181 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+}
+
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
@@ -307,27 +324,8 @@ ResolutionTaskHolder@177 {
     <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]
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
     <name not found> = EmptyList@2[empty]
@@ -350,114 +348,119 @@ ResolutionTaskHolder@184 {
 
 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]
+ResolutionTaskHolder@191 {
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
     <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@194 {
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
+}
+
+ResolutionTaskHolder@197 {
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
 }
 
 ResolutionTaskHolder@200 {
     <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <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@203 {
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+ResolutionTaskHolder@206 {
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
+}
+
+ResolutionTaskHolder@209 {
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
 }
 
 ResolutionTaskHolder@212 {
     <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <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@215 {
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
 }
 
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
+ResolutionTaskHolder@218 {
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
+}
+
+ResolutionTaskHolder@221 {
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
 }
 
 ResolutionTaskHolder@224 {
     <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <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 }
+null {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@220 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@223 }
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@211 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@196 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@208 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@217 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@205 }
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@193 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
 }

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

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

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

@@ -47,14 +47,6 @@ LazyJavaPackageFragment@15['lang'] {
 
 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]
@@ -88,16 +80,8 @@ ResolutionTaskHolder@40 {
     <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]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -131,12 +115,15 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -144,68 +131,84 @@ ResolutionTaskHolder@48 {
 
 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]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@31[empty]
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <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@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <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 }
+null {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }

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

@@ -28,19 +28,22 @@ LazyJavaPackageFragment@9['lang'] {
 
 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@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+}
+
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@29 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
 }

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

@@ -68,7 +68,7 @@ LazyJavaClassifierType@42['Collection<? extends T>'] {
 
 LazyJavaClassifierType@47['Collection<? extends T>'] {
     arguments = ArrayList@48[1] { TypeProjectionImpl@49 }
-    classifier = JavaClassImpl@38['Collection']
+    classifier = JavaClassImpl@45['Collection']
     memberScope = SubstitutingScope@50
     nullable = 'true': Boolean@51
     typeConstructor = DeserializedClassTypeConstructor@52
@@ -76,7 +76,7 @@ LazyJavaClassifierType@47['Collection<? extends T>'] {
 
 LazyJavaClassifierType@53['Collection<? extends T>'] {
     arguments = ArrayList@54[1] { TypeProjectionImpl@55 }
-    classifier = JavaClassImpl@45['Collection']
+    classifier = JavaClassImpl@38['Collection']
     memberScope = SubstitutingScope@56
     nullable = 'true': Boolean@51
     typeConstructor = DeserializedClassTypeConstructor@52
@@ -165,56 +165,56 @@ LazyJavaClassifierType@98['T'] {
     arguments = ArrayList@99[empty]
     classifier = JavaTypeParameterImpl@100['T']
     nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+}
+
+LazyJavaClassifierType@102['T'] {
+    arguments = ArrayList@103[empty]
+    classifier = JavaTypeParameterImpl@104['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+}
+
+LazyJavaClassifierType@105['T'] {
+    arguments = ArrayList@106[empty]
+    classifier = JavaTypeParameterImpl@107['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+}
+
+LazyJavaClassifierType@108['T'] {
+    arguments = ArrayList@109[empty]
+    classifier = JavaTypeParameterImpl@110['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+}
+
+LazyJavaClassifierType@111['T'] {
+    arguments = ArrayList@112[empty]
+    classifier = JavaTypeParameterImpl@113['T']
+    nullable = 'false': Boolean@40
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@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@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@107['T'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaTypeParameterImpl@109['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@110['T'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaTypeParameterImpl@112['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
-}
-
 LazyJavaClassifierType@114['T'] {
     arguments = ArrayList@115[empty]
     classifier = JavaTypeParameterImpl@116['T']
     nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@117['T'] {
     arguments = ArrayList@118[empty]
     classifier = JavaTypeParameterImpl@119['T']
     nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@120['T'] {
     arguments = ArrayList@121[empty]
     classifier = JavaTypeParameterImpl@122['T']
     nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@123['T'] {
@@ -226,72 +226,72 @@ LazyJavaClassifierType@123['T'] {
 
 LazyJavaClassifierType@126['T'] {
     arguments = ArrayList@127[empty]
-    classifier = JavaTypeParameterImpl@116['T']
+    classifier = JavaTypeParameterImpl@110['T']
     nullable = 'true': Boolean@51
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@128['T'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@93['T']
+    classifier = JavaTypeParameterImpl@119['T']
     nullable = 'true': Boolean@51
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@130['T'] {
     arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@125['T']
+    classifier = JavaTypeParameterImpl@113['T']
     nullable = 'true': Boolean@51
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@132['T'] {
     arguments = ArrayList@133[empty]
-    classifier = JavaTypeParameterImpl@119['T']
+    classifier = JavaTypeParameterImpl@116['T']
     nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@134['T'] {
     arguments = ArrayList@135[empty]
-    classifier = JavaTypeParameterImpl@100['T']
+    classifier = JavaTypeParameterImpl@89['T']
     nullable = 'true': Boolean@51
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@136['T'] {
     arguments = ArrayList@137[empty]
-    classifier = JavaTypeParameterImpl@109['T']
-    nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@138['T'] {
-    arguments = ArrayList@139[empty]
-    classifier = JavaTypeParameterImpl@89['T']
+    classifier = JavaTypeParameterImpl@125['T']
     nullable = 'true': Boolean@51
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
+LazyJavaClassifierType@138['T'] {
+    arguments = ArrayList@139[empty]
+    classifier = JavaTypeParameterImpl@100['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+}
+
 LazyJavaClassifierType@140['T'] {
     arguments = ArrayList@141[empty]
-    classifier = JavaTypeParameterImpl@106['T']
+    classifier = JavaTypeParameterImpl@122['T']
     nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@142['T'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaTypeParameterImpl@112['T']
+    classifier = JavaTypeParameterImpl@107['T']
     nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@144['T'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@103['T']
+    classifier = JavaTypeParameterImpl@104['T']
     nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@146['T'] {
@@ -303,7 +303,7 @@ LazyJavaClassifierType@146['T'] {
 
 LazyJavaClassifierType@148['T'] {
     arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@122['T']
+    classifier = JavaTypeParameterImpl@93['T']
     nullable = 'true': Boolean@51
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
@@ -398,19 +398,19 @@ LazyJavaPackageFragment@172['util'] {
 }
 
 LazyJavaTypeParameterDescriptor@33['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
     upperBounds = LinkedHashSet@217[1] { NullableType@218 }
     upperBoundsAsType = NullableType@218
 }
 
 LazyJavaTypeParameterDescriptor@219['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
     upperBounds = LinkedHashSet@220[1] { NullableType@221 }
     upperBoundsAsType = NullableType@221
 }
 
 LazyJavaTypeParameterDescriptor@222['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
     upperBounds = LinkedHashSet@223[2] { DelegatingFlexibleType@224, DelegatingFlexibleType@225 }
     upperBoundsAsType = NotNullType@226
 }
@@ -428,87 +428,90 @@ LazyJavaTypeParameterResolver@231 {
 }
 
 LazyJavaTypeParameterResolver@233 {
-    resolve(JavaTypeParameterImpl@112['T']) = null
+    resolve(JavaTypeParameterImpl@96['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]
+ResolutionTaskHolder@237 {
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
     <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@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
+}
+
+ResolutionTaskHolder@243 {
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
 }
 
 ResolutionTaskHolder@246 {
     <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-    <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@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
 }
 
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@256 }
+ResolutionTaskHolder@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
+}
+
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
 }
 
 ResolutionTaskHolder@258 {
     <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-    <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@261 {
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
 }
 
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@268 }
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
+}
+
+ResolutionTaskHolder@267 {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
 }
 
 ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@272 }
+    <name not found> = ArrayList@271[2] { ResolutionCandidate@272, ResolutionCandidate@273 }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
 }
 
 ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@276 }
+    <name not found> = ArrayList@275[8] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
 }
 
-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 }
+null {
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@248 }
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@239 }
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@263 }
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@260 }
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@236 }
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@291[3] { ResolutionCandidate@272, ResolutionCandidate@273, ResolutionCandidate@292 }
+    <name not found> = ArrayList@293[8] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
-
-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@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
 }
 
-LazyJavaClassifierType@60['E'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaTypeParameterImpl@62['E']
+LazyJavaClassifierType@59['E'] {
+    arguments = ArrayList@60[empty]
+    classifier = JavaTypeParameterImpl@61['E']
     nullable = 'false': Boolean@43
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
 }
 
 LazyJavaClassifierType@63['E'] {
     arguments = ArrayList@64[empty]
     classifier = JavaTypeParameterImpl@65['E']
     nullable = 'false': Boolean@43
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
 }
 
 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@72['E'] {
-    arguments = ArrayList@73[empty]
+LazyJavaClassifierType@68['E'] {
+    arguments = ArrayList@69[empty]
     classifier = JavaTypeParameterImpl@58['E']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
+}
+
+LazyJavaClassifierType@70['E'] {
+    arguments = ArrayList@71[empty]
+    classifier = JavaTypeParameterImpl@61['E']
+    nullable = 'true': Boolean@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
+}
+
+LazyJavaClassifierType@72['E'] {
+    arguments = ArrayList@73[empty]
+    classifier = JavaTypeParameterImpl@65['E']
+    nullable = 'true': Boolean@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
 }
 
 LazyJavaClassifierType@24['List<E>'] {
@@ -226,104 +226,107 @@ LazyJavaPackageFragment@105['util'] {
 
 LazyJavaTypeParameterDescriptor@26['E'] {
     defaultType = JetTypeImpl@135['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
     upperBounds = LinkedHashSet@136[1] { NullableType@137 }
 }
 
 LazyJavaTypeParameterDescriptor@21['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
 }
 
 LazyJavaTypeParameterResolver@138 {
-    resolve(JavaTypeParameterImpl@139['E']) = LazyJavaTypeParameterDescriptor@26['E']
+    resolve(JavaTypeParameterImpl@61['E']) = LazyJavaTypeParameterDescriptor@21['E']
 }
 
-LazyJavaTypeParameterResolver@140 {
-    resolve(JavaTypeParameterImpl@54['E']) = LazyJavaTypeParameterDescriptor@21['E']
+LazyJavaTypeParameterResolver@139 {
+    resolve(JavaTypeParameterImpl@140['E']) = LazyJavaTypeParameterDescriptor@26['E']
 }
 
 ResolutionTaskHolder@141 {
     <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = 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]
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
     <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 }
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
     <name not found> = EmptyList@123[empty]
     <name not found> = EmptyList@123[empty]
+}
+
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
     <name not found> = EmptyList@123[empty]
     <name not found> = EmptyList@123[empty]
 }
 
 ResolutionTaskHolder@153 {
     <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = 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]
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
     <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@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
+}
+
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
 }
 
 ResolutionTaskHolder@165 {
     <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <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@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
 }
 
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
 }
 
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[3] { ResolutionCandidate@176, ResolutionCandidate@177, ResolutionCandidate@178 }
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
 }
 
-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 }
+null {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@190[3] { ResolutionCandidate@176, ResolutionCandidate@177, ResolutionCandidate@178 }
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
+    <name not found> = EmptyList@123[empty]
     <name not found> = EmptyList@123[empty]
     <name not found> = EmptyList@123[empty]
     <name not found> = EmptyList@123[empty]

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

@@ -58,38 +58,27 @@ LazyJavaPackageFragment@23['lang'] {
 
 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@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@65[8] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
 }
 
-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]
+ResolutionTaskHolder@69 {
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
@@ -108,9 +97,23 @@ ResolutionTaskHolder@74 {
     <name not found> = EmptyList@45[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
+ResolutionTaskHolder@70 {
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+}
+
+null {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@75[8] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]
     <name not found> = EmptyList@45[empty]

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

@@ -53,10 +53,6 @@ LazyJavaPackageFragment@20['lang'] {
 
 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]
@@ -74,12 +70,8 @@ ResolutionTaskHolder@46 {
     <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]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -97,10 +89,8 @@ ResolutionTaskHolder@50 {
     <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]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -116,92 +106,67 @@ ResolutionTaskHolder@54 {
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = 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]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <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@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <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@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <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@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
 }
 
-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]
+ResolutionTaskHolder@96 {
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
@@ -220,7 +185,45 @@ ResolutionTaskHolder@112 {
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@113 {
+ResolutionTaskHolder@97 {
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+}
+
+null {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@113[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]

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

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

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

@@ -47,23 +47,26 @@ LazyJavaPackageFragment@17['lang'] {
 
 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]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <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 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
 }

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

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

compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.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@18['String']
+    classifier = JavaClassImpl@13['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
 }
@@ -148,53 +148,56 @@ LazyJavaPackageFragment@56['lang'] {
 
 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@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
 }
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <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@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[4] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@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, ... }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[7] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[8] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
+}
+
+null {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@120[5] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
+    <name not found> = ArrayList@121[7] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
+    <name not found> = ArrayList@122[8] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
-
-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

@@ -63,12 +63,6 @@ LazyJavaPackageFragment@16['util'] {
 
 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]
@@ -94,12 +88,8 @@ ResolutionTaskHolder@54 {
     <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]
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
     <name not found> = EmptyList@42[empty]
@@ -117,22 +107,35 @@ ResolutionTaskHolder@58 {
     <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@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
 ResolutionTaskHolder@66 {
     <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <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@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+null {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@62 }
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
 }

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

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

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

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

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

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

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

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@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
-LazyJavaClassifierType@58['K'] {
-    arguments = ArrayList@59[empty]
-    classifier = JavaTypeParameterImpl@60['K']
+LazyJavaClassifierType@57['K'] {
+    arguments = ArrayList@58[empty]
+    classifier = JavaTypeParameterImpl@59['K']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
-LazyJavaClassifierType@61['K'] {
-    arguments = ArrayList@62[empty]
-    classifier = JavaTypeParameterImpl@63['K']
+LazyJavaClassifierType@60['K'] {
+    arguments = ArrayList@61[empty]
+    classifier = JavaTypeParameterImpl@62['K']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
-LazyJavaClassifierType@64['K'] {
-    arguments = ArrayList@65[empty]
-    classifier = JavaTypeParameterImpl@66['K']
+LazyJavaClassifierType@63['K'] {
+    arguments = ArrayList@64[empty]
+    classifier = JavaTypeParameterImpl@65['K']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@67['K'] {
     arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@56['K']
+    classifier = JavaTypeParameterImpl@62['K']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@70['K'] {
     arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@51['K']
+    classifier = JavaTypeParameterImpl@59['K']
     nullable = 'true': Boolean@69
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@72['K'] {
     arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@60['K']
+    classifier = JavaTypeParameterImpl@65['K']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@74['K'] {
     arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@63['K']
+    classifier = JavaTypeParameterImpl@56['K']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@76['K'] {
     arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@66['K']
+    classifier = JavaTypeParameterImpl@51['K']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@78['Map<? extends K, ? extends V>'] {
@@ -188,14 +188,14 @@ LazyJavaClassifierType@113['V'] {
     arguments = ArrayList@114[empty]
     classifier = JavaTypeParameterImpl@115['V']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
-LazyJavaClassifierType@117['V'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaTypeParameterImpl@119['V']
+LazyJavaClassifierType@116['V'] {
+    arguments = ArrayList@117[empty]
+    classifier = JavaTypeParameterImpl@118['V']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@119
 }
 
 LazyJavaClassifierType@120['V'] {
@@ -214,35 +214,35 @@ LazyJavaClassifierType@123['V'] {
 
 LazyJavaClassifierType@126['V'] {
     arguments = ArrayList@127[empty]
-    classifier = JavaTypeParameterImpl@122['V']
+    classifier = JavaTypeParameterImpl@125['V']
     nullable = 'true': Boolean@69
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@128['V'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@115['V']
+    classifier = JavaTypeParameterImpl@122['V']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@130['V'] {
     arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@119['V']
+    classifier = JavaTypeParameterImpl@111['V']
     nullable = 'true': Boolean@69
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@132['V'] {
     arguments = ArrayList@133[empty]
-    classifier = JavaTypeParameterImpl@125['V']
+    classifier = JavaTypeParameterImpl@118['V']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@119
 }
 
 LazyJavaClassifierType@134['V'] {
     arguments = ArrayList@135[empty]
-    classifier = JavaTypeParameterImpl@111['V']
+    classifier = JavaTypeParameterImpl@115['V']
     nullable = 'true': Boolean@69
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
@@ -330,12 +330,12 @@ LazyJavaPackageFragment@174['util'] {
 
 LazyJavaTypeParameterDescriptor@31['K'] {
     defaultType = JetTypeImpl@205['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
     upperBounds = LinkedHashSet@206[1] { NullableType@207 }
 }
 
 LazyJavaTypeParameterDescriptor@26['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaTypeParameterDescriptor@32['V'] {
@@ -345,7 +345,7 @@ LazyJavaTypeParameterDescriptor@32['V'] {
 }
 
 LazyJavaTypeParameterDescriptor@27['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@119
 }
 
 LazyJavaTypeParameterResolver@211 {
@@ -360,72 +360,75 @@ LazyJavaTypeParameterResolver@214 {
 
 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]
+ResolutionTaskHolder@220 {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
     <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]
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
     <name not found> = EmptyList@6[empty]
 }
 
+ResolutionTaskHolder@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
+}
+
 ResolutionTaskHolder@229 {
     <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <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@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
 }
 
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
+}
+
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
 }
 
 ResolutionTaskHolder@241 {
     <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <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@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
 }
 
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@251 }
+ResolutionTaskHolder@247 {
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
 }
 
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@255 }
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[4] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
 }
 
-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, ... }
+null {
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@266[4] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]

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

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

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