Updated lazy log tests

compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.lazy.log

@@ -30,20 +30,23 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+null {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@39 }
 }

compiler/testData/diagnostics/tests/dataFlow/EmptyIf.lazy.log

@@ -37,117 +37,120 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@28[empty]
     <name not found> = EmptyList@28[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@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[2] { ResolutionCandidate@99, ResolutionCandidate@100 }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[2] { ResolutionCandidate@121, ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[2] { ResolutionCandidate@121, ResolutionCandidate@122 }
+null {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@123[2] { ResolutionCandidate@99, ResolutionCandidate@100 }
+    <name not found> = EmptyList@28[empty]
 }

compiler/testData/diagnostics/tests/dataFlow/IsExpression.lazy.log

@@ -46,13 +46,7 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@38[8] { ResolutionCandidate@39, ResolutionCandidate@40, ResolutionCandidate@41, ... }
-    <name not found> = ArrayList@42[8] { ResolutionCandidate@39, ResolutionCandidate@40, ResolutionCandidate@41, ... }
-    <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> = ArrayList@37[8] { ResolutionCandidate@38, ResolutionCandidate@39, ResolutionCandidate@40, ... }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
@@ -77,12 +71,8 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
@@ -100,17 +90,30 @@ ResolutionTaskHolder@43 {
     <name not found> = EmptyList@26[empty]
 }
 
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+null {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@58[8] { ResolutionCandidate@38, ResolutionCandidate@39, ResolutionCandidate@40, ... }
+    <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/dataFlow/WhenSubject.lazy.log

@@ -29,15 +29,18 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+null {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@35 }
 }

compiler/testData/diagnostics/tests/dataFlow/local/LocalClassBase.lazy.log

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

compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDefaultParameters.lazy.log

@@ -27,20 +27,23 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@27 }
 }

compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegatedProperties.lazy.log

@@ -57,15 +57,6 @@ LazyJavaPackageFragment@12['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]
-    <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]
@@ -76,17 +67,8 @@ ResolutionTaskHolder@40 {
     <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]
-    <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]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -97,9 +79,8 @@ ResolutionTaskHolder@44 {
     <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]
     <name not found> = EmptyList@32[empty]
@@ -108,6 +89,10 @@ ResolutionTaskHolder@48 {
     <name not found> = EmptyList@32[empty]
     <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]
     <name not found> = EmptyList@32[empty]
@@ -120,15 +105,6 @@ ResolutionTaskHolder@48 {
 
 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]
-    <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]
@@ -139,17 +115,8 @@ ResolutionTaskHolder@52 {
     <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]
-    <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]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
@@ -160,66 +127,31 @@ ResolutionTaskHolder@56 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <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]
-    <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@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@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@88 {
-    <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]
@@ -254,7 +186,78 @@ ResolutionTaskHolder@88 {
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@89 {
+ResolutionTaskHolder@77 {
+    <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]
+    <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]
+    <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@78[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@89[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]
+    <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]
+    <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/dataFlow/local/LocalClassDelegation.lazy.log

@@ -26,10 +26,13 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+null {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@29 }
 }

compiler/testData/diagnostics/tests/dataFlow/local/LocalClassFunctions.lazy.log

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

compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInMemberOfLocalClass.lazy.log

@@ -27,30 +27,33 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+null {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@27 }
 }

compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.lazy.log

@@ -29,25 +29,28 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@32 }
 }

compiler/testData/diagnostics/tests/dataFlow/local/LocalClassProperty.lazy.log

@@ -37,30 +37,33 @@ LazyJavaPackageFragment@9['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
 
-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@42 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@33 }
 }

compiler/testData/diagnostics/tests/dataFlow/local/LocalObject.lazy.log

@@ -38,25 +38,28 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
 }
 
-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 }
+null {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@46 }
 }

compiler/testData/diagnostics/tests/dataFlow/local/LocalObjectDelegation.lazy.log

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

compiler/testData/diagnostics/tests/dataFlow/local/NestedLocalClass.lazy.log

@@ -27,15 +27,18 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+}
+
+null {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@27 }
 }

compiler/testData/diagnostics/tests/dataFlow/local/kt2835.lazy.log

@@ -41,24 +41,27 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@22[empty]
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
 ResolutionTaskHolder@41 {
     <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+null {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@22[empty]
 }