Update lazy.log files

compiler/testData/diagnostics/tests/declarationChecks/ComponentFunctionReturnTypeMismatch.lazy.log

@@ -19,26 +19,26 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('String': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component1': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component2': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('component1': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('component2': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+}
+
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
 }

compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.lazy.log

@@ -29,21 +29,52 @@ LazyJavaPackageFragment@11['java'] {
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
-LazyJavaPackageFragment@13['lang'] {
-    classes('component1': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('component2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('component3': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('hasNext': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('iterator': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('next': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('plus': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('component1': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('component2': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('component3': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('hasNext': Name@31) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('iterator': Name@32) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('next': Name@33) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('plus': Name@34) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@28
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
+}
+
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[8] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
+    <name not found> = ArrayList@68[8] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
 }

compiler/testData/diagnostics/tests/declarationChecks/DataFlowInfoInMultiDecl.lazy.log

@@ -19,30 +19,71 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component1': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component2': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('equals': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('equals': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('component1': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('component2': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('equals': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('equals': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+}
+
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[2] { ResolutionCandidate@65, ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[2] { ResolutionCandidate@65, ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[2] { ResolutionCandidate@70, ResolutionCandidate@71 }
+    <name not found> = ArrayList@72[2] { ResolutionCandidate@70, ResolutionCandidate@71 }
 }

compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.lazy.log

@@ -47,3 +47,117 @@ LazyJavaPackageFragment@18['lang'] {
     functions('use': Name@39) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@37
 }
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@45[2] { ResolutionCandidate@46, ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[2] { ResolutionCandidate@46, ResolutionCandidate@47 }
+    <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]
+    <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]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+    <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@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+}
+
+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@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[2] { ResolutionCandidate@79, ResolutionCandidate@80 }
+    <name not found> = ArrayList@81[2] { ResolutionCandidate@79, ResolutionCandidate@80 }
+    <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@82 {
+    <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]
+    <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]
+    <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/declarationChecks/RedeclarationsInMultiDecl.lazy.log

@@ -18,33 +18,101 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('Int': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('component1': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('component2': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('use': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('A': Name@17) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('component1': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('component2': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('use': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('use': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('A': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('use': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('component1': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('component2': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('use': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('A': Name@17) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('component1': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('component2': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('use': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('use': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('A': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('use': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@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@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
 }

compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.lazy.log

@@ -201,46 +201,387 @@ LazyJavaPackageFragmentProvider@98 {
 }
 
 LazyJavaPackageFragment@100['<root>'] {
-    classes('f1': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('f2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foo2': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('fooPackageLocal': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('privateFunction': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('privateFunctionInner': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('privateProperty': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('privatePropertyInner': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = Empty@129 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('f1': Name@120) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('f2': Name@122) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('foo2': Name@123) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('fooPackageLocal': Name@124) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('privateFunction': Name@125) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('privateFunctionInner': Name@126) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('foo2': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('fooPackageLocal': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('privateFunction': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('privateFunctionInner': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('privateProperty': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('privatePropertyInner': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    deserializedPackageScope = Empty@127 // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('foo2': Name@120) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('fooPackageLocal': Name@122) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('privateFunction': Name@123) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('privateFunctionInner': Name@124) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    memberIndex = computeMemberIndex$1@129 // through LazyPackageFragmentScopeForJavaPackage@121
 }
 
 LazyJavaPackageFragment@105['java'] {
-    classes('lang': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = Empty@129 // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('lang': Name@134) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('lang': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@131
+    deserializedPackageScope = Empty@127 // through LazyPackageFragmentScopeForJavaPackage@131
+    functions('lang': Name@132) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@131
+    memberIndex = computeMemberIndex$1@133 // through LazyPackageFragmentScopeForJavaPackage@131
 }
 
 LazyJavaPackageFragment@107['lang'] {
-    classes('f1': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('f2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('foo2': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('fooPackageLocal': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('privateFunction': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('privateFunctionInner': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('privateProperty': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('privatePropertyInner': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    deserializedPackageScope = Empty@129 // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('f1': Name@120) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('f2': Name@122) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('foo2': Name@123) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('fooPackageLocal': Name@124) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('privateFunction': Name@125) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('privateFunctionInner': Name@126) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('foo2': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('fooPackageLocal': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('privateFunction': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('privateFunctionInner': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('privateProperty': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('privatePropertyInner': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    deserializedPackageScope = Empty@127 // through LazyPackageFragmentScopeForJavaPackage@134
+    functions('foo2': Name@120) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@134
+    functions('fooPackageLocal': Name@122) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@134
+    functions('privateFunction': Name@123) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@134
+    functions('privateFunctionInner': Name@124) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@134
+    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@134
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+}
+
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+}
+
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+}
+
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+}
+
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+    <name not found> = EmptyList@128[empty]
+    <name not found> = EmptyList@128[empty]
+}
+
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+}
+
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+}
+
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+}
+
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+}
+
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+}
+
+ResolutionTaskHolder@188 {
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+}
+
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
+}
+
+ResolutionTaskHolder@196 {
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
+}
+
+ResolutionTaskHolder@200 {
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
+}
+
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
+}
+
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+}
+
+ResolutionTaskHolder@212 {
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@214 }
+}
+
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
+}
+
+ResolutionTaskHolder@220 {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
+}
+
+ResolutionTaskHolder@224 {
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
+}
+
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
+}
+
+ResolutionTaskHolder@232 {
+    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
+    <name not found> = ArrayList@235[1] { ResolutionCandidate@234 }
+}
+
+ResolutionTaskHolder@236 {
+    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@238 }
+}
+
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
+}
+
+ResolutionTaskHolder@244 {
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
+    <name not found> = ArrayList@247[1] { ResolutionCandidate@246 }
+}
+
+ResolutionTaskHolder@248 {
+    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@250 }
+}
+
+ResolutionTaskHolder@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
+}
+
+ResolutionTaskHolder@256 {
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
+    <name not found> = ArrayList@259[1] { ResolutionCandidate@258 }
+}
+
+ResolutionTaskHolder@260 {
+    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@262 }
+}
+
+ResolutionTaskHolder@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@266 }
+}
+
+ResolutionTaskHolder@268 {
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
+    <name not found> = ArrayList@271[1] { ResolutionCandidate@270 }
+}
+
+ResolutionTaskHolder@272 {
+    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
+    <name not found> = ArrayList@275[1] { ResolutionCandidate@274 }
+}
+
+ResolutionTaskHolder@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@278 }
+}
+
+ResolutionTaskHolder@280 {
+    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
+    <name not found> = ArrayList@283[1] { ResolutionCandidate@282 }
+}
+
+ResolutionTaskHolder@284 {
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@286 }
+}
+
+ResolutionTaskHolder@288 {
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@290 }
+}
+
+ResolutionTaskHolder@292 {
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@294 }
+}
+
+ResolutionTaskHolder@296 {
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@298 }
+}
+
+ResolutionTaskHolder@300 {
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@302 }
+}
+
+ResolutionTaskHolder@304 {
+    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
+    <name not found> = ArrayList@307[1] { ResolutionCandidate@306 }
+}
+
+ResolutionTaskHolder@308 {
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@310 }
+}
+
+ResolutionTaskHolder@312 {
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
+    <name not found> = ArrayList@315[1] { ResolutionCandidate@314 }
+}
+
+ResolutionTaskHolder@316 {
+    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@318 }
+}
+
+ResolutionTaskHolder@320 {
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@322 }
+}
+
+ResolutionTaskHolder@324 {
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@326 }
+}
+
+ResolutionTaskHolder@328 {
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@330 }
+}
+
+ResolutionTaskHolder@332 {
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@334 }
+}
+
+ResolutionTaskHolder@336 {
+    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
+    <name not found> = ArrayList@339[1] { ResolutionCandidate@338 }
+}
+
+ResolutionTaskHolder@340 {
+    <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
+    <name not found> = ArrayList@343[1] { ResolutionCandidate@342 }
+}
+
+ResolutionTaskHolder@344 {
+    <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
+    <name not found> = ArrayList@347[1] { ResolutionCandidate@346 }
+}
+
+ResolutionTaskHolder@348 {
+    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
+    <name not found> = ArrayList@351[1] { ResolutionCandidate@350 }
+}
+
+ResolutionTaskHolder@352 {
+    <name not found> = ArrayList@353[1] { ResolutionCandidate@354 }
+    <name not found> = ArrayList@355[1] { ResolutionCandidate@354 }
+}
+
+ResolutionTaskHolder@356 {
+    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
+    <name not found> = ArrayList@359[1] { ResolutionCandidate@358 }
+}
+
+ResolutionTaskHolder@360 {
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
+    <name not found> = ArrayList@363[1] { ResolutionCandidate@362 }
+}
+
+ResolutionTaskHolder@364 {
+    <name not found> = ArrayList@365[1] { ResolutionCandidate@366 }
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@366 }
+}
+
+ResolutionTaskHolder@368 {
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@370 }
+    <name not found> = ArrayList@371[1] { ResolutionCandidate@370 }
+}
+
+ResolutionTaskHolder@372 {
+    <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
+    <name not found> = ArrayList@375[1] { ResolutionCandidate@374 }
+}
+
+ResolutionTaskHolder@376 {
+    <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@378 }
+}
+
+ResolutionTaskHolder@380 {
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@382 }
+    <name not found> = ArrayList@383[1] { ResolutionCandidate@382 }
+}
+
+ResolutionTaskHolder@384 {
+    <name not found> = ArrayList@385[1] { ResolutionCandidate@386 }
+    <name not found> = ArrayList@387[1] { ResolutionCandidate@386 }
+}
+
+ResolutionTaskHolder@388 {
+    <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@390 }
+}
+
+ResolutionTaskHolder@392 {
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@394 }
+    <name not found> = ArrayList@395[1] { ResolutionCandidate@394 }
 }

compiler/testData/diagnostics/tests/declarationChecks/kt1141.lazy.log

@@ -67,8 +67,14 @@ LazyJavaPackageFragment@45['java'] {
 
 LazyJavaPackageFragment@47['lang'] {
     classes('Runnable': Name@66) = LazyJavaClassDescriptor@4['Runnable'] // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('foo': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('foo': Name@68) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
 }

compiler/testData/diagnostics/tests/declarationChecks/kt1193.lazy.log

@@ -22,3 +22,8 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+}

compiler/testData/diagnostics/tests/declarationChecks/kt2142.lazy.log

@@ -21,3 +21,12 @@ LazyJavaPackageFragment@7['lang'] {
     functions('Foo': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@18
     memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@18
 }
+
+ResolutionTaskHolder@20 {
+    <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
+    <name not found> = ArrayList@23[1] { ResolutionCandidate@22 }
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+}

compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.lazy.log

@@ -47,9 +47,66 @@ LazyJavaPackageFragment@21['java'] {
 
 LazyJavaPackageFragment@23['lang'] {
     classes('component1': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('component2': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
     deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@46
     functions('component1': Name@45) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('component2': Name@47) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@46
+    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
 }

compiler/testData/diagnostics/tests/declarationChecks/kt2643MultiDeclInControlFlow.lazy.log

@@ -24,13 +24,92 @@ LazyJavaPackageFragment@7['java'] {
     memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('component1': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('component2': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('plus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('component1': Name@23) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('component2': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('plus': Name@26) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@24
+ResolutionTaskHolder@23 {
+    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
+}
+
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
+}
+
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@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@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+}
+
+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[8] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
+    <name not found> = ArrayList@92[8] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
+    <name not found> = ArrayList@98[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
 }

compiler/testData/diagnostics/tests/declarationChecks/kt559.lazy.log

@@ -33,11 +33,37 @@ LazyJavaPackageFragment@9['java'] {
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
-LazyJavaPackageFragment@11['lang'] {
-    classes('fff': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('foo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('fff': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('foo': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@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@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@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }

compiler/testData/diagnostics/tests/declarationChecks/localFunctionNoInheritVisibility.lazy.log

@@ -25,10 +25,27 @@ LazyJavaPackageFragment@9['java'] {
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('baz': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('zzz': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('zzz': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
     deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('baz': Name@23) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('zzz': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('zzz': Name@23) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
+}
+
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
+    <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@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
 }

compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.lazy.log

@@ -22,41 +22,60 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('C': Name@19) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component1': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component2': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('hasNext': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('iterator': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('next': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('C': Name@19) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component1': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component2': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('hasNext': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('iterator': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('next': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }

compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.lazy.log

@@ -30,41 +30,60 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('Double': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('Iterator': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('component1': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('component2': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('hasNext': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('iterator': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('next': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('C': Name@26) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('component1': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('component2': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('hasNext': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('iterator': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('next': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('C': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
 }
 
 LazyJavaPackageFragment@14['lang'] {
-    classes('C': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('component1': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('component2': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('hasNext': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('iterator': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('next': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('C': Name@26) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('component1': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('component2': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('hasNext': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('iterator': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('next': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('C': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('C': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }

compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.lazy.log

@@ -23,41 +23,60 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('C': Name@19) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component1': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component2': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('hasNext': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('iterator': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('next': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('C': Name@19) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component1': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component2': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('hasNext': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('iterator': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('next': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[2] { ResolutionCandidate@57, ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[2] { ResolutionCandidate@57, ResolutionCandidate@58 }
 }

compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.lazy.log

@@ -21,41 +21,92 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('C': Name@19) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component1': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component2': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('hasNext': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('iterator': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('next': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('component2': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('C': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('component2': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('C': Name@19) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component1': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component2': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('hasNext': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('iterator': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('next': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('component2': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('C': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('component2': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+}
+
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }

compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.lazy.log

@@ -24,39 +24,74 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('C': Name@19) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component1': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component2': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('hasNext': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('iterator': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('next': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('C': Name@19) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('component1': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('component2': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('C': Name@19) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component1': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component2': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('hasNext': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('iterator': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('next': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('C': Name@19) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('component1': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('component2': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+}
+
+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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[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[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }

compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.lazy.log

@@ -30,41 +30,60 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('Double': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('Iterator': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('component1': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('component2': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('hasNext': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('iterator': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('next': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('C': Name@26) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('component1': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('component2': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('hasNext': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('iterator': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('next': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('C': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
 }
 
 LazyJavaPackageFragment@14['lang'] {
-    classes('C': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('component1': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('component2': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('hasNext': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('iterator': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('next': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('C': Name@26) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('component1': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('component2': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('hasNext': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('iterator': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('next': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('C': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('C': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
 }

compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.lazy.log

@@ -22,41 +22,60 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('C': Name@19) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component1': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component2': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('hasNext': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('iterator': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('next': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('C': Name@19) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component1': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component2': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('hasNext': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('iterator': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('next': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }

compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.lazy.log

@@ -21,37 +21,55 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('hasNext': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('iterator': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('next': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('C': Name@19) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component1': Name@22) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('hasNext': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('iterator': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('next': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('hasNext': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('iterator': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('next': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('C': Name@19) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('component1': Name@22) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('hasNext': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('iterator': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('next': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }

compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.lazy.log

@@ -49,13 +49,119 @@ LazyJavaPackageFragment@16['lang'] {
     classes('Pair': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
     classes('component1': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
     classes('component2': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('plus': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('println': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('println': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@44
     deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@44
     functions('Pair': Name@43) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
     functions('component1': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
     functions('component2': Name@46) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('plus': Name@47) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('println': Name@48) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('println': Name@47) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@44
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
 }

compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.lazy.log

@@ -22,9 +22,23 @@ LazyJavaPackageFragment@8['java'] {
 
 LazyJavaPackageFragment@10['lang'] {
     classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
     deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@23
     functions('f': Name@22) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('invoke': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
+}
+
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
 }

compiler/testData/diagnostics/tests/declarationChecks/valVarFunctionParameter.lazy.log

@@ -12,26 +12,81 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('get': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('plus': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('get': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('plus': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
-LazyJavaPackageFragment@7['lang'] {
-    classes('get': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('plus': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('get': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('plus': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
+ResolutionTaskHolder@21 {
+    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
+}
+
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+}
+
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+}
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@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@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@57 {
+    <name not found> = ArrayList@58[8] { ResolutionCandidate@59, ResolutionCandidate@60, ResolutionCandidate@61, ... }
+    <name not found> = ArrayList@62[8] { ResolutionCandidate@59, ResolutionCandidate@60, ResolutionCandidate@61, ... }
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[8] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
+    <name not found> = ArrayList@68[8] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[8] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
+    <name not found> = ArrayList@74[8] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[8] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
+    <name not found> = ArrayList@80[8] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[8] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
+    <name not found> = ArrayList@86[8] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
 }