Updated lazy log tests

compiler/testData/diagnostics/tests/j+k/InheritedGenericFunction.lazy.log

@@ -67,7 +67,7 @@ LazyJavaClassTypeConstructor@57['C'] {
     supertypes = ArrayList@65[2] { LazyJavaClassifierType@66['B'], LazyJavaClassifierType@67['A'] }
 }
 
-LazyJavaClassifierType@63['A'] {
+LazyJavaClassifierType@67['A'] {
     arguments = ArrayList@68[empty]
     classifier = JavaClassImpl@69['A']
     memberScope = LazyJavaClassMemberScope@4
@@ -75,7 +75,7 @@ LazyJavaClassifierType@63['A'] {
     typeConstructor = LazyJavaClassTypeConstructor@24['A']
 }
 
-LazyJavaClassifierType@67['A'] {
+LazyJavaClassifierType@63['A'] {
     arguments = ArrayList@71[empty]
     classifier = JavaClassImpl@72['A']
     memberScope = LazyJavaClassMemberScope@4
@@ -142,7 +142,7 @@ LazyJavaPackageFragmentProvider@93 {
     packageFragments('kotlin.jvm': FqName@106) = null
     packageFragments('p': FqName@107) = LazyJavaPackageFragment@108['p']
     packageFragments('p.C': FqName@109) = null
-    topLevelClasses(JavaClassImpl@72['A']) = LazyJavaClassDescriptor@0['A']
+    topLevelClasses(JavaClassImpl@69['A']) = LazyJavaClassDescriptor@0['A']
     topLevelClasses(JavaClassImpl@74['B']) = LazyJavaClassDescriptor@25['B']
     topLevelClasses(JavaClassImpl@110['C']) = LazyJavaClassDescriptor@40['C']
 }
@@ -189,5 +189,8 @@ LazyJavaTypeParameterResolver@131 {
 
 ResolutionTaskHolder@133 {
     <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
+}
+
+null {
     <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
 }

compiler/testData/diagnostics/tests/j+k/KJKInheritance.lazy.log

@@ -76,23 +76,26 @@ LazyJavaPackageFragment@50['lang'] {
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+}
+
+null {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@71 }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
 }

compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.lazy.log

@@ -111,28 +111,31 @@ LazyJavaPackageFragment@65['lang'] {
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+null {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@96 }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
 }

compiler/testData/diagnostics/tests/j+k/OverrideVararg.lazy.log

@@ -84,18 +84,21 @@ LazyJavaPackageFragment@55['lang'] {
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
     <name not found> = EmptyList@13[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+}
+
+null {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@79 }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
 }

compiler/testData/diagnostics/tests/j+k/Simple.lazy.log

@@ -63,10 +63,13 @@ LazyJavaPackageFragment@27['java'] {
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+}
+
+null {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@56 }
 }

compiler/testData/diagnostics/tests/j+k/StaticMembersFromSuperclasses.lazy.log

@@ -83,19 +83,22 @@ LazyJavaTypeAttributes@55 {
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@59 }
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]
     <name not found> = EmptyList@6[empty]

compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.lazy.log

@@ -66,14 +66,14 @@ LazyJavaClassifierType@47['T'] {
 
 LazyJavaClassifierType@50['T'] {
     arguments = ArrayList@51[empty]
-    classifier = JavaTypeParameterImpl@45['T']
+    classifier = JavaTypeParameterImpl@49['T']
     nullable = 'true': Boolean@42
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
 }
 
 LazyJavaClassifierType@52['T'] {
     arguments = ArrayList@53[empty]
-    classifier = JavaTypeParameterImpl@49['T']
+    classifier = JavaTypeParameterImpl@45['T']
     nullable = 'true': Boolean@42
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
 }
@@ -141,28 +141,31 @@ LazyJavaTypeParameterResolver@90 {
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
     <name not found> = EmptyList@76[empty]
     <name not found> = EmptyList@76[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = EmptyList@76[empty]
     <name not found> = EmptyList@76[empty]
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+null {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@99 }
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
 }

compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.lazy.log

@@ -80,14 +80,14 @@ LazyJavaClassifierType@52['T'] {
 
 LazyJavaClassifierType@55['T'] {
     arguments = ArrayList@56[empty]
-    classifier = JavaTypeParameterImpl@54['T']
+    classifier = JavaTypeParameterImpl@50['T']
     nullable = 'true': Boolean@42
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@51
 }
 
 LazyJavaClassifierType@57['T'] {
     arguments = ArrayList@58[empty]
-    classifier = JavaTypeParameterImpl@50['T']
+    classifier = JavaTypeParameterImpl@54['T']
     nullable = 'true': Boolean@42
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@51
 }
@@ -147,37 +147,40 @@ LazyJavaTypeParameterResolver@92 {
 }
 
 LazyJavaTypeParameterResolver@94 {
-    resolve(JavaTypeParameterImpl@54['T']) = null
+    resolve(JavaTypeParameterImpl@50['T']) = null
 }
 
 LazyJavaTypeParameterResolver@95 {
-    resolve(JavaTypeParameterImpl@50['T']) = null
+    resolve(JavaTypeParameterImpl@54['T']) = null
 }
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <name not found> = EmptyList@81[empty]
     <name not found> = EmptyList@81[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+}
+
+null {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@104 }
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
 }

compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-SpecialTypes.lazy.log

@@ -129,42 +129,45 @@ LazyJavaTypeParameterResolver@84 {
 }
 
 LazyJavaTypeParameterResolver@86 {
-    resolve(JavaTypeParameterImpl@50['T']) = null
+    resolve(JavaTypeParameterImpl@46['T']) = null
 }
 
 LazyJavaTypeParameterResolver@87 {
-    resolve(JavaTypeParameterImpl@46['T']) = null
+    resolve(JavaTypeParameterImpl@50['T']) = null
 }
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+null {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@99 }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
 }

compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-UserTypes.lazy.log

@@ -149,42 +149,45 @@ LazyJavaTypeParameterResolver@95 {
 }
 
 LazyJavaTypeParameterResolver@97 {
-    resolve(JavaTypeParameterImpl@61['T']) = null
+    resolve(JavaTypeParameterImpl@57['T']) = null
 }
 
 LazyJavaTypeParameterResolver@98 {
-    resolve(JavaTypeParameterImpl@57['T']) = null
+    resolve(JavaTypeParameterImpl@61['T']) = null
 }
 
 ResolutionTaskHolder@99 {
     <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
     <name not found> = EmptyList@84[empty]
     <name not found> = EmptyList@84[empty]
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
     <name not found> = EmptyList@84[empty]
     <name not found> = EmptyList@84[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
 }
 
 ResolutionTaskHolder@111 {
     <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+null {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@113 }
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
 }

compiler/testData/diagnostics/tests/j+k/UnboxingNulls.lazy.log

@@ -88,30 +88,33 @@ LazyJavaTypeParameterResolver@63 {
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[8] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-    <name not found> = ArrayList@77[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+null {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@78[8] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]

compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.lazy.log

@@ -159,22 +159,42 @@ LazyJavaPackageFragment@97['lang'] {
 
 ResolutionTaskHolder@117 {
     <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[2] { ResolutionCandidate@122, ResolutionCandidate@123 }
+    <name not found> = ArrayList@124[2] { ResolutionCandidate@125, ResolutionCandidate@126 }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[2] { ResolutionCandidate@129, ResolutionCandidate@130 }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[2] { ResolutionCandidate@123, ResolutionCandidate@124 }
-    <name not found> = ArrayList@125[2] { ResolutionCandidate@126, ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[4] { ResolutionCandidate@123, ResolutionCandidate@126, ResolutionCandidate@124, ... }
+ResolutionTaskHolder@132 {
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
@@ -185,31 +205,14 @@ ResolutionTaskHolder@121 {
     <name not found> = EmptyList@9[empty]
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[2] { ResolutionCandidate@131, ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[4] { ResolutionCandidate@131, ResolutionCandidate@134, ResolutionCandidate@132, ... }
+null {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@134[4] { ResolutionCandidate@122, ResolutionCandidate@125, ResolutionCandidate@123, ... }
+    <name not found> = ArrayList@135[4] { ResolutionCandidate@129, ResolutionCandidate@136, ResolutionCandidate@130, ... }
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]
     <name not found> = EmptyList@9[empty]

compiler/testData/diagnostics/tests/j+k/cantDeclareIfSamAdapterIsInherited.lazy.log

@@ -92,10 +92,13 @@ LazyJavaPackageFragment@60['java'] {
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+}
+
+null {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@84 }
 }

compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.lazy.log

@@ -78,9 +78,6 @@ LazyJavaPackageFragment@43['lang'] {
 
 ResolutionTaskHolder@61 {
     <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
@@ -94,9 +91,15 @@ ResolutionTaskHolder@61 {
     <name not found> = EmptyList@52[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+}
+
+null {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]

compiler/testData/diagnostics/tests/j+k/kt1402.lazy.log

@@ -79,23 +79,26 @@ LazyJavaPackageFragment@39['lang'] {
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+}
+
+null {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@67 }
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
 }

compiler/testData/diagnostics/tests/j+k/kt1431.lazy.log

@@ -37,14 +37,14 @@ LazyJavaClassifierType@26['B'] {
 
 LazyJavaClassifierType@29['B'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaTypeParameterImpl@28['B']
+    classifier = JavaTypeParameterImpl@23['B']
     nullable = 'true': Boolean@31
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@25
 }
 
 LazyJavaClassifierType@32['B'] {
     arguments = ArrayList@33[empty]
-    classifier = JavaTypeParameterImpl@23['B']
+    classifier = JavaTypeParameterImpl@28['B']
     nullable = 'true': Boolean@31
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@25
 }
@@ -149,25 +149,28 @@ LazyJavaTypeParameterResolver@95 {
 
 ResolutionTaskHolder@97 {
     <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
+null {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@102 }
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]
     <name not found> = EmptyList@8[empty]

compiler/testData/diagnostics/tests/j+k/kt2394.lazy.log

@@ -45,30 +45,33 @@ LazyJavaPackageFragment@19['java'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+null {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@56 }
 }

compiler/testData/diagnostics/tests/j+k/kt2619.lazy.log

@@ -46,5 +46,8 @@ LazyJavaPackageFragment@14['java'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+null {
     <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }

compiler/testData/diagnostics/tests/j+k/kt2641.lazy.log

@@ -193,11 +193,11 @@ LazyJavaTypeParameterResolver@147 {
 }
 
 LazyJavaTypeParameterResolver@149 {
-    resolve(JavaTypeParameterImpl@67['T']) = LazyJavaTypeParameterDescriptor@38['T']
+    resolve(JavaTypeParameterImpl@150['T']) = LazyJavaTypeParameterDescriptor@46['T']
 }
 
-LazyJavaTypeParameterResolver@150 {
-    resolve(JavaTypeParameterImpl@151['T']) = LazyJavaTypeParameterDescriptor@46['T']
+LazyJavaTypeParameterResolver@151 {
+    resolve(JavaTypeParameterImpl@62['T']) = LazyJavaTypeParameterDescriptor@38['T']
 }
 
 LazyJavaTypeParameterResolver@152 {
@@ -210,15 +210,18 @@ LazyJavaTypeParameterResolver@153 {
 
 ResolutionTaskHolder@154 {
     <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
 }
 
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
+}
+
+null {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@162 }
 }

compiler/testData/diagnostics/tests/j+k/kt2890.lazy.log

@@ -112,14 +112,14 @@ LazyJavaClassifierType@74['E'] {
     arguments = ArrayList@75[empty]
     classifier = JavaTypeParameterImpl@76['E']
     nullable = 'false': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
-LazyJavaClassifierType@77['E'] {
-    arguments = ArrayList@78[empty]
-    classifier = JavaTypeParameterImpl@79['E']
+LazyJavaClassifierType@78['E'] {
+    arguments = ArrayList@79[empty]
+    classifier = JavaTypeParameterImpl@80['E']
     nullable = 'false': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaClassifierType@81['E'] {
@@ -138,23 +138,23 @@ LazyJavaClassifierType@84['E'] {
 
 LazyJavaClassifierType@86['E'] {
     arguments = ArrayList@87[empty]
-    classifier = JavaTypeParameterImpl@72['E']
+    classifier = JavaTypeParameterImpl@76['E']
     nullable = 'true': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
 LazyJavaClassifierType@88['E'] {
     arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@76['E']
+    classifier = JavaTypeParameterImpl@72['E']
     nullable = 'true': Boolean@67
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaClassifierType@90['E'] {
     arguments = ArrayList@91[empty]
-    classifier = JavaTypeParameterImpl@79['E']
+    classifier = JavaTypeParameterImpl@80['E']
     nullable = 'true': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaClassifierType@92['Integer'] {
@@ -173,14 +173,14 @@ LazyJavaClassifierType@96['Integer'] {
 
 LazyJavaClassifierType@99['Integer'] {
     arguments = ArrayList@100[empty]
-    classifier = JavaClassImpl@98['Integer']
+    classifier = JavaClassImpl@94['Integer']
     nullable = 'true': Boolean@67
     typeConstructor = DeserializedClassTypeConstructor@95
 }
 
 LazyJavaClassifierType@101['Integer'] {
     arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@94['Integer']
+    classifier = JavaClassImpl@98['Integer']
     nullable = 'true': Boolean@67
     typeConstructor = DeserializedClassTypeConstructor@95
 }
@@ -304,47 +304,50 @@ LazyJavaTypeParameterDescriptor@39['E'] {
 }
 
 LazyJavaTypeParameterDescriptor@34['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
 LazyJavaTypeParameterResolver@172 {
-    resolve(JavaTypeParameterImpl@173['E']) = LazyJavaTypeParameterDescriptor@39['E']
+    resolve(JavaTypeParameterImpl@76['E']) = LazyJavaTypeParameterDescriptor@34['E']
 }
 
-LazyJavaTypeParameterResolver@174 {
-    resolve(JavaTypeParameterImpl@79['E']) = LazyJavaTypeParameterDescriptor@34['E']
+LazyJavaTypeParameterResolver@173 {
+    resolve(JavaTypeParameterImpl@174['E']) = LazyJavaTypeParameterDescriptor@39['E']
 }
 
 ResolutionTaskHolder@175 {
     <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[3] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@186 {
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[3] { ResolutionCandidate@185, ResolutionCandidate@186, ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[3] { ResolutionCandidate@185, ResolutionCandidate@186, ResolutionCandidate@187 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+null {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@189[3] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]

compiler/testData/diagnostics/tests/j+k/kt3307.lazy.log

@@ -140,33 +140,36 @@ LazyJavaTypeParameterResolver@85 {
 
 ResolutionTaskHolder@87 {
     <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
 ResolutionTaskHolder@99 {
     <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+null {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@98 }
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
 }

compiler/testData/diagnostics/tests/j+k/kt3311.lazy.log

@@ -77,34 +77,37 @@ LazyJavaPackageFragment@52['lang'] {
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+null {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@87 }
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
 }

compiler/testData/diagnostics/tests/j+k/mutableIterator.lazy.log

@@ -71,7 +71,7 @@ LazyJavaClassifierType@52['Iterator<T>'] {
 
 LazyJavaClassifierType@57['Iterator<T>'] {
     arguments = ArrayList@58[1] { TypeProjectionImpl@59 }
-    classifier = JavaClassImpl@55['Iterator']
+    classifier = JavaClassImpl@49['Iterator']
     memberScope = SubstitutingScope@60
     nullable = 'true': Boolean@40
     typeConstructor = DeserializedClassTypeConstructor@61
@@ -79,7 +79,7 @@ LazyJavaClassifierType@57['Iterator<T>'] {
 
 LazyJavaClassifierType@62['Iterator<T>'] {
     arguments = ArrayList@63[1] { TypeProjectionImpl@64 }
-    classifier = JavaClassImpl@49['Iterator']
+    classifier = JavaClassImpl@55['Iterator']
     memberScope = SubstitutingScope@65
     nullable = 'true': Boolean@40
     typeConstructor = DeserializedClassTypeConstructor@61
@@ -148,56 +148,56 @@ LazyJavaClassifierType@91['T'] {
 
 LazyJavaClassifierType@94['T'] {
     arguments = ArrayList@95[empty]
-    classifier = JavaTypeParameterImpl@93['T']
+    classifier = JavaTypeParameterImpl@75['T']
     nullable = 'true': Boolean@40
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
 LazyJavaClassifierType@96['T'] {
     arguments = ArrayList@97[empty]
-    classifier = JavaTypeParameterImpl@71['T']
+    classifier = JavaTypeParameterImpl@78['T']
     nullable = 'true': Boolean@40
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
 LazyJavaClassifierType@98['T'] {
     arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@90['T']
+    classifier = JavaTypeParameterImpl@81['T']
     nullable = 'true': Boolean@40
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
 LazyJavaClassifierType@100['T'] {
     arguments = ArrayList@101[empty]
-    classifier = JavaTypeParameterImpl@78['T']
+    classifier = JavaTypeParameterImpl@84['T']
     nullable = 'true': Boolean@40
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
 LazyJavaClassifierType@102['T'] {
     arguments = ArrayList@103[empty]
-    classifier = JavaTypeParameterImpl@84['T']
+    classifier = JavaTypeParameterImpl@90['T']
     nullable = 'true': Boolean@40
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
 LazyJavaClassifierType@104['T'] {
     arguments = ArrayList@105[empty]
-    classifier = JavaTypeParameterImpl@87['T']
+    classifier = JavaTypeParameterImpl@93['T']
     nullable = 'true': Boolean@40
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
 LazyJavaClassifierType@106['T'] {
     arguments = ArrayList@107[empty]
-    classifier = JavaTypeParameterImpl@81['T']
+    classifier = JavaTypeParameterImpl@71['T']
     nullable = 'true': Boolean@40
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
 LazyJavaClassifierType@108['T'] {
     arguments = ArrayList@109[empty]
-    classifier = JavaTypeParameterImpl@75['T']
+    classifier = JavaTypeParameterImpl@87['T']
     nullable = 'true': Boolean@40
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
@@ -264,15 +264,15 @@ LazyJavaTypeParameterResolver@162 {
 }
 
 LazyJavaTypeParameterResolver@164 {
-    resolve(JavaTypeParameterImpl@84['T']) = null
+    resolve(JavaTypeParameterImpl@81['T']) = null
 }
 
 LazyJavaTypeParameterResolver@165 {
-    resolve(JavaTypeParameterImpl@75['T']) = null
+    resolve(JavaTypeParameterImpl@93['T']) = null
 }
 
 LazyJavaTypeParameterResolver@166 {
-    resolve(JavaTypeParameterImpl@87['T']) = null
+    resolve(JavaTypeParameterImpl@71['T']) = null
 }
 
 LazyJavaTypeParameterResolver@167 {
@@ -281,80 +281,83 @@ LazyJavaTypeParameterResolver@167 {
 
 ResolutionTaskHolder@168 {
     <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
 }
 
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
 }
 
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
+}
+
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
 }
 
 ResolutionTaskHolder@180 {
     <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+ResolutionTaskHolder@183 {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
 }
 
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
+}
+
+ResolutionTaskHolder@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
 }
 
 ResolutionTaskHolder@192 {
     <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
 }
 
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
 }
 
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
+}
+
+ResolutionTaskHolder@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
 }
 
 ResolutionTaskHolder@204 {
     <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
 }
 
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
 }
 
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
 }
 
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
+ResolutionTaskHolder@213 {
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
 }
 
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
+null {
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@215 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@197 }
 }

compiler/testData/diagnostics/tests/j+k/overrideRawType.lazy.log

@@ -126,14 +126,14 @@ LazyJavaClassifierType@84['String'] {
 
 LazyJavaClassifierType@87['String'] {
     arguments = ArrayList@88[empty]
-    classifier = JavaClassImpl@86['String']
+    classifier = JavaClassImpl@82['String']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@83
 }
 
 LazyJavaClassifierType@89['String'] {
     arguments = ArrayList@90[empty]
-    classifier = JavaClassImpl@82['String']
+    classifier = JavaClassImpl@86['String']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@83
 }
@@ -154,14 +154,14 @@ LazyJavaClassifierType@95['Throwable'] {
 
 LazyJavaClassifierType@98['Throwable'] {
     arguments = ArrayList@99[empty]
-    classifier = JavaClassImpl@93['Throwable']
+    classifier = JavaClassImpl@97['Throwable']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@94
 }
 
 LazyJavaClassifierType@100['Throwable'] {
     arguments = ArrayList@101[empty]
-    classifier = JavaClassImpl@97['Throwable']
+    classifier = JavaClassImpl@93['Throwable']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@94
 }
@@ -232,15 +232,18 @@ LazyJavaTypeParameterResolver@143 {
 
 ResolutionTaskHolder@145 {
     <name not found> = ArrayList@146[4] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
-    <name not found> = ArrayList@150[4] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+}
+
+null {
+    <name not found> = ArrayList@150[4] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]

compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.lazy.log

@@ -53,20 +53,23 @@ LazyJavaPackageFragment@27['lang'] {
 
 ResolutionTaskHolder@42 {
     <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]

compiler/testData/diagnostics/tests/j+k/packageVisibility.lazy.log

@@ -130,10 +130,6 @@ LazyJavaPackageFragment@69['lang'] {
 
 ResolutionTaskHolder@88 {
     <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -151,12 +147,8 @@ ResolutionTaskHolder@88 {
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -174,9 +166,8 @@ ResolutionTaskHolder@92 {
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -192,6 +183,22 @@ ResolutionTaskHolder@96 {
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -199,10 +206,6 @@ ResolutionTaskHolder@96 {
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -220,12 +223,8 @@ ResolutionTaskHolder@100 {
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -243,9 +242,8 @@ ResolutionTaskHolder@104 {
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -261,6 +259,22 @@ ResolutionTaskHolder@108 {
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -268,62 +282,66 @@ ResolutionTaskHolder@108 {
 
 ResolutionTaskHolder@112 {
     <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
 }
 
 ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+}
+
+ResolutionTaskHolder@125 {
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+}
+
+ResolutionTaskHolder@127 {
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -331,24 +349,28 @@ ResolutionTaskHolder@124 {
 }
 
 ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@129 {
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@136 {
+ResolutionTaskHolder@130 {
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -357,13 +379,20 @@ ResolutionTaskHolder@136 {
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
+ResolutionTaskHolder@132 {
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -374,9 +403,7 @@ ResolutionTaskHolder@137 {
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
+ResolutionTaskHolder@133 {
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -387,9 +414,7 @@ ResolutionTaskHolder@138 {
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@139 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
+ResolutionTaskHolder@134 {
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -400,9 +425,7 @@ ResolutionTaskHolder@139 {
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
+ResolutionTaskHolder@135 {
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
@@ -413,85 +436,65 @@ ResolutionTaskHolder@140 {
     <name not found> = EmptyList@10[empty]
 }
 
-ResolutionTaskHolder@141 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@147 {
+null {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@123 }
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
+    <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]
     <name not found> = EmptyList@10[empty]

compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.lazy.log

@@ -83,7 +83,6 @@ LazyJavaPackageFragment@36['lang'] {
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
@@ -99,6 +98,14 @@ ResolutionTaskHolder@60 {
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
@@ -113,8 +120,6 @@ ResolutionTaskHolder@64 {
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
 }
 
 ResolutionTaskHolder@65 {
@@ -126,12 +131,10 @@ ResolutionTaskHolder@65 {
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = EmptyList@7[empty]
+null {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@62 }
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]

compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.lazy.log

@@ -70,23 +70,16 @@ LazyJavaPackageFragment@42['test'] {
 
 ResolutionTaskHolder@53 {
     <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@59 {
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
@@ -97,9 +90,7 @@ ResolutionTaskHolder@61 {
     <name not found> = EmptyList@7[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
+ResolutionTaskHolder@60 {
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
@@ -109,3 +100,15 @@ ResolutionTaskHolder@62 {
     <name not found> = EmptyList@7[empty]
     <name not found> = EmptyList@7[empty]
 }
+
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+}

compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound.lazy.log

@@ -95,10 +95,13 @@ LazyJavaTypeParameterResolver@63 {
 
 ResolutionTaskHolder@65 {
     <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
+null {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@70 }
 }

compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.lazy.log

@@ -150,5 +150,8 @@ LazyJavaTypeParameterResolver@105 {
 ResolutionTaskHolder@107 {
     <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+}
+
+null {
     <name not found> = ArrayList@112[2] { ResolutionCandidate@109, ResolutionCandidate@111 }
 }