Updated lazy log tests

compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.lazy.log

@@ -34,47 +34,50 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
     <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+null {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@25 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }

compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.lazy.log

@@ -43,74 +43,100 @@ LazyJavaPackageFragment@15['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 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
-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 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
 }
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[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]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <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@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@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
 ResolutionTaskHolder@56 {
     <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@59 {
+    <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]
+    <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]
 }
 
 ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+    <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]
+    <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]
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+ResolutionTaskHolder@61 {
+    <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]
 }
 
-ResolutionTaskHolder@68 {
-    <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@62 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -119,6 +145,9 @@ ResolutionTaskHolder@68 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@63 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -129,19 +158,7 @@ ResolutionTaskHolder@68 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@69 {
-    <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]
-    <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@64 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -152,9 +169,7 @@ ResolutionTaskHolder@69 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@65 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -165,9 +180,7 @@ ResolutionTaskHolder@70 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@66 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -178,9 +191,7 @@ ResolutionTaskHolder@71 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
+ResolutionTaskHolder@67 {
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
     <name not found> = EmptyList@24[empty]
@@ -191,46 +202,38 @@ ResolutionTaskHolder@72 {
     <name not found> = EmptyList@24[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <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]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <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]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <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]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@76 {
+null {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@55 }
+    <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]
+    <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]
+    <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]
     <name not found> = EmptyList@24[empty]

compiler/testData/diagnostics/tests/inner/qualifiedExpression/dataLocalVariable.lazy.log

@@ -46,24 +46,27 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@35 {
     <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
 }
 
-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@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
+null {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
 }

compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.lazy.log

@@ -32,21 +32,15 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@29 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -57,9 +51,7 @@ ResolutionTaskHolder@31 {
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@30 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -69,3 +61,14 @@ ResolutionTaskHolder@32 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@25 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}

compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.lazy.log

@@ -41,10 +41,6 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -62,36 +58,25 @@ ResolutionTaskHolder@33 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
 ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -102,9 +87,7 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@46 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -115,9 +98,7 @@ ResolutionTaskHolder@50 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@47 {
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
@@ -128,7 +109,29 @@ ResolutionTaskHolder@51 {
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@52 {
+ResolutionTaskHolder@48 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]

compiler/testData/diagnostics/tests/inner/qualifiedExpression/importNestedClass.lazy.log

@@ -59,43 +59,56 @@ LazyJavaPackageFragment@18['lang'] {
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-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 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
 ResolutionTaskHolder@54 {
     <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <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]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@61 {
+    <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]
@@ -103,17 +116,6 @@ ResolutionTaskHolder@58 {
 }
 
 ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <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]
@@ -124,9 +126,7 @@ ResolutionTaskHolder@66 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@63 {
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -137,20 +137,23 @@ ResolutionTaskHolder@67 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <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]
-}
-
-ResolutionTaskHolder@69 {
+null {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@50 }
+    <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]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]

compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedClassInPackage.lazy.log

@@ -29,7 +29,15 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@27 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
@@ -45,15 +53,10 @@ ResolutionTaskHolder@28 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+null {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@26 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]

compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.lazy.log

@@ -32,14 +32,32 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@29 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
+ResolutionTaskHolder@30 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
@@ -53,8 +71,6 @@ ResolutionTaskHolder@31 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@32 {
@@ -66,24 +82,11 @@ ResolutionTaskHolder@32 {
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@34 {
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@25 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]

compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedObjects.lazy.log

@@ -32,21 +32,24 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@21[empty]
+}
+
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@26 }
+    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }

compiler/testData/diagnostics/tests/inner/qualifiedExpression/typePosition.lazy.log

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