Updated lazy log tests

compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.lazy.log

@@ -34,23 +34,11 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@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> = 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@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -94,3 +82,18 @@ ResolutionTaskHolder@24 {
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
+
+null {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@36 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}

compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.lazy.log

@@ -41,8 +41,6 @@ LazyJavaPackageFragment@17['lang'] {
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -61,30 +59,33 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <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]
+    <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@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <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]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -96,8 +97,6 @@ ResolutionTaskHolder@41 {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -107,10 +106,8 @@ ResolutionTaskHolder@45 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -120,43 +117,49 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <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@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> = EmptyList@31[empty]
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <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@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@41 }
+    <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@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@69 {
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]

compiler/testData/diagnostics/tests/classObjects/ClassObjects.lazy.log

@@ -114,14 +114,14 @@ LazyJavaClassifierType@63['AutoCloseable'] {
     typeConstructor = LazyJavaClassTypeConstructor@19['AutoCloseable']
 }
 
-LazyJavaClassifierType@69['Closeable'] {
+LazyJavaClassifierType@74['Closeable'] {
     arguments = ArrayList@80[empty]
     classifier = JavaClassImpl@81['Closeable']
     memberScope = LazyJavaClassMemberScope@21
     typeConstructor = LazyJavaClassTypeConstructor@23['Closeable']
 }
 
-LazyJavaClassifierType@74['Closeable'] {
+LazyJavaClassifierType@69['Closeable'] {
     arguments = ArrayList@82[empty]
     classifier = JavaClassImpl@83['Closeable']
     memberScope = LazyJavaClassMemberScope@21
@@ -242,7 +242,7 @@ LazyJavaPackageFragmentProvider@117 {
     packageFragments('kotlin.jvm': FqName@150) = null
     topLevelClasses(JavaClassImpl@77['Appendable']) = LazyJavaClassDescriptor@10['Appendable']
     topLevelClasses(JavaClassImpl@79['AutoCloseable']) = LazyJavaClassDescriptor@16['AutoCloseable']
-    topLevelClasses(JavaClassImpl@83['Closeable']) = LazyJavaClassDescriptor@20['Closeable']
+    topLevelClasses(JavaClassImpl@81['Closeable']) = LazyJavaClassDescriptor@20['Closeable']
     topLevelClasses(JavaClassImpl@85['FilterOutputStream']) = LazyJavaClassDescriptor@24['FilterOutputStream']
     topLevelClasses(JavaClassImpl@105['OutputStream']) = LazyJavaClassDescriptor@28['OutputStream']
     topLevelClasses(JavaClassImpl@108['PrintStream']) = LazyJavaClassDescriptor@32['PrintStream']
@@ -267,47 +267,163 @@ LazyJavaPackageFragment@139['lang'] {
 
 ResolutionTaskHolder@162 {
     <name not found> = ArrayList@163[10] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
-    <name not found> = ArrayList@167[10] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[10] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
-    <name not found> = ArrayList@173[10] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[10] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
 }
 
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@12[empty]
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
     <name not found> = EmptyList@12[empty]
 }
 
 ResolutionTaskHolder@178 {
     <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
+    <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
+    <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
+    <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@187 {
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
+ResolutionTaskHolder@188 {
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@188 }
+ResolutionTaskHolder@189 {
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
 
 ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@192 }
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@191 {
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@192 {
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@193 {
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
 }
@@ -321,48 +437,6 @@ ResolutionTaskHolder@194 {
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
 }
 
 ResolutionTaskHolder@195 {
@@ -374,23 +448,6 @@ ResolutionTaskHolder@195 {
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
 }
 
 ResolutionTaskHolder@196 {
@@ -402,99 +459,45 @@ ResolutionTaskHolder@196 {
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
 }
 
-ResolutionTaskHolder@197 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@203 {
+null {
+    <name not found> = ArrayList@197[10] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
+    <name not found> = ArrayList@198[10] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@186 }
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]
     <name not found> = EmptyList@12[empty]

compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.lazy.log

@@ -29,9 +29,12 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+}
+
+null {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
     <name not found> = EmptyList@18[empty]
     <name not found> = EmptyList@18[empty]
 }

compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.lazy.log

@@ -57,16 +57,6 @@ LazyJavaPackageFragment@23['lang'] {
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <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]
@@ -108,18 +98,8 @@ ResolutionTaskHolder@50 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-    <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]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -161,9 +141,8 @@ ResolutionTaskHolder@54 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -203,6 +182,40 @@ ResolutionTaskHolder@58 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+    <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]
+    <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]
@@ -216,48 +229,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@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]
-    <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]
-    <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]
@@ -267,10 +238,8 @@ ResolutionTaskHolder@62 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -280,9 +249,8 @@ ResolutionTaskHolder@66 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -290,13 +258,21 @@ ResolutionTaskHolder@70 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+    <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]
 }
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -306,10 +282,8 @@ ResolutionTaskHolder@74 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -319,9 +293,8 @@ ResolutionTaskHolder@78 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
@@ -329,121 +302,64 @@ ResolutionTaskHolder@82 {
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+    <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@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-    <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]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <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]
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
-    <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@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
     <name not found> = EmptyList@41[empty]
     <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@98 {
     <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
-    <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]
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
     <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
     <name not found> = EmptyList@41[empty]
 }
 
 ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
-    <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@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
-    <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@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@130 {
-    <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]
@@ -454,7 +370,94 @@ ResolutionTaskHolder@130 {
     <name not found> = EmptyList@41[empty]
 }
 
-ResolutionTaskHolder@131 {
+ResolutionTaskHolder@111 {
+    <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]
+}
+
+null {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@58 }
+    <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]
+    <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]
+    <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]
+    <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]

compiler/testData/diagnostics/tests/classObjects/kt3866.lazy.log

@@ -37,13 +37,6 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@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]
     <name not found> = EmptyList@20[empty]
@@ -52,105 +45,115 @@ ResolutionTaskHolder@28 {
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <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> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-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 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <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@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@20[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@20[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@20[empty]
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@20[empty]
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@20[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@20[empty]
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
     <name not found> = EmptyList@20[empty]
 }
 
+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@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[7] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
+}
+
+null {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@93[7] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
+    <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]
+    <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@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[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> = ArrayList@89[7] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-    <name not found> = ArrayList@93[7] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-}

compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.lazy.log

@@ -38,16 +38,6 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -89,10 +79,8 @@ ResolutionTaskHolder@27 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -102,9 +90,8 @@ ResolutionTaskHolder@31 {
     <name not found> = EmptyList@19[empty]
 }
 
-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 }
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -112,13 +99,21 @@ ResolutionTaskHolder@35 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
 }
 
 ResolutionTaskHolder@39 {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -128,25 +123,7 @@ ResolutionTaskHolder@39 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
+ResolutionTaskHolder@42 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -169,7 +146,7 @@ ResolutionTaskHolder@47 {
     <name not found> = EmptyList@19[empty]
 }
 
-ResolutionTaskHolder@48 {
+ResolutionTaskHolder@43 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
@@ -190,6 +167,32 @@ ResolutionTaskHolder@48 {
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
+}
+
+null {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@29 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]
     <name not found> = EmptyList@19[empty]