Updated lazy log tests

compiler/testData/diagnostics/tests/subtyping/kt2069.lazy.log

@@ -22,5 +22,8 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@22 {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
+}
+
+null {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
 }

compiler/testData/diagnostics/tests/subtyping/localAnonymousObjects.lazy.log

@@ -24,5 +24,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@20 {
     <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
+}
+
+null {
     <name not found> = ArrayList@23[1] { ResolutionCandidate@22 }
 }

compiler/testData/diagnostics/tests/subtyping/localClasses.lazy.log

@@ -43,69 +43,72 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[2] { ResolutionCandidate@57, ResolutionCandidate@58 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[2] { ResolutionCandidate@61, ResolutionCandidate@62 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[2] { ResolutionCandidate@64, ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[2] { ResolutionCandidate@64, ResolutionCandidate@65 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[2] { ResolutionCandidate@69, ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[2] { ResolutionCandidate@69, ResolutionCandidate@70 }
+null {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@70[2] { ResolutionCandidate@57, ResolutionCandidate@58 }
+    <name not found> = ArrayList@71[2] { ResolutionCandidate@61, ResolutionCandidate@62 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]

compiler/testData/diagnostics/tests/subtyping/memberAnonymousObjects.lazy.log

@@ -39,7 +39,10 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+null {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
     <name not found> = EmptyList@23[empty]
 }

compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.lazy.log

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

compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.lazy.log

@@ -43,79 +43,82 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[2] { ResolutionCandidate@72, ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[2] { ResolutionCandidate@72, ResolutionCandidate@73 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[2] { ResolutionCandidate@63, ResolutionCandidate@64 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[2] { ResolutionCandidate@77, ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[2] { ResolutionCandidate@77, ResolutionCandidate@78 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+}
+
+null {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@78[2] { ResolutionCandidate@63, ResolutionCandidate@64 }
+    <name not found> = ArrayList@79[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]

compiler/testData/diagnostics/tests/subtyping/topLevelAnonymousObjects.lazy.log

@@ -39,7 +39,10 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+null {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
     <name not found> = EmptyList@23[empty]
 }