Updated lazy log tests

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]