Updated lazy log tests

compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.lazy.log

@@ -43,9 +43,12 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[2] { ResolutionCandidate@33, ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[2] { ResolutionCandidate@33, ResolutionCandidate@34 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+null {
+    <name not found> = ArrayList@35[2] { ResolutionCandidate@33, ResolutionCandidate@34 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }

compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.lazy.log

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

compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.lazy.log

@@ -63,14 +63,14 @@ LazyJavaClassifierType@36['String'] {
 
 LazyJavaClassifierType@39['String'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@38['String']
+    classifier = JavaClassImpl@29['String']
     nullable = 'true': Boolean@41
     typeConstructor = DeserializedClassTypeConstructor@23
 }
 
 LazyJavaClassifierType@42['String'] {
     arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@35['String']
+    classifier = JavaClassImpl@32['String']
     nullable = 'true': Boolean@41
     typeConstructor = DeserializedClassTypeConstructor@23
 }
@@ -84,14 +84,14 @@ LazyJavaClassifierType@44['String'] {
 
 LazyJavaClassifierType@46['String'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@32['String']
+    classifier = JavaClassImpl@38['String']
     nullable = 'true': Boolean@41
     typeConstructor = DeserializedClassTypeConstructor@23
 }
 
 LazyJavaClassifierType@48['String'] {
     arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@29['String']
+    classifier = JavaClassImpl@35['String']
     nullable = 'true': Boolean@41
     typeConstructor = DeserializedClassTypeConstructor@23
 }
@@ -137,70 +137,73 @@ LazyJavaPackageFragment@59['java'] {
 
 ResolutionTaskHolder@82 {
     <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
 }
 
 ResolutionTaskHolder@94 {
     <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
 ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@107[5] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
 }
 
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[5] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
 }
 
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[5] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = ArrayList@119[5] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[5] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[5] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = ArrayList@125[5] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[5] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
 }
 
 ResolutionTaskHolder@126 {
     <name not found> = ArrayList@127[5] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
-    <name not found> = ArrayList@131[5] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[5] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
-    <name not found> = ArrayList@137[5] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[5] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
 }
 
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[5] { ResolutionCandidate@140, ResolutionCandidate@141, ResolutionCandidate@142, ... }
-    <name not found> = ArrayList@143[5] { ResolutionCandidate@140, ResolutionCandidate@141, ResolutionCandidate@142, ... }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[5] { ResolutionCandidate@146, ResolutionCandidate@147, ResolutionCandidate@148, ... }
-    <name not found> = ArrayList@149[5] { ResolutionCandidate@146, ResolutionCandidate@147, ResolutionCandidate@148, ... }
+null {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@144[5] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
+    <name not found> = ArrayList@145[5] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
+    <name not found> = ArrayList@146[5] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
+    <name not found> = ArrayList@147[5] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
+    <name not found> = ArrayList@148[5] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
+    <name not found> = ArrayList@149[5] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
 }

compiler/testData/diagnostics/tests/varargs/NilaryVsVararg.lazy.log

@@ -42,39 +42,42 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <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@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[2] { ResolutionCandidate@50, ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[2] { ResolutionCandidate@50, ResolutionCandidate@51 }
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[2] { ResolutionCandidate@46, ResolutionCandidate@47 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+null {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@50[2] { ResolutionCandidate@46, ResolutionCandidate@47 }
+    <name not found> = ArrayList@51[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
+    <name not found> = ArrayList@52[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
+    <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]

compiler/testData/diagnostics/tests/varargs/UnaryVsVararg.lazy.log

@@ -42,30 +42,33 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <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@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+null {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@46[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
+    <name not found> = ArrayList@47[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
+    <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]

compiler/testData/diagnostics/tests/varargs/kt1781.lazy.log

@@ -56,16 +56,19 @@ LazyJavaPackageFragment@22['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[2] { ResolutionCandidate@44, ResolutionCandidate@45 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+null {
+    <name not found> = ArrayList@46[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
+    <name not found> = ArrayList@47[2] { ResolutionCandidate@44, ResolutionCandidate@45 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]

compiler/testData/diagnostics/tests/varargs/kt1835.lazy.log

@@ -37,14 +37,14 @@ LazyJavaClassifierType@25['String'] {
 
 LazyJavaClassifierType@28['String'] {
     arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@27['String']
+    classifier = JavaClassImpl@22['String']
     nullable = 'true': Boolean@30
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@31['String'] {
     arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@22['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@30
     typeConstructor = DeserializedClassTypeConstructor@24
 }
@@ -90,42 +90,45 @@ LazyJavaPackageFragment@41['lang'] {
 
 ResolutionTaskHolder@63 {
     <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[2] { ResolutionCandidate@77, ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[2] { ResolutionCandidate@77, ResolutionCandidate@78 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[2] { ResolutionCandidate@74, ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[2] { ResolutionCandidate@78, ResolutionCandidate@79 }
 }
 
 ResolutionTaskHolder@80 {
     <name not found> = ArrayList@81[2] { ResolutionCandidate@82, ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[2] { ResolutionCandidate@82, ResolutionCandidate@83 }
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[2] { ResolutionCandidate@87, ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[2] { ResolutionCandidate@87, ResolutionCandidate@88 }
+null {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@87[2] { ResolutionCandidate@74, ResolutionCandidate@75 }
+    <name not found> = ArrayList@88[2] { ResolutionCandidate@78, ResolutionCandidate@79 }
+    <name not found> = ArrayList@89[2] { ResolutionCandidate@82, ResolutionCandidate@83 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
 }

compiler/testData/diagnostics/tests/varargs/kt1838-param.lazy.log

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

compiler/testData/diagnostics/tests/varargs/kt1838-val.lazy.log

@@ -35,7 +35,10 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+null {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
     <name not found> = EmptyList@25[empty]
 }

compiler/testData/diagnostics/tests/varargs/kt422.lazy.log

@@ -53,50 +53,53 @@ LazyJavaPackageFragment@14['lang'] {
 
 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 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
 }
 
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
 }
 
-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[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[2] { ResolutionCandidate@55, ResolutionCandidate@56 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[2] { ResolutionCandidate@65, ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[2] { ResolutionCandidate@65, ResolutionCandidate@66 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[2] { ResolutionCandidate@59, ResolutionCandidate@60 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[3] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[3] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[3] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+null {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@71[2] { ResolutionCandidate@55, ResolutionCandidate@56 }
+    <name not found> = ArrayList@72[2] { ResolutionCandidate@59, ResolutionCandidate@60 }
+    <name not found> = ArrayList@73[3] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]

compiler/testData/diagnostics/tests/varargs/varargsAndFunctionLiterals.lazy.log

@@ -38,34 +38,37 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@29 {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]