Updated lazy log tests

compiler/testData/diagnostics/tests/substitutions/kt1558-short.lazy.log

@@ -52,28 +52,19 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@50 {
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -92,9 +83,21 @@ ResolutionTaskHolder@53 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+null {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]

compiler/testData/diagnostics/tests/substitutions/kt4887.lazy.log

@@ -40,15 +40,6 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@36 {
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -59,7 +50,19 @@ ResolutionTaskHolder@36 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }

compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.lazy.log

@@ -42,14 +42,17 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[2] { ResolutionCandidate@39, ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[2] { ResolutionCandidate@39, ResolutionCandidate@40 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
+
+null {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@41[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }

compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.lazy.log

@@ -75,14 +75,14 @@ LazyJavaClassifierType@36['Throwable'] {
 
 LazyJavaClassifierType@39['Throwable'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -158,39 +158,42 @@ LazyJavaPackageFragment@58['lang'] {
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[3] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[3] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[3] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96 }
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[4] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
-    <name not found> = ArrayList@104[5] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = ArrayList@110[5] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[4] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-    <name not found> = ArrayList@116[5] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[4] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+}
+
+null {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@113[3] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96 }
+    <name not found> = ArrayList@114[5] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
+    <name not found> = ArrayList@115[5] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <name not found> = ArrayList@116[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]