Updated lazy log tests

compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.lazy.log

@@ -68,74 +68,77 @@ LazyJavaPackageFragment@17['lang'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@37[empty]
 }
 
-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 }
     <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
     <name not found> = EmptyList@37[empty]
 }
 
 ResolutionTaskHolder@57 {
     <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
 }
 
-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 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
 ResolutionTaskHolder@69 {
     <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
 }
 
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[2] { ResolutionCandidate@87, ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[2] { ResolutionCandidate@87, ResolutionCandidate@88 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[2] { ResolutionCandidate@77, ResolutionCandidate@78 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[2] { ResolutionCandidate@92, ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[2] { ResolutionCandidate@92, ResolutionCandidate@93 }
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[2] { ResolutionCandidate@81, ResolutionCandidate@82 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+null {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@93[2] { ResolutionCandidate@77, ResolutionCandidate@78 }
+    <name not found> = ArrayList@94[2] { ResolutionCandidate@81, ResolutionCandidate@82 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]

compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.lazy.log

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

compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.lazy.log

@@ -62,14 +62,14 @@ LazyJavaClassifierType@34['String'] {
 
 LazyJavaClassifierType@37['String'] {
     arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@31['String']
+    classifier = JavaClassImpl@36['String']
     nullable = 'true': Boolean@39
     typeConstructor = DeserializedClassTypeConstructor@33
 }
 
 LazyJavaClassifierType@40['String'] {
     arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@36['String']
+    classifier = JavaClassImpl@31['String']
     nullable = 'true': Boolean@39
     typeConstructor = DeserializedClassTypeConstructor@33
 }
@@ -90,14 +90,14 @@ LazyJavaClassifierType@46['Throwable'] {
 
 LazyJavaClassifierType@49['Throwable'] {
     arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@48['Throwable']
+    classifier = JavaClassImpl@44['Throwable']
     nullable = 'true': Boolean@39
     typeConstructor = DeserializedClassTypeConstructor@45
 }
 
 LazyJavaClassifierType@51['Throwable'] {
     arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@44['Throwable']
+    classifier = JavaClassImpl@48['Throwable']
     nullable = 'true': Boolean@39
     typeConstructor = DeserializedClassTypeConstructor@45
 }
@@ -163,66 +163,87 @@ LazyJavaPackageFragment@65['lang'] {
     memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@91
 }
 
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
-    <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@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
 }
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <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@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
-    <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@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
 }
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
 ResolutionTaskHolder@120 {
     <name not found> = ArrayList@121[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = ArrayList@125[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+}
+
+null {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@134[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
 }

compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.lazy.log

@@ -84,14 +84,14 @@ LazyJavaClassifierType@42['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@44['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@41
 }
 
 LazyJavaClassifierType@47['Throwable'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@44['Throwable']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@41
 }
@@ -150,33 +150,36 @@ LazyJavaPackageFragment@60['lang'] {
 
 ResolutionTaskHolder@85 {
     <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@77[empty]
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <name not found> = EmptyList@77[empty]
 }
 
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+}
+
 ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@98[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[4] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
-    <name not found> = ArrayList@106[4] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
+null {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@106[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]

compiler/testData/diagnostics/tests/generics/tpAsReified/InlineableReified.lazy.log

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

compiler/testData/diagnostics/tests/generics/tpAsReified/LocalFun.lazy.log

@@ -43,10 +43,13 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@32 {
     <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+}
+
+null {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@37 }
 }

compiler/testData/diagnostics/tests/generics/tpAsReified/ReifiedClass.lazy.log

@@ -56,14 +56,14 @@ LazyJavaClassifierType@30['String'] {
 
 LazyJavaClassifierType@33['String'] {
     arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@32['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@29
 }
 
 LazyJavaClassifierType@36['String'] {
     arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@27['String']
+    classifier = JavaClassImpl@32['String']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@29
 }
@@ -84,14 +84,14 @@ LazyJavaClassifierType@42['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@44['Throwable']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@41
 }
 
 LazyJavaClassifierType@47['Throwable'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@44['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@41
 }
@@ -141,15 +141,18 @@ LazyJavaPackageFragment@59['lang'] {
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[4] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
-    <name not found> = ArrayList@82[4] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+}
+
+null {
+    <name not found> = ArrayList@82[4] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]