Updated lazy log tests

compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.lazy.log

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

compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.lazy.log

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

compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.lazy.log

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

compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.lazy.log

@@ -46,45 +46,31 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@50 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -110,3 +96,20 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
+
+null {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}

compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.lazy.log

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

compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.lazy.log

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

compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.lazy.log

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

compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.lazy.log

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

compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.lazy.log

@@ -60,12 +60,6 @@ LazyJavaPackageFragment@16['lang'] {
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -74,14 +68,8 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -90,78 +78,93 @@ ResolutionTaskHolder@53 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
 ResolutionTaskHolder@73 {
     <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+null {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@63 }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
 }