Updated lazy log tests

compiler/testData/diagnostics/tests/labels/kt1703.lazy.log

@@ -68,93 +68,96 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[16] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
-    <name not found> = ArrayList@51[16] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
     <name not found> = EmptyList@38[empty]
 }
 
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+}
+
 ResolutionTaskHolder@71 {
     <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
 }
 
 ResolutionTaskHolder@83 {
     <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+null {
+    <name not found> = ArrayList@95[16] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@82 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
 }

compiler/testData/diagnostics/tests/labels/kt361.lazy.log

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

compiler/testData/diagnostics/tests/labels/kt3920.lazy.log

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

compiler/testData/diagnostics/tests/labels/kt3988.lazy.log

@@ -59,15 +59,6 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
@@ -78,21 +69,33 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+}
+
+null {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }

compiler/testData/diagnostics/tests/labels/kt4247.lazy.log

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

compiler/testData/diagnostics/tests/labels/kt4586.lazy.log

@@ -192,84 +192,84 @@ LazyJavaClassifierType@120['AbstractStringBuilder'] {
 
 LazyJavaClassifierType@123['AbstractStringBuilder'] {
     arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@119['AbstractStringBuilder']
+    classifier = JavaClassImpl@110['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@126['AbstractStringBuilder'] {
     arguments = ArrayList@127[empty]
-    classifier = JavaClassImpl@89['AbstractStringBuilder']
+    classifier = JavaClassImpl@116['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@128['AbstractStringBuilder'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaClassImpl@95['AbstractStringBuilder']
+    classifier = JavaClassImpl@119['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@130['AbstractStringBuilder'] {
     arguments = ArrayList@131[empty]
-    classifier = JavaClassImpl@101['AbstractStringBuilder']
+    classifier = JavaClassImpl@85['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@132['AbstractStringBuilder'] {
     arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@107['AbstractStringBuilder']
+    classifier = JavaClassImpl@92['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@134['AbstractStringBuilder'] {
     arguments = ArrayList@135[empty]
-    classifier = JavaClassImpl@92['AbstractStringBuilder']
+    classifier = JavaClassImpl@89['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@136['AbstractStringBuilder'] {
     arguments = ArrayList@137[empty]
-    classifier = JavaClassImpl@110['AbstractStringBuilder']
+    classifier = JavaClassImpl@122['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@138['AbstractStringBuilder'] {
     arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@122['AbstractStringBuilder']
+    classifier = JavaClassImpl@104['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@140['AbstractStringBuilder'] {
     arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@85['AbstractStringBuilder']
+    classifier = JavaClassImpl@98['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@142['AbstractStringBuilder'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaClassImpl@116['AbstractStringBuilder']
+    classifier = JavaClassImpl@101['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@144['AbstractStringBuilder'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaClassImpl@104['AbstractStringBuilder']
+    classifier = JavaClassImpl@107['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@146['AbstractStringBuilder'] {
     arguments = ArrayList@147[empty]
-    classifier = JavaClassImpl@98['AbstractStringBuilder']
+    classifier = JavaClassImpl@95['AbstractStringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
@@ -324,14 +324,14 @@ LazyJavaClassifierType@163['Appendable'] {
 
 LazyJavaClassifierType@165['Appendable'] {
     arguments = ArrayList@166[empty]
-    classifier = JavaClassImpl@162['Appendable']
+    classifier = JavaClassImpl@156['Appendable']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
 }
 
 LazyJavaClassifierType@167['Appendable'] {
     arguments = ArrayList@168[empty]
-    classifier = JavaClassImpl@156['Appendable']
+    classifier = JavaClassImpl@162['Appendable']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
 }
@@ -401,49 +401,49 @@ LazyJavaClassifierType@193['CharSequence'] {
 
 LazyJavaClassifierType@196['CharSequence'] {
     arguments = ArrayList@197[empty]
-    classifier = JavaClassImpl@192['CharSequence']
+    classifier = JavaClassImpl@189['CharSequence']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@172
 }
 
 LazyJavaClassifierType@198['CharSequence'] {
     arguments = ArrayList@199[empty]
-    classifier = JavaClassImpl@195['CharSequence']
+    classifier = JavaClassImpl@180['CharSequence']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@172
 }
 
 LazyJavaClassifierType@200['CharSequence'] {
     arguments = ArrayList@201[empty]
-    classifier = JavaClassImpl@186['CharSequence']
+    classifier = JavaClassImpl@177['CharSequence']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@172
 }
 
 LazyJavaClassifierType@202['CharSequence'] {
     arguments = ArrayList@203[empty]
-    classifier = JavaClassImpl@189['CharSequence']
+    classifier = JavaClassImpl@195['CharSequence']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@172
 }
 
 LazyJavaClassifierType@204['CharSequence'] {
     arguments = ArrayList@205[empty]
-    classifier = JavaClassImpl@177['CharSequence']
+    classifier = JavaClassImpl@186['CharSequence']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@172
 }
 
 LazyJavaClassifierType@206['CharSequence'] {
     arguments = ArrayList@207[empty]
-    classifier = JavaClassImpl@183['CharSequence']
+    classifier = JavaClassImpl@192['CharSequence']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@172
 }
 
 LazyJavaClassifierType@208['CharSequence'] {
     arguments = ArrayList@209[empty]
-    classifier = JavaClassImpl@180['CharSequence']
+    classifier = JavaClassImpl@183['CharSequence']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@172
 }
@@ -545,14 +545,14 @@ LazyJavaClassifierType@244['String'] {
 
 LazyJavaClassifierType@247['String'] {
     arguments = ArrayList@248[empty]
-    classifier = JavaClassImpl@233['String']
+    classifier = JavaClassImpl@240['String']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@234
 }
 
 LazyJavaClassifierType@249['String'] {
     arguments = ArrayList@250[empty]
-    classifier = JavaClassImpl@240['String']
+    classifier = JavaClassImpl@246['String']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@234
 }
@@ -566,14 +566,14 @@ LazyJavaClassifierType@251['String'] {
 
 LazyJavaClassifierType@253['String'] {
     arguments = ArrayList@254[empty]
-    classifier = JavaClassImpl@243['String']
+    classifier = JavaClassImpl@233['String']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@234
 }
 
 LazyJavaClassifierType@255['String'] {
     arguments = ArrayList@256[empty]
-    classifier = JavaClassImpl@246['String']
+    classifier = JavaClassImpl@243['String']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@234
 }
@@ -594,14 +594,14 @@ LazyJavaClassifierType@260['StringBuffer'] {
 
 LazyJavaClassifierType@263['StringBuffer'] {
     arguments = ArrayList@264[empty]
-    classifier = JavaClassImpl@259['StringBuffer']
+    classifier = JavaClassImpl@262['StringBuffer']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@41['StringBuffer']
 }
 
 LazyJavaClassifierType@265['StringBuffer'] {
     arguments = ArrayList@266[empty]
-    classifier = JavaClassImpl@262['StringBuffer']
+    classifier = JavaClassImpl@259['StringBuffer']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@41['StringBuffer']
 }
@@ -713,105 +713,105 @@ LazyJavaClassifierType@309['StringBuilder'] {
 
 LazyJavaClassifierType@312['StringBuilder'] {
     arguments = ArrayList@313[empty]
-    classifier = JavaClassImpl@308['StringBuilder']
+    classifier = JavaClassImpl@299['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@314['StringBuilder'] {
     arguments = ArrayList@315[empty]
-    classifier = JavaClassImpl@272['StringBuilder']
+    classifier = JavaClassImpl@275['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@316['StringBuilder'] {
     arguments = ArrayList@317[empty]
-    classifier = JavaClassImpl@281['StringBuilder']
+    classifier = JavaClassImpl@269['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@318['StringBuilder'] {
     arguments = ArrayList@319[empty]
-    classifier = JavaClassImpl@311['StringBuilder']
+    classifier = JavaClassImpl@305['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@320['StringBuilder'] {
     arguments = ArrayList@321[empty]
-    classifier = JavaClassImpl@299['StringBuilder']
+    classifier = JavaClassImpl@290['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@322['StringBuilder'] {
     arguments = ArrayList@323[empty]
-    classifier = JavaClassImpl@284['StringBuilder']
+    classifier = JavaClassImpl@302['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@324['StringBuilder'] {
     arguments = ArrayList@325[empty]
-    classifier = JavaClassImpl@275['StringBuilder']
+    classifier = JavaClassImpl@296['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@326['StringBuilder'] {
     arguments = ArrayList@327[empty]
-    classifier = JavaClassImpl@269['StringBuilder']
+    classifier = JavaClassImpl@278['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@328['StringBuilder'] {
     arguments = ArrayList@329[empty]
-    classifier = JavaClassImpl@302['StringBuilder']
+    classifier = JavaClassImpl@284['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@330['StringBuilder'] {
     arguments = ArrayList@331[empty]
-    classifier = JavaClassImpl@305['StringBuilder']
+    classifier = JavaClassImpl@287['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@332['StringBuilder'] {
     arguments = ArrayList@333[empty]
-    classifier = JavaClassImpl@293['StringBuilder']
+    classifier = JavaClassImpl@311['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@334['StringBuilder'] {
     arguments = ArrayList@335[empty]
-    classifier = JavaClassImpl@278['StringBuilder']
+    classifier = JavaClassImpl@308['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@336['StringBuilder'] {
     arguments = ArrayList@337[empty]
-    classifier = JavaClassImpl@287['StringBuilder']
+    classifier = JavaClassImpl@272['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@338['StringBuilder'] {
     arguments = ArrayList@339[empty]
-    classifier = JavaClassImpl@290['StringBuilder']
+    classifier = JavaClassImpl@293['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@340['StringBuilder'] {
     arguments = ArrayList@341[empty]
-    classifier = JavaClassImpl@296['StringBuilder']
+    classifier = JavaClassImpl@281['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
@@ -882,39 +882,34 @@ LazyJavaPackageFragment@353['lang'] {
 
 ResolutionTaskHolder@380 {
     <name not found> = ArrayList@381[13] { ResolutionCandidate@382, ResolutionCandidate@383, ResolutionCandidate@384, ... }
-    <name not found> = ArrayList@385[14] { ResolutionCandidate@382, ResolutionCandidate@383, ResolutionCandidate@386, ... }
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+}
+
+ResolutionTaskHolder@385 {
+    <name not found> = ArrayList@386[13] { ResolutionCandidate@387, ResolutionCandidate@388, ResolutionCandidate@389, ... }
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+}
+
+ResolutionTaskHolder@390 {
+    <name not found> = ArrayList@391[13] { ResolutionCandidate@392, ResolutionCandidate@393, ResolutionCandidate@394, ... }
+}
+
+ResolutionTaskHolder@395 {
+    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@387 {
-    <name not found> = ArrayList@388[13] { ResolutionCandidate@389, ResolutionCandidate@390, ResolutionCandidate@391, ... }
-    <name not found> = ArrayList@392[14] { ResolutionCandidate@389, ResolutionCandidate@390, ResolutionCandidate@393, ... }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@394 {
-    <name not found> = ArrayList@395[13] { ResolutionCandidate@396, ResolutionCandidate@397, ResolutionCandidate@398, ... }
-    <name not found> = ArrayList@399[14] { ResolutionCandidate@396, ResolutionCandidate@397, ResolutionCandidate@400, ... }
-}
-
-ResolutionTaskHolder@401 {
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@403 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@398 {
+    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
@@ -924,62 +919,70 @@ ResolutionTaskHolder@401 {
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@405 {
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@407 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@401 {
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@409 {
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@411 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+ResolutionTaskHolder@404 {
+    <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
+ResolutionTaskHolder@407 {
+    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
+}
+
+ResolutionTaskHolder@410 {
+    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
+}
+
 ResolutionTaskHolder@413 {
     <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@415 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
+}
+
+ResolutionTaskHolder@416 {
+    <name not found> = ArrayList@417[1] { ResolutionCandidate@418 }
+}
+
+ResolutionTaskHolder@419 {
+    <name not found> = ArrayList@420[4] { ResolutionCandidate@421, ResolutionCandidate@422, ResolutionCandidate@423, ... }
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
 }
 
-ResolutionTaskHolder@417 {
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@419 }
-}
-
-ResolutionTaskHolder@421 {
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@423 }
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@423 }
-}
-
-ResolutionTaskHolder@425 {
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@427 }
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@427 }
-}
-
-ResolutionTaskHolder@429 {
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@431 }
-}
-
-ResolutionTaskHolder@433 {
-    <name not found> = ArrayList@434[4] { ResolutionCandidate@435, ResolutionCandidate@436, ResolutionCandidate@437, ... }
-    <name not found> = ArrayList@438[4] { ResolutionCandidate@435, ResolutionCandidate@436, ResolutionCandidate@437, ... }
+null {
+    <name not found> = ArrayList@424[14] { ResolutionCandidate@382, ResolutionCandidate@383, ResolutionCandidate@425, ... }
+    <name not found> = ArrayList@426[14] { ResolutionCandidate@387, ResolutionCandidate@388, ResolutionCandidate@427, ... }
+    <name not found> = ArrayList@428[14] { ResolutionCandidate@392, ResolutionCandidate@393, ResolutionCandidate@429, ... }
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@406 }
+    <name not found> = ArrayList@431[1] { ResolutionCandidate@397 }
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@412 }
+    <name not found> = ArrayList@433[1] { ResolutionCandidate@403 }
+    <name not found> = ArrayList@434[1] { ResolutionCandidate@400 }
+    <name not found> = ArrayList@435[1] { ResolutionCandidate@415 }
+    <name not found> = ArrayList@436[1] { ResolutionCandidate@418 }
+    <name not found> = ArrayList@437[1] { ResolutionCandidate@409 }
+    <name not found> = ArrayList@438[4] { ResolutionCandidate@421, ResolutionCandidate@422, ResolutionCandidate@423, ... }
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]
     <name not found> = EmptyList@11[empty]

compiler/testData/diagnostics/tests/labels/kt591.lazy.log

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

compiler/testData/diagnostics/tests/labels/labelReferencesInsideObjectExpressions.lazy.log

@@ -30,10 +30,13 @@ LazyJavaPackageFragment@10['java'] {
 
 ResolutionTaskHolder@26 {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
 }
 
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+}
+
+null {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@31 }
 }

compiler/testData/diagnostics/tests/labels/labelsMustBeNamed.lazy.log

@@ -54,53 +54,56 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@40 {
     <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
     <name not found> = EmptyList@32[empty]
     <name not found> = EmptyList@32[empty]
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
 }
 
 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@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
 }
 
 ResolutionTaskHolder@63 {
     <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+null {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }