Updated lazy log tests

compiler/testData/diagnostics/tests/functionLiterals/DanglingFunctionLiteral.lazy.log

@@ -91,10 +91,6 @@ LazyJavaPackageFragment@37['lang'] {
 
 ResolutionTaskHolder@60 {
     <name not found> = ArrayList@61[3] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[3] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64 }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
@@ -112,29 +108,14 @@ ResolutionTaskHolder@60 {
     <name not found> = EmptyList@52[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[3] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[3] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70 }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[3] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69 }
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
 }
 
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[4] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-    <name not found> = ArrayList@77[4] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[4] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
@@ -184,9 +165,31 @@ ResolutionTaskHolder@72 {
     <name not found> = EmptyList@52[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[4] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
-    <name not found> = ArrayList@83[4] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[4] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+}
+
+null {
+    <name not found> = ArrayList@80[3] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64 }
+    <name not found> = ArrayList@81[3] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69 }
+    <name not found> = ArrayList@82[4] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
+    <name not found> = ArrayList@83[4] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]
     <name not found> = EmptyList@52[empty]

compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.lazy.log

@@ -40,10 +40,6 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
@@ -61,40 +57,47 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
 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 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+null {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }

compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.lazy.log

@@ -42,10 +42,6 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <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]
@@ -63,12 +59,8 @@ ResolutionTaskHolder@34 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -86,9 +78,8 @@ ResolutionTaskHolder@38 {
     <name not found> = EmptyList@27[empty]
 }
 
-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 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -104,6 +95,22 @@ ResolutionTaskHolder@42 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <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]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -111,10 +118,6 @@ ResolutionTaskHolder@42 {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <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]
@@ -132,12 +135,8 @@ ResolutionTaskHolder@46 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -155,9 +154,8 @@ ResolutionTaskHolder@50 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -173,6 +171,22 @@ ResolutionTaskHolder@54 {
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <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]
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
@@ -180,10 +194,6 @@ ResolutionTaskHolder@54 {
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <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]
@@ -201,90 +211,83 @@ ResolutionTaskHolder@58 {
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-    <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]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
-    <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]
-    <name not found> = EmptyList@27[empty]
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
     <name not found> = EmptyList@27[empty]
     <name not found> = EmptyList@27[empty]
 }
 
 ResolutionTaskHolder@70 {
     <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <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@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <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@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <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@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+null {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@42 }
+    <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]
+    <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]
+    <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/functionLiterals/LabeledFunctionLiterals.lazy.log

@@ -42,46 +42,49 @@ LazyJavaPackageFragment@15['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
 ResolutionTaskHolder@49 {
     <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
+null {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@69[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]

compiler/testData/diagnostics/tests/functionLiterals/NoDanglingFunctionLiteralForNestedCalls.lazy.log

@@ -32,10 +32,6 @@ LazyJavaPackageFragment@11['lang'] {
 
 ResolutionTaskHolder@28 {
     <name not found> = ArrayList@29[2] { ResolutionCandidate@30, ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[2] { ResolutionCandidate@30, ResolutionCandidate@31 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -53,12 +49,8 @@ ResolutionTaskHolder@28 {
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[2] { ResolutionCandidate@35, ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[2] { ResolutionCandidate@35, ResolutionCandidate@36 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[2] { ResolutionCandidate@34, ResolutionCandidate@35 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
@@ -76,9 +68,20 @@ ResolutionTaskHolder@33 {
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+null {
+    <name not found> = ArrayList@40[2] { ResolutionCandidate@34, ResolutionCandidate@35 }
+    <name not found> = ArrayList@41[2] { ResolutionCandidate@30, ResolutionCandidate@31 }
+    <name not found> = ArrayList@42[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]

compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.lazy.log

@@ -56,34 +56,37 @@ LazyJavaPackageFragment@12['lang'] {
 
 ResolutionTaskHolder@45 {
     <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
     <name not found> = EmptyList@36[empty]
 }
 
-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 }
+null {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }

compiler/testData/diagnostics/tests/functionLiterals/functionLiteralInIf.lazy.log

@@ -2,51 +2,47 @@ LazyJavaClassDescriptor@0['AbstractCollection'] {
     defaultType = JetTypeImpl@1['AbstractCollection<1>']
     functions('add': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['add'] } // through LazyJavaClassMemberScope@5
     memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@7['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
 }
 
-LazyJavaClassDescriptor@11['AbstractSet'] {
-    defaultType = JetTypeImpl@12['AbstractSet<1>']
-    functions('add': Name@2) = ArrayList@13[1] { DeserializedSimpleFunctionDescriptor@14['add'] } // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['AbstractSet']
+LazyJavaClassDescriptor@9['AbstractSet'] {
+    defaultType = JetTypeImpl@10['AbstractSet<1>']
+    functions('add': Name@2) = ArrayList@11[1] { DeserializedSimpleFunctionDescriptor@12['add'] } // through LazyJavaClassMemberScope@13
+    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@13
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractSet']
 }
 
-LazyJavaClassDescriptor@18['HashSet'] {
-    constructors = ArrayList@19[5] { JavaConstructorDescriptor@20['<init>'], JavaConstructorDescriptor@21['<init>'], JavaConstructorDescriptor@22['<init>'], ... } // through LazyJavaClassMemberScope@23
-    defaultType = JetTypeImpl@24['HashSet<1>']
-    enumEntryIndex = LinkedHashMap@25 // through LazyJavaClassMemberScope@23
+LazyJavaClassDescriptor@16['HashSet'] {
+    constructors = ArrayList@17[5] { JavaConstructorDescriptor@18['<init>'], JavaConstructorDescriptor@19['<init>'], JavaConstructorDescriptor@20['<init>'], ... } // through LazyJavaClassMemberScope@21
+    defaultType = JetTypeImpl@22['HashSet<1>']
+    enumEntryIndex = LinkedHashMap@23 // through LazyJavaClassMemberScope@21
     functionTypeForSamInterface = null
-    functions('add': Name@7) = ArrayList@26[1] { JavaMethodDescriptor@27['add'] } // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@28 // through LazyJavaClassMemberScope@23
-    nestedClassIndex = LinkedHashMap@29 // through LazyJavaClassMemberScope@23
-    nestedClasses('add': Name@7) = null // through LazyJavaClassMemberScope@23
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@23
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@30['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@31['HashSet']
+    functions('add': Name@24) = ArrayList@25[1] { JavaMethodDescriptor@26['add'] } // through LazyJavaClassMemberScope@21
+    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@21
+    nestedClassIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@21
+    nestedClasses('add': Name@24) = null // through LazyJavaClassMemberScope@21
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@29['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@30['HashSet']
 }
 
-LazyJavaClassDescriptor@32['Serializable'] {
-    functions('add': Name@2) = EmptyList@8[empty] // through LazyJavaClassMemberScope@33
+LazyJavaClassDescriptor@31['Serializable'] {
+    functions('add': Name@2) = EmptyList@32[empty] // through LazyJavaClassMemberScope@33
     memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@33
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@33
     typeConstructor = LazyJavaClassTypeConstructor@35['Serializable']
 }
 
-LazyJavaClassTypeConstructor@10['AbstractCollection'] {
+LazyJavaClassTypeConstructor@8['AbstractCollection'] {
     parameters = ArrayList@36[1] { LazyJavaTypeParameterDescriptor@37['E'] }
     supertypes = ArrayList@38[1] { LazyJavaClassifierType@39['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@17['AbstractSet'] {
+LazyJavaClassTypeConstructor@15['AbstractSet'] {
     parameters = ArrayList@40[1] { LazyJavaTypeParameterDescriptor@41['E'] }
     supertypes = ArrayList@42[2] { LazyJavaClassifierType@43['AbstractCollection<E>'], LazyJavaClassifierType@44['Set<E>'] }
 }
 
-LazyJavaClassTypeConstructor@31['HashSet'] {
+LazyJavaClassTypeConstructor@30['HashSet'] {
     parameters = ArrayList@45[1] { LazyJavaTypeParameterDescriptor@46['E'] }
     supertypes = ArrayList@47[4] { LazyJavaClassifierType@48['AbstractSet<E>'], LazyJavaClassifierType@49['Set<E>'], LazyJavaClassifierType@50['Cloneable'], ... }
 }
@@ -61,14 +57,14 @@ LazyJavaClassifierType@43['AbstractCollection<E>'] {
     classifier = JavaClassImpl@56['AbstractCollection']
     memberScope = SubstitutingScope@57
     nullable = 'false': Boolean@58
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
 }
 
 LazyJavaClassifierType@48['AbstractSet<E>'] {
     arguments = ArrayList@59[1] { TypeProjectionImpl@60 }
     classifier = JavaClassImpl@61['AbstractSet']
     memberScope = SubstitutingScope@62
-    typeConstructor = LazyJavaClassTypeConstructor@17['AbstractSet']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractSet']
 }
 
 LazyJavaClassifierType@50['Cloneable'] {
@@ -112,119 +108,119 @@ LazyJavaClassifierType@87['E'] {
     arguments = ArrayList@88[empty]
     classifier = JavaTypeParameterImpl@89['E']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@90['E'] {
-    arguments = ArrayList@91[empty]
-    classifier = JavaTypeParameterImpl@92['E']
+LazyJavaClassifierType@91['E'] {
+    arguments = ArrayList@92[empty]
+    classifier = JavaTypeParameterImpl@93['E']
     nullable = 'false': Boolean@58
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
 }
 
-LazyJavaClassifierType@93['E'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaTypeParameterImpl@95['E']
+LazyJavaClassifierType@94['E'] {
+    arguments = ArrayList@95[empty]
+    classifier = JavaTypeParameterImpl@96['E']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@96['E'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaTypeParameterImpl@98['E']
+LazyJavaClassifierType@97['E'] {
+    arguments = ArrayList@98[empty]
+    classifier = JavaTypeParameterImpl@99['E']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@100['E'] {
     arguments = ArrayList@101[empty]
     classifier = JavaTypeParameterImpl@102['E']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@104['E'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaTypeParameterImpl@106['E']
+LazyJavaClassifierType@103['E'] {
+    arguments = ArrayList@104[empty]
+    classifier = JavaTypeParameterImpl@105['E']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@107['E'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaTypeParameterImpl@109['E']
+LazyJavaClassifierType@106['E'] {
+    arguments = ArrayList@107[empty]
+    classifier = JavaTypeParameterImpl@108['E']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
 }
 
 LazyJavaClassifierType@110['E'] {
     arguments = ArrayList@111[empty]
     classifier = JavaTypeParameterImpl@112['E']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
 }
 
 LazyJavaClassifierType@113['E'] {
     arguments = ArrayList@114[empty]
-    classifier = JavaTypeParameterImpl@112['E']
+    classifier = JavaTypeParameterImpl@105['E']
     nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@115['E'] {
     arguments = ArrayList@116[empty]
+    classifier = JavaTypeParameterImpl@89['E']
+    nullable = 'true': Boolean@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+}
+
+LazyJavaClassifierType@117['E'] {
+    arguments = ArrayList@118[empty]
+    classifier = JavaTypeParameterImpl@112['E']
+    nullable = 'true': Boolean@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
+}
+
+LazyJavaClassifierType@119['E'] {
+    arguments = ArrayList@120[empty]
+    classifier = JavaTypeParameterImpl@93['E']
+    nullable = 'true': Boolean@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+}
+
+LazyJavaClassifierType@121['E'] {
+    arguments = ArrayList@122[empty]
+    classifier = JavaTypeParameterImpl@102['E']
+    nullable = 'true': Boolean@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+}
+
+LazyJavaClassifierType@123['E'] {
+    arguments = ArrayList@124[empty]
     classifier = JavaTypeParameterImpl@85['E']
     nullable = 'true': Boolean@77
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
 }
 
-LazyJavaClassifierType@117['E'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaTypeParameterImpl@109['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
-}
-
-LazyJavaClassifierType@119['E'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaTypeParameterImpl@106['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
-}
-
-LazyJavaClassifierType@121['E'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaTypeParameterImpl@98['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@123['E'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaTypeParameterImpl@102['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
-}
-
 LazyJavaClassifierType@125['E'] {
     arguments = ArrayList@126[empty]
-    classifier = JavaTypeParameterImpl@95['E']
+    classifier = JavaTypeParameterImpl@96['E']
     nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@127['E'] {
     arguments = ArrayList@128[empty]
-    classifier = JavaTypeParameterImpl@92['E']
+    classifier = JavaTypeParameterImpl@99['E']
     nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@129['E'] {
     arguments = ArrayList@130[empty]
-    classifier = JavaTypeParameterImpl@89['E']
+    classifier = JavaTypeParameterImpl@108['E']
     nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
 }
 
 LazyJavaClassifierType@131['Object'] {
@@ -276,21 +272,19 @@ LazyJavaPackageFragmentProvider@148 {
     packageFragments('kotlin.io': FqName@167) = null
     packageFragments('kotlin.jvm': FqName@168) = null
     topLevelClasses(JavaClassImpl@56['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@61['AbstractSet']) = LazyJavaClassDescriptor@11['AbstractSet']
-    topLevelClasses(JavaClassImpl@169['HashSet']) = LazyJavaClassDescriptor@18['HashSet']
-    topLevelClasses(JavaClassImpl@138['Serializable']) = LazyJavaClassDescriptor@32['Serializable']
+    topLevelClasses(JavaClassImpl@61['AbstractSet']) = LazyJavaClassDescriptor@9['AbstractSet']
+    topLevelClasses(JavaClassImpl@169['HashSet']) = LazyJavaClassDescriptor@16['HashSet']
+    topLevelClasses(JavaClassImpl@138['Serializable']) = LazyJavaClassDescriptor@31['Serializable']
 }
 
 LazyJavaPackageFragment@150['<root>'] {
     classes('HashSet': Name@170) = null // through LazyPackageFragmentScopeForJavaPackage@171
     classes('Int': Name@172) = null // through LazyPackageFragmentScopeForJavaPackage@171
     classes('Unit': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('add': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@171
     classes('java': Name@174) = null // through LazyPackageFragmentScopeForJavaPackage@171
     deserializedPackageScope = Empty@175 // through LazyPackageFragmentScopeForJavaPackage@171
-    functions('HashSet': Name@176) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    functions('add': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    functions('java': Name@177) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('HashSet': Name@176) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('java': Name@177) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@171
     memberIndex = computeMemberIndex$1@178 // through LazyPackageFragmentScopeForJavaPackage@171
 }
 
@@ -298,35 +292,33 @@ LazyJavaPackageFragment@154['java'] {
     classes('lang': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@180
     classes('util': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@180
     deserializedPackageScope = Empty@175 // through LazyPackageFragmentScopeForJavaPackage@180
-    functions('lang': Name@182) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@180
-    functions('util': Name@183) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@180
+    functions('lang': Name@182) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@180
+    functions('util': Name@183) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@180
     memberIndex = computeMemberIndex$1@184 // through LazyPackageFragmentScopeForJavaPackage@180
 }
 
 LazyJavaPackageFragment@158['lang'] {
     classes('HashSet': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('add': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@185
     deserializedPackageScope = Empty@175 // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('HashSet': Name@176) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('add': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('HashSet': Name@176) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@185
     memberIndex = computeMemberIndex$1@186 // through LazyPackageFragmentScopeForJavaPackage@185
 }
 
 LazyJavaPackageFragment@162['util'] {
-    classes('HashSet': Name@187) = LazyJavaClassDescriptor@18['HashSet'] // through LazyPackageFragmentScopeForJavaPackage@188
+    classes('HashSet': Name@187) = LazyJavaClassDescriptor@16['HashSet'] // through LazyPackageFragmentScopeForJavaPackage@188
     deserializedPackageScope = Empty@175 // through LazyPackageFragmentScopeForJavaPackage@188
-    functions('HashSet': Name@189) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@188
+    functions('HashSet': Name@189) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@188
     memberIndex = computeMemberIndex$1@190 // through LazyPackageFragmentScopeForJavaPackage@188
 }
 
-LazyJavaTypeParameterDescriptor@37['E'] {
+LazyJavaTypeParameterDescriptor@46['E'] {
     defaultType = JetTypeImpl@191['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
     upperBounds = LinkedHashSet@192[1] { NullableType@193 }
     upperBoundsAsType = NullableType@193
 }
 
-LazyJavaTypeParameterDescriptor@46['E'] {
+LazyJavaTypeParameterDescriptor@37['E'] {
     defaultType = JetTypeImpl@194['E']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
     upperBounds = LinkedHashSet@195[1] { NullableType@196 }
@@ -335,7 +327,7 @@ LazyJavaTypeParameterDescriptor@46['E'] {
 
 LazyJavaTypeParameterDescriptor@41['E'] {
     defaultType = JetTypeImpl@197['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
 }
 
 LazyJavaTypeParameterResolver@198 {
@@ -351,9 +343,46 @@ LazyJavaTypeParameterResolver@202 {
 }
 
 LazyJavaTypeParameterResolver@204 {
-    resolve(JavaTypeParameterImpl@92['E']) = null
+    resolve(JavaTypeParameterImpl@93['E']) = null
 }
 
 LazyJavaTypeParameterResolver@205 {
-    resolve(JavaTypeParameterImpl@98['E']) = null
+    resolve(JavaTypeParameterImpl@105['E']) = null
+}
+
+ResolutionTaskHolder@206 {
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
+}
+
+ResolutionTaskHolder@209 {
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
+}
+
+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 }
+}
+
+ResolutionTaskHolder@221 {
+    <name not found> = ArrayList@222[4] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+null {
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@211 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@220 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@217 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@208 }
+    <name not found> = ArrayList@231[5] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
 }

compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.lazy.log

@@ -61,38 +61,41 @@ LazyJavaPackageFragment@13['lang'] {
 
 ResolutionTaskHolder@47 {
     <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <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@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
     <name not found> = EmptyList@38[empty]
     <name not found> = EmptyList@38[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 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
 }
 
 ResolutionTaskHolder@59 {
     <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
 }
 
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+null {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@58 }
+    <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/functionLiterals/kt2906.lazy.log

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

compiler/testData/diagnostics/tests/functionLiterals/kt4529.lazy.log

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

compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.lazy.log

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

compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabelsNonLocal.lazy.log

@@ -42,16 +42,19 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@30 {
     <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
 }
 
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+null {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@32 }
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]
     <name not found> = EmptyList@22[empty]

compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.lazy.log

@@ -37,66 +37,69 @@ LazyJavaPackageFragment@7['lang'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@17[empty]
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
     <name not found> = EmptyList@17[empty]
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }

compiler/testData/diagnostics/tests/functionLiterals/return/LocalAndNonLocalReturnInLambda.lazy.log

@@ -41,36 +41,39 @@ 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 }
 }
 
-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[7] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[7] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
-    <name not found> = ArrayList@54[7] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@54[7] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }

compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelNoParens.lazy.log

@@ -41,26 +41,29 @@ 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@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }

compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelParens.lazy.log

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

compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnHasTypeNothing.lazy.log

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

compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedFunction.lazy.log

@@ -45,36 +45,39 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@25[empty]
 }
 
-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[7] { ResolutionCandidate@50, ResolutionCandidate@51, ResolutionCandidate@52, ... }
 }
 
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[7] { ResolutionCandidate@55, ResolutionCandidate@56, ResolutionCandidate@57, ... }
-    <name not found> = ArrayList@58[7] { ResolutionCandidate@55, ResolutionCandidate@56, ResolutionCandidate@57, ... }
+null {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@58[7] { ResolutionCandidate@50, ResolutionCandidate@51, ResolutionCandidate@52, ... }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }

compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedLambda.lazy.log

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

compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.lazy.log

@@ -41,36 +41,39 @@ 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 }
 }
 
-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[7] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
 }
 
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[7] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
-    <name not found> = ArrayList@54[7] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
+null {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@54[7] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
 }

compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnit.lazy.log

@@ -45,48 +45,51 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@33 {
     <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
     <name not found> = EmptyList@25[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@25[empty]
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
     <name not found> = EmptyList@25[empty]
 }
 
+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@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[7] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
 }
 
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[7] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
-    <name not found> = ArrayList@66[7] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
+null {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@66[7] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }

compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.lazy.log

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

compiler/testData/diagnostics/tests/functionLiterals/return/MixedReturnsFromLambda.lazy.log

@@ -46,51 +46,54 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@34 {
     <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@26[empty]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <name not found> = EmptyList@26[empty]
 }
 
-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 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
 }
 
 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 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
 ResolutionTaskHolder@58 {
     <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
 }

compiler/testData/diagnostics/tests/functionLiterals/returnNull.lazy.log

@@ -33,21 +33,21 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@13['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -75,21 +75,21 @@ LazyJavaClassifierType@36['Throwable'] {
 
 LazyJavaClassifierType@39['Throwable'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -153,37 +153,40 @@ LazyJavaPackageFragment@59['lang'] {
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+}
+
+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 }
+    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
+    <name not found> = EmptyList@87[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[4] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-    <name not found> = ArrayList@114[5] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
+null {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@114[5] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]
     <name not found> = EmptyList@87[empty]

compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.lazy.log

@@ -49,21 +49,24 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@37 {
     <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@29[empty]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }