Updated lazy log tests

compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.lazy.log

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

compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeUnmappedArguments.lazy.log

@@ -46,18 +46,6 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -107,10 +95,8 @@ ResolutionTaskHolder@37 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -120,37 +106,54 @@ ResolutionTaskHolder@41 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+null {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@57 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }

compiler/testData/diagnostics/tests/resolve/nestedCalls/argumentsInParentheses.lazy.log

@@ -38,21 +38,21 @@ LazyJavaClassifierType@22['String'] {
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@24['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@28['String'] {
     arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@24['String']
+    classifier = JavaClassImpl@16['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@30['String'] {
     arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@16['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -87,14 +87,14 @@ LazyJavaClassifierType@42['Throwable'] {
 
 LazyJavaClassifierType@44['Throwable'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@34['Throwable']
+    classifier = JavaClassImpl@41['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@46['Throwable'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@41['Throwable']
+    classifier = JavaClassImpl@34['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
@@ -166,15 +166,6 @@ LazyJavaPackageFragment@61['lang'] {
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
@@ -185,169 +176,181 @@ ResolutionTaskHolder@91 {
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[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 }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
 ResolutionTaskHolder@103 {
     <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
 ResolutionTaskHolder@115 {
     <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
     <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
     <name not found> = EmptyList@83[empty]
 }
 
 ResolutionTaskHolder@127 {
     <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
     <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
     <name not found> = EmptyList@83[empty]
 }
 
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+}
+
 ResolutionTaskHolder@139 {
     <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
 }
 
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
 }
 
 ResolutionTaskHolder@151 {
     <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
 }
 
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
 }
 
 ResolutionTaskHolder@163 {
     <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
 }
 
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[4] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
 }
 
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[4] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
-    <name not found> = ArrayList@196[5] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
+null {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@196[5] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]
     <name not found> = EmptyList@83[empty]

compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.lazy.log

@@ -38,21 +38,21 @@ LazyJavaClassifierType@22['String'] {
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@16['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@28['String'] {
     arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@24['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@30['String'] {
     arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@16['String']
+    classifier = JavaClassImpl@24['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -80,14 +80,14 @@ LazyJavaClassifierType@39['Throwable'] {
 
 LazyJavaClassifierType@42['Throwable'] {
     arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@34['Throwable']
+    classifier = JavaClassImpl@41['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@44['Throwable'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@41['Throwable']
+    classifier = JavaClassImpl@34['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
@@ -152,29 +152,20 @@ LazyJavaPackageFragment@65['lang'] {
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[2] { ResolutionCandidate@103, ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[2] { ResolutionCandidate@103, ResolutionCandidate@104 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
@@ -192,9 +183,21 @@ ResolutionTaskHolder@101 {
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[4] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
-    <name not found> = ArrayList@111[5] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+null {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@110[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
+    <name not found> = ArrayList@111[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]

compiler/testData/diagnostics/tests/resolve/nestedCalls/completeUnmappedArguments.lazy.log

@@ -37,7 +37,7 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -51,7 +51,7 @@ LazyJavaClassifierType@27['String'] {
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,14 +79,14 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -141,10 +141,6 @@ LazyJavaPackageFragment@58['lang'] {
 
 ResolutionTaskHolder@77 {
     <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
-    <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]
@@ -162,12 +158,8 @@ ResolutionTaskHolder@77 {
     <name not found> = EmptyList@69[empty]
 }
 
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
@@ -185,10 +177,8 @@ ResolutionTaskHolder@81 {
     <name not found> = EmptyList@69[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@69[empty]
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
@@ -204,78 +194,91 @@ ResolutionTaskHolder@85 {
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
 }
 
 ResolutionTaskHolder@89 {
     <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
 }
 
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
 }
 
 ResolutionTaskHolder@101 {
     <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
 ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[4] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-    <name not found> = ArrayList@130[5] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
+    <name not found> = ArrayList@114[4] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
 }
 
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[8] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-    <name not found> = ArrayList@136[8] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[8] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122, ... }
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[8] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
-    <name not found> = ArrayList@142[8] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[8] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127, ... }
+}
+
+null {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@140[5] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
+    <name not found> = ArrayList@141[8] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127, ... }
+    <name not found> = ArrayList@142[8] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122, ... }
+    <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]
 }

compiler/testData/diagnostics/tests/resolve/nestedCalls/kt5971NestedSafeCall.lazy.log

@@ -38,10 +38,6 @@ 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]
     <name not found> = EmptyList@21[empty]
     <name not found> = EmptyList@21[empty]
@@ -59,12 +55,19 @@ ResolutionTaskHolder@29 {
     <name not found> = EmptyList@21[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+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 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@31 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }