Updated lazy log tests

compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.lazy.log

@@ -156,15 +156,51 @@ LazyJavaTypeParameterResolver@107 {
 
 ResolutionTaskHolder@109 {
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[3] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[3] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117 }
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[3] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116 }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
@@ -179,18 +215,6 @@ ResolutionTaskHolder@119 {
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
 }
 
 ResolutionTaskHolder@120 {
@@ -202,34 +226,13 @@ ResolutionTaskHolder@120 {
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@122 {
+null {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@122[3] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116 }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]
     <name not found> = EmptyList@89[empty]

compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.lazy.log

@@ -326,49 +326,38 @@ LazyJavaPackageFragment@170['lang'] {
 
 ResolutionTaskHolder@204 {
     <name not found> = ArrayList@205[10] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
-    <name not found> = ArrayList@209[10] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
 }
 
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@212 }
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@209 {
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@216 }
+ResolutionTaskHolder@212 {
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
+}
+
+ResolutionTaskHolder@215 {
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
 }
 
 ResolutionTaskHolder@218 {
     <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@220 }
 }
 
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@224 }
+ResolutionTaskHolder@221 {
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
 }
 
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@228 }
+ResolutionTaskHolder@224 {
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
+}
+
+ResolutionTaskHolder@227 {
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
 }
 
 ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@232 }
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@236 }
-}
-
-ResolutionTaskHolder@238 {
-    <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]
@@ -378,3 +367,17 @@ ResolutionTaskHolder@238 {
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
+
+null {
+    <name not found> = ArrayList@231[10] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@223 }
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@229 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@220 }
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@217 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@211 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+}

compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.lazy.log

@@ -52,10 +52,13 @@ LazyJavaPackageFragment@20['lang'] {
 
 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 }
+}
+
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
 }

compiler/testData/diagnostics/tests/annotations/BasicAnnotations.lazy.log

@@ -66,33 +66,36 @@ LazyJavaPackageFragment@27['java'] {
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@50[empty]
     <name not found> = EmptyList@50[empty]
     <name not found> = EmptyList@50[empty]
 }
 
-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 }
+null {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@63 }
 }

compiler/testData/diagnostics/tests/annotations/ConstructorCall.lazy.log

@@ -116,14 +116,14 @@ LazyJavaClassifierType@77['A'] {
 
 LazyJavaClassifierType@80['A'] {
     arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@73['A']
+    classifier = JavaTypeParameterImpl@76['A']
     nullable = 'true': Boolean@79
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
 }
 
 LazyJavaClassifierType@82['A'] {
     arguments = ArrayList@83[empty]
-    classifier = JavaTypeParameterImpl@76['A']
+    classifier = JavaTypeParameterImpl@73['A']
     nullable = 'true': Boolean@79
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
 }
@@ -153,7 +153,7 @@ LazyJavaClassifierType@92['Annotation'] {
 
 LazyJavaClassifierType@95['Annotation'] {
     arguments = ArrayList@96[empty]
-    classifier = JavaClassImpl@89['Annotation']
+    classifier = JavaClassImpl@94['Annotation']
     memberScope = DeserializedClassMemberScope@90
     nullable = 'true': Boolean@79
     typeConstructor = DeserializedClassTypeConstructor@91
@@ -161,7 +161,7 @@ LazyJavaClassifierType@95['Annotation'] {
 
 LazyJavaClassifierType@97['Annotation'] {
     arguments = ArrayList@98[empty]
-    classifier = JavaClassImpl@94['Annotation']
+    classifier = JavaClassImpl@89['Annotation']
     memberScope = DeserializedClassMemberScope@90
     nullable = 'true': Boolean@79
     typeConstructor = DeserializedClassTypeConstructor@91
@@ -261,7 +261,7 @@ LazyJavaClassifierType@139['T'] {
 
 LazyJavaClassifierType@142['T'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaTypeParameterImpl@138['T']
+    classifier = JavaTypeParameterImpl@141['T']
     nullable = 'true': Boolean@79
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
 }
@@ -275,7 +275,7 @@ LazyJavaClassifierType@144['T'] {
 
 LazyJavaClassifierType@146['T'] {
     arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@141['T']
+    classifier = JavaTypeParameterImpl@138['T']
     nullable = 'true': Boolean@79
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
 }
@@ -398,19 +398,15 @@ LazyJavaTypeParameterResolver@223 {
 }
 
 LazyJavaTypeParameterResolver@225 {
-    resolve(JavaTypeParameterImpl@226['T']) = LazyJavaTypeParameterDescriptor@220['T']
+    resolve(JavaTypeParameterImpl@226['T']) = LazyJavaTypeParameterDescriptor@55['T']
 }
 
 LazyJavaTypeParameterResolver@227 {
-    resolve(JavaTypeParameterImpl@228['T']) = LazyJavaTypeParameterDescriptor@55['T']
+    resolve(JavaTypeParameterImpl@228['T']) = LazyJavaTypeParameterDescriptor@220['T']
 }
 
 ResolutionTaskHolder@229 {
     <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
@@ -428,168 +424,175 @@ ResolutionTaskHolder@229 {
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@239 }
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@241 {
     <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@243 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@251 }
+ResolutionTaskHolder@247 {
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@253 {
     <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@255 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@259 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@256 {
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@263 }
+ResolutionTaskHolder@259 {
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@262 {
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@265 {
     <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@267 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@271 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@268 {
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@275 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@271 {
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
     <name not found> = EmptyList@39[empty]
+}
+
+ResolutionTaskHolder@274 {
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
     <name not found> = EmptyList@39[empty]
 }
 
 ResolutionTaskHolder@277 {
     <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@279 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
 }
 
-ResolutionTaskHolder@281 {
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@283 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@280 {
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
 }
 
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@287 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
+ResolutionTaskHolder@283 {
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
+}
+
+ResolutionTaskHolder@286 {
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
 }
 
 ResolutionTaskHolder@289 {
     <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@291 }
+}
+
+ResolutionTaskHolder@292 {
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
+}
+
+ResolutionTaskHolder@295 {
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
+}
+
+null {
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@291 }
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@297 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@285 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@261 }
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@264 }
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@252 }
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@267 }
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@270 }
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@288 }
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@294 }
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@282 }
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@276 }
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@273 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@279 }
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
     <name not found> = EmptyList@39[empty]
 }
-
-ResolutionTaskHolder@293 {
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@295 }
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@299 }
-}
-
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@303 }
-}
-
-ResolutionTaskHolder@305 {
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@307 }
-}
-
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@311 }
-}
-
-ResolutionTaskHolder@313 {
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@315 }
-}
-
-ResolutionTaskHolder@317 {
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@319 }
-}

compiler/testData/diagnostics/tests/annotations/Deprecated.lazy.log

@@ -60,10 +60,13 @@ LazyJavaPackageFragment@21['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
+null {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@48 }
 }

compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.lazy.log

@@ -231,48 +231,48 @@ LazyJavaPackageFragment@110['lang'] {
 
 ResolutionTaskHolder@154 {
     <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
-    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
     <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
     <name not found> = EmptyList@40[empty]
 }
 
 ResolutionTaskHolder@166 {
     <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
+}
+
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
+}
+
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
+}
+
+ResolutionTaskHolder@175 {
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@182 {
+ResolutionTaskHolder@176 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -281,13 +281,20 @@ ResolutionTaskHolder@182 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@177 {
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@183 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
+ResolutionTaskHolder@178 {
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
@@ -298,20 +305,16 @@ ResolutionTaskHolder@183 {
     <name not found> = EmptyList@40[empty]
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@185 {
+null {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@174 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]
     <name not found> = EmptyList@40[empty]

compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.lazy.log

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

compiler/testData/diagnostics/tests/annotations/annotationInheritance.lazy.log

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

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.lazy.log

@@ -36,15 +36,18 @@ LazyJavaPackageFragment@13['java'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+null {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@36 }
 }

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.lazy.log

@@ -38,90 +38,93 @@ LazyJavaPackageFragment@15['java'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
 
-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 }
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
 }
 
 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@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@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
 }
 
 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[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[7] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[7] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
-    <name not found> = ArrayList@106[7] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
+null {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@106[7] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
 }

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.lazy.log

@@ -53,45 +53,48 @@ LazyJavaPackageFragment@18['lang'] {
 
 ResolutionTaskHolder@38 {
     <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <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@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@30[empty]
+}
+
 ResolutionTaskHolder@50 {
     <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+}
+
+ResolutionTaskHolder@53 {
+    <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]
+    <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
+null {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@40 }
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]
     <name not found> = EmptyList@30[empty]

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.lazy.log

@@ -94,66 +94,60 @@ LazyJavaPackageFragment@58['lang'] {
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@27[empty]
 }
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <name not found> = EmptyList@27[empty]
 }
 
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+}
+
 ResolutionTaskHolder@105 {
     <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
 ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@117 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -162,13 +156,42 @@ ResolutionTaskHolder@117 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@111 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@113 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -179,46 +202,26 @@ ResolutionTaskHolder@118 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@119 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@122 {
+null {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@104 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.lazy.log

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

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.lazy.log

@@ -50,116 +50,119 @@ LazyJavaPackageFragment@21['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
     <name not found> = EmptyList@37[empty]
 }
 
+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@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
 }
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+null {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@60 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
 }

compiler/testData/diagnostics/tests/annotations/kt1860-negative.lazy.log

@@ -58,5 +58,8 @@ LazyJavaPackageFragment@22['lang'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+}
+
+null {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }

compiler/testData/diagnostics/tests/annotations/kt1860-positive.lazy.log

@@ -53,25 +53,28 @@ LazyJavaPackageFragment@20['java'] {
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+null {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@45 }
 }

compiler/testData/diagnostics/tests/annotations/onExpression.lazy.log

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

compiler/testData/diagnostics/tests/annotations/onInitializer.lazy.log

@@ -72,20 +72,23 @@ LazyJavaPackageFragment@34['lang'] {
 
 ResolutionTaskHolder@51 {
     <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }
 
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+}
+
+null {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@56 }
 }

compiler/testData/diagnostics/tests/annotations/onLoops.lazy.log

@@ -34,45 +34,48 @@ LazyJavaPackageFragment@14['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[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+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 }
+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[7] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[7] { ResolutionCandidate@54, ResolutionCandidate@55, ResolutionCandidate@56, ... }
-    <name not found> = ArrayList@57[7] { ResolutionCandidate@54, ResolutionCandidate@55, ResolutionCandidate@56, ... }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
-    <name not found> = ArrayList@63[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[7] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[7] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
-    <name not found> = ArrayList@69[7] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@67[7] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
+    <name not found> = ArrayList@68[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
+    <name not found> = ArrayList@69[7] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
 }

compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.lazy.log

@@ -34,45 +34,48 @@ LazyJavaPackageFragment@14['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[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+}
+
+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 }
+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[7] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[7] { ResolutionCandidate@54, ResolutionCandidate@55, ResolutionCandidate@56, ... }
-    <name not found> = ArrayList@57[7] { ResolutionCandidate@54, ResolutionCandidate@55, ResolutionCandidate@56, ... }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
-    <name not found> = ArrayList@63[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[7] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
 }
 
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[7] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
-    <name not found> = ArrayList@69[7] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@67[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
+    <name not found> = ArrayList@68[7] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
+    <name not found> = ArrayList@69[7] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
 }

compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.lazy.log

@@ -64,12 +64,6 @@ 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]
-    <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]
@@ -78,14 +72,8 @@ ResolutionTaskHolder@45 {
     <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]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
@@ -94,36 +82,51 @@ ResolutionTaskHolder@49 {
     <name not found> = EmptyList@37[empty]
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
     <name not found> = EmptyList@37[empty]
     <name not found> = EmptyList@37[empty]
 }
 
+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[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
 }
 
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[8] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
-    <name not found> = ArrayList@78[8] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
+null {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@78[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
+    <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]
+    <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]
 }