Updated lazy log tests

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]
 }

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

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