Updated lazy log tests

compiler/testData/diagnostics/tests/delegation/DelegationAndOverriding.lazy.log

@@ -45,40 +45,43 @@ LazyJavaPackageFragment@10['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 }
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+null {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@68 }
 }

compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.lazy.log

@@ -66,82 +66,85 @@ LazyJavaPackageFragment@18['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[8] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-    <name not found> = ArrayList@87[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
+null {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@87[8] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
 }

compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.lazy.log

@@ -42,19 +42,22 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+}
+
+null {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }

compiler/testData/diagnostics/tests/delegation/DelegationToJavaIface.lazy.log

@@ -85,14 +85,14 @@ LazyJavaClassifierType@88['Object'] {
 
 LazyJavaClassifierType@91['Object'] {
     arguments = ArrayList@92[empty]
-    classifier = JavaClassImpl@90['Object']
+    classifier = JavaClassImpl@86['Object']
     nullable = 'true': Boolean@83
     typeConstructor = DeserializedClassTypeConstructor@87
 }
 
 LazyJavaClassifierType@93['Object'] {
     arguments = ArrayList@94[empty]
-    classifier = JavaClassImpl@86['Object']
+    classifier = JavaClassImpl@90['Object']
     nullable = 'true': Boolean@83
     typeConstructor = DeserializedClassTypeConstructor@87
 }
@@ -164,10 +164,13 @@ LazyJavaTypeParameterResolver@134 {
 
 ResolutionTaskHolder@136 {
     <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
 }
 
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
+}
+
+null {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@141 }
 }

compiler/testData/diagnostics/tests/delegation/Delegation_ClashingFunctions.lazy.log

@@ -42,90 +42,93 @@ LazyJavaPackageFragment@15['java'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
 ResolutionTaskHolder@64 {
     <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
 ResolutionTaskHolder@76 {
     <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+ResolutionTaskHolder@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 }
-}
-
-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 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+null {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@72 }
 }

compiler/testData/diagnostics/tests/delegation/Delegation_Hierarchy.lazy.log

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

compiler/testData/diagnostics/tests/delegation/Delegation_MultipleDelegates.lazy.log

@@ -44,15 +44,18 @@ LazyJavaPackageFragment@14['java'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+}
+
+null {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@40 }
 }

compiler/testData/diagnostics/tests/delegation/Delegation_ScopeInitializationOrder.lazy.log

@@ -23,5 +23,8 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@23 {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
+}
+
+null {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
 }