Update lazy.log files

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.lazy.log

@@ -141,10 +141,87 @@ LazyJavaPackageFragment@6['reflect'] {
     classes('KFunction0': Name@60) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@61
 }
 
-TypeDeserializer@62 {
-    classDescriptors('2': Integer@63) = DeserializedClassDescriptor@64['Any']
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }
 
-TypeDeserializer@65 {
-    classDescriptors('4': Integer@66) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+}
+
+TypeDeserializer@76 {
+    classDescriptors('2': Integer@77) = DeserializedClassDescriptor@78['Any']
+}
+
+TypeDeserializer@79 {
+    classDescriptors('4': Integer@80) = DeserializedClassDescriptor@2['Function0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.lazy.log

@@ -102,3 +102,31 @@ LazyJavaPackageFragment@16['lang'] {
     functions('foo': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@60
     memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@60
 }
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[2] { ResolutionCandidate@72, ResolutionCandidate@73 }
+    <name not found> = ArrayList@74[2] { ResolutionCandidate@72, ResolutionCandidate@73 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[2] { ResolutionCandidate@77, ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[2] { ResolutionCandidate@77, ResolutionCandidate@78 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+}

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.lazy.log

@@ -91,77 +91,170 @@ LazyJavaPackageFragmentProvider@43 {
 }
 
 LazyJavaPackageFragment@45['<root>'] {
-    classes('foo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('foo': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
 LazyJavaPackageFragment@55['io'] {
-    classes('foo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = DeserializedPackageMemberScope@67 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('foo': Name@61) = EmptyList@64[empty] // through DeserializedPackageMemberScope@67
-    functions('foo': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@66
-    membersProtos = LinkedHashMap@69 // through DeserializedPackageMemberScope@67
-    properties('A': Name@70) = EmptyList@64[empty] // through DeserializedPackageMemberScope@67
-    properties('foo': Name@61) = EmptyList@64[empty] // through DeserializedPackageMemberScope@67
+    deserializedPackageScope = DeserializedPackageMemberScope@63 // through LazyPackageFragmentScopeForJavaPackage@64
+    membersProtos = LinkedHashMap@65 // through DeserializedPackageMemberScope@63
+    properties('A': Name@66) = EmptyList@67[empty] // through DeserializedPackageMemberScope@63
 }
 
 LazyJavaPackageFragment@48['java'] {
-    classes('lang': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('lang': Name@73) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('lang': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('lang': Name@70) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@69
 }
 
 LazyJavaPackageFragment@58['jvm'] {
-    classes('foo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('foo': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
+    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@72
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    classes('Any': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('ExtensionFunction0': Name@79) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('foo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('io': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('jvm': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = DeserializedPackageMemberScope@82 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('foo': Name@61) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
-    functions('foo': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('io': Name@83) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
-    functions('io': Name@83) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('jvm': Name@84) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
-    functions('jvm': Name@84) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@78
-    membersProtos = LinkedHashMap@86 // through DeserializedPackageMemberScope@82
-    properties('A': Name@70) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
-    properties('foo': Name@61) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
-    properties('io': Name@83) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
-    properties('jvm': Name@84) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
+    classes('Any': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('ExtensionFunction0': Name@75) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('io': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('jvm': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    deserializedPackageScope = DeserializedPackageMemberScope@78 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('io': Name@79) = EmptyList@67[empty] // through DeserializedPackageMemberScope@78
+    functions('io': Name@79) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('jvm': Name@80) = EmptyList@67[empty] // through DeserializedPackageMemberScope@78
+    functions('jvm': Name@80) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@74
+    membersProtos = LinkedHashMap@82 // through DeserializedPackageMemberScope@78
+    properties('A': Name@66) = EmptyList@67[empty] // through DeserializedPackageMemberScope@78
+    properties('io': Name@79) = EmptyList@67[empty] // through DeserializedPackageMemberScope@78
+    properties('jvm': Name@80) = EmptyList@67[empty] // through DeserializedPackageMemberScope@78
 }
 
 LazyJavaPackageFragment@50['lang'] {
-    classes('foo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('foo': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
 LazyJavaPackageFragment@15['reflect'] {
-    classes('KMemberFunction0': Name@89) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@90
+    classes('KMemberFunction0': Name@84) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
-NestedClassDescriptors@91 {
+NestedClassDescriptors@86 {
     findNestedClass('invoke': Name@9) = null
 }
 
-TypeDeserializer@92 {
-    classDescriptors('2': Integer@93) = DeserializedClassDescriptor@94['Any']
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
 }
 
-TypeDeserializer@95 {
-    classDescriptors('4': Integer@96) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+TypeDeserializer@111 {
+    classDescriptors('2': Integer@112) = DeserializedClassDescriptor@113['Any']
+}
+
+TypeDeserializer@114 {
+    classDescriptors('4': Integer@115) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.lazy.log

@@ -69,67 +69,117 @@ LazyJavaPackageFragment@32['io'] {
     memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
     membersProtos = LinkedHashMap@52 // through DeserializedPackageMemberScope@50
     properties('A': Name@41) = EmptyList@46[empty] // through DeserializedPackageMemberScope@50
-    properties('x': Name@53) = EmptyList@46[empty] // through DeserializedPackageMemberScope@50
 }
 
 LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('lang': Name@56) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('lang': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@54
+    functions('lang': Name@55) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@54
+    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
 }
 
 LazyJavaPackageFragment@36['jvm'] {
-    classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('A': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@57
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@57
+    functions('A': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@57
+    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@57
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('Any': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('Function0': Name@62) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('io': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('jvm': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('reflect': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = DeserializedPackageMemberScope@66 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('A': Name@41) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
-    functions('A': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('io': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
-    functions('io': Name@67) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('jvm': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
-    functions('jvm': Name@68) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('reflect': Name@69) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
-    functions('reflect': Name@69) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@60
-    membersProtos = LinkedHashMap@71 // through DeserializedPackageMemberScope@66
-    properties('A': Name@41) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
-    properties('io': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
-    properties('jvm': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
-    properties('reflect': Name@69) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
-    properties('x': Name@53) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
+    classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('Any': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('Function0': Name@61) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('io': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('jvm': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('reflect': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    deserializedPackageScope = DeserializedPackageMemberScope@65 // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('A': Name@41) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
+    functions('A': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('io': Name@66) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
+    functions('io': Name@66) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('jvm': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
+    functions('jvm': Name@67) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('reflect': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
+    functions('reflect': Name@68) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@59
+    membersProtos = LinkedHashMap@70 // through DeserializedPackageMemberScope@65
+    properties('A': Name@41) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
+    properties('io': Name@66) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
+    properties('jvm': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
+    properties('reflect': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('A': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@71
+    functions('A': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@71
+    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@74) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('KFunction0': Name@76) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('KFunction0': Name@73) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@74
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('KFunction0': Name@75) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@74
 }
 
-TypeDeserializer@78 {
-    classDescriptors('2': Integer@79) = DeserializedClassDescriptor@80['Any']
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
 }
 
-TypeDeserializer@81 {
-    classDescriptors('3': Integer@82) = DeserializedClassDescriptor@80['Any']
-    classDescriptors('4': Integer@83) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+}
+
+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 }
+}
+
+TypeDeserializer@93 {
+    classDescriptors('2': Integer@94) = DeserializedClassDescriptor@95['Any']
+}
+
+TypeDeserializer@96 {
+    classDescriptors('3': Integer@97) = DeserializedClassDescriptor@95['Any']
+    classDescriptors('4': Integer@98) = DeserializedClassDescriptor@2['Function0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.lazy.log

@@ -79,77 +79,125 @@ LazyJavaPackageFragment@34['io'] {
     membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
     properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
     properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    properties('y': Name@59) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
 }
 
 LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('lang': Name@62) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('lang': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@39['jvm'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Any': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Function0': Name@68) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('io': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('jvm': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('reflect': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = DeserializedPackageMemberScope@72 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('io': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('io': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('jvm': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('jvm': Name@74) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('reflect': Name@75) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('reflect': Name@75) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@66
-    membersProtos = LinkedHashMap@77 // through DeserializedPackageMemberScope@72
-    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('io': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('jvm': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('reflect': Name@75) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('y': Name@59) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Function0': Name@66) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('io': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('reflect': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('io': Name@71) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('jvm': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('reflect': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@64
+    membersProtos = LinkedHashMap@75 // through DeserializedPackageMemberScope@70
+    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@80) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('KFunction0': Name@82) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('KFunction0': Name@78) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('KFunction0': Name@80) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-TypeDeserializer@84 {
-    classDescriptors('2': Integer@85) = DeserializedClassDescriptor@86['Any']
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
 }
 
-TypeDeserializer@87 {
-    classDescriptors('3': Integer@88) = DeserializedClassDescriptor@86['Any']
-    classDescriptors('4': Integer@89) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+}
+
+TypeDeserializer@98 {
+    classDescriptors('2': Integer@99) = DeserializedClassDescriptor@100['Any']
+}
+
+TypeDeserializer@101 {
+    classDescriptors('3': Integer@102) = DeserializedClassDescriptor@100['Any']
+    classDescriptors('4': Integer@103) = DeserializedClassDescriptor@2['Function0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.lazy.log

@@ -79,77 +79,257 @@ LazyJavaPackageFragment@34['io'] {
     membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
     properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
     properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    properties('y': Name@59) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
 }
 
 LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('lang': Name@62) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('lang': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@39['jvm'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Any': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Function0': Name@68) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('io': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('jvm': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('reflect': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = DeserializedPackageMemberScope@72 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('io': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('io': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('jvm': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('jvm': Name@74) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('reflect': Name@75) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('reflect': Name@75) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@66
-    membersProtos = LinkedHashMap@77 // through DeserializedPackageMemberScope@72
-    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('io': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('jvm': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('reflect': Name@75) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('y': Name@59) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Function0': Name@66) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('io': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('reflect': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('io': Name@71) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('jvm': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('reflect': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@64
+    membersProtos = LinkedHashMap@75 // through DeserializedPackageMemberScope@70
+    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@80) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('KFunction0': Name@82) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('KFunction0': Name@78) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('KFunction0': Name@80) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-TypeDeserializer@84 {
-    classDescriptors('2': Integer@85) = DeserializedClassDescriptor@86['Any']
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
 }
 
-TypeDeserializer@87 {
-    classDescriptors('3': Integer@88) = DeserializedClassDescriptor@86['Any']
-    classDescriptors('4': Integer@89) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+}
+
+TypeDeserializer@114 {
+    classDescriptors('2': Integer@115) = DeserializedClassDescriptor@116['Any']
+}
+
+TypeDeserializer@117 {
+    classDescriptors('3': Integer@118) = DeserializedClassDescriptor@116['Any']
+    classDescriptors('4': Integer@119) = DeserializedClassDescriptor@2['Function0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.lazy.log

@@ -122,11 +122,25 @@ LazyJavaPackageFragment@6['reflect'] {
     memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
-TypeDeserializer@76 {
-    classDescriptors('2': Integer@77) = DeserializedClassDescriptor@78['Any']
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
 }
 
-TypeDeserializer@79 {
-    classDescriptors('3': Integer@80) = DeserializedClassDescriptor@78['Any']
-    classDescriptors('4': Integer@81) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+}
+
+TypeDeserializer@84 {
+    classDescriptors('2': Integer@85) = DeserializedClassDescriptor@86['Any']
+}
+
+TypeDeserializer@87 {
+    classDescriptors('3': Integer@88) = DeserializedClassDescriptor@86['Any']
+    classDescriptors('4': Integer@89) = DeserializedClassDescriptor@2['Function0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.lazy.log

@@ -58,7 +58,12 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@34['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -68,7 +73,7 @@ DeserializedType@18['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@34['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,11 +83,6 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
 DeserializedType@37['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
 }
@@ -164,130 +164,325 @@ LazyJavaPackageFragment@74['io'] {
     classes('Int': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
     classes('String': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@105
     classes('Unit': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('bar': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('baz': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('first': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('foo': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = DeserializedPackageMemberScope@112 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('bar': Name@108) = EmptyList@113[empty] // through DeserializedPackageMemberScope@112
-    functions('bar': Name@108) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('baz': Name@109) = EmptyList@113[empty] // through DeserializedPackageMemberScope@112
-    functions('baz': Name@109) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('foo': Name@111) = EmptyList@113[empty] // through DeserializedPackageMemberScope@112
-    functions('foo': Name@111) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@105
-    membersProtos = LinkedHashMap@115 // through DeserializedPackageMemberScope@112
-    properties('bar': Name@108) = EmptyList@113[empty] // through DeserializedPackageMemberScope@112
-    properties('baz': Name@109) = EmptyList@113[empty] // through DeserializedPackageMemberScope@112
-    properties('foo': Name@111) = EmptyList@113[empty] // through DeserializedPackageMemberScope@112
+    classes('first': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@105
 }
 
 LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    deserializedPackageScope = Empty@118 // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('lang': Name@119) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('lang': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    deserializedPackageScope = Empty@111 // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('lang': Name@112) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@110
 }
 
 LazyJavaPackageFragment@82['jvm'] {
-    classes('Int': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('String': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Unit': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('bar': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('baz': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('first': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foo': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = Empty@118 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('bar': Name@108) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('baz': Name@109) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('foo': Name@111) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@122 // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('Int': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('String': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('Unit': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('first': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@115
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('ExtensionFunction0': Name@125) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('ExtensionFunction1': Name@126) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('Int': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('String': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('Unit': Name@107) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('bar': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('baz': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('first': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('foo': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('io': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('jvm': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('reflect': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    deserializedPackageScope = DeserializedPackageMemberScope@130 // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('bar': Name@108) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    functions('bar': Name@108) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('baz': Name@109) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    functions('baz': Name@109) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('foo': Name@111) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    functions('foo': Name@111) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('io': Name@131) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    functions('io': Name@131) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('jvm': Name@132) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    functions('jvm': Name@132) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('reflect': Name@133) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    functions('reflect': Name@133) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@124
-    membersProtos = LinkedHashMap@135 // through DeserializedPackageMemberScope@130
-    properties('bar': Name@108) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    properties('baz': Name@109) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    properties('foo': Name@111) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    properties('io': Name@131) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    properties('jvm': Name@132) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    properties('reflect': Name@133) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
+    classes('Any': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('ExtensionFunction0': Name@118) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('ExtensionFunction1': Name@119) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('Int': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('String': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('Unit': Name@107) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('first': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('io': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('jvm': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('reflect': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    deserializedPackageScope = DeserializedPackageMemberScope@123 // through LazyPackageFragmentScopeForJavaPackage@117
+    functions('io': Name@124) = EmptyList@113[empty] // through DeserializedPackageMemberScope@123
+    functions('io': Name@124) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@117
+    functions('jvm': Name@125) = EmptyList@113[empty] // through DeserializedPackageMemberScope@123
+    functions('jvm': Name@125) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@117
+    functions('reflect': Name@126) = EmptyList@113[empty] // through DeserializedPackageMemberScope@123
+    functions('reflect': Name@126) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@117
+    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@117
+    membersProtos = LinkedHashMap@128 // through DeserializedPackageMemberScope@123
+    properties('io': Name@124) = EmptyList@113[empty] // through DeserializedPackageMemberScope@123
+    properties('jvm': Name@125) = EmptyList@113[empty] // through DeserializedPackageMemberScope@123
+    properties('reflect': Name@126) = EmptyList@113[empty] // through DeserializedPackageMemberScope@123
 }
 
 LazyJavaPackageFragment@59['lang'] {
-    classes('bar': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('baz': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('first': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('foo': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    deserializedPackageScope = Empty@118 // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('bar': Name@108) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('baz': Name@109) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('foo': Name@111) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('first': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@129
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('KMemberFunction0': Name@140) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('KMemberFunction1': Name@141) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('String': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('Unit': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('bar': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('baz': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('first': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('foo': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    deserializedPackageScope = Empty@118 // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('bar': Name@108) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('baz': Name@109) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('foo': Name@111) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    memberIndex = computeMemberIndex$1@142 // through LazyPackageFragmentScopeForJavaPackage@139
+    classes('Int': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@131
+    classes('KMemberFunction0': Name@132) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@131
+    classes('KMemberFunction1': Name@133) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@131
+    classes('String': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@131
+    classes('Unit': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@131
+    classes('first': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@131
 }
 
-TypeDeserializer@143 {
-    classDescriptors('2': Integer@144) = DeserializedClassDescriptor@145['Any']
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
 }
 
-TypeDeserializer@146 {
-    classDescriptors('2': Integer@144) = DeserializedClassDescriptor@145['Any']
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
 }
 
-TypeDeserializer@147 {
-    classDescriptors('2': Integer@144) = DeserializedClassDescriptor@145['Any']
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
 }
 
-TypeDeserializer@148 {
-    classDescriptors('3': Integer@149) = DeserializedClassDescriptor@145['Any']
-    classDescriptors('4': Integer@150) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
 }
 
-TypeDeserializer@151 {
-    classDescriptors('3': Integer@149) = DeserializedClassDescriptor@145['Any']
-    classDescriptors('4': Integer@150) = DeserializedClassDescriptor@4['ExtensionFunction1']
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+}
+
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+}
+
+ResolutionTaskHolder@158 {
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+}
+
+ResolutionTaskHolder@159 {
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+}
+
+ResolutionTaskHolder@161 {
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+}
+
+ResolutionTaskHolder@162 {
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+}
+
+ResolutionTaskHolder@163 {
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+}
+
+ResolutionTaskHolder@164 {
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+}
+
+ResolutionTaskHolder@165 {
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+}
+
+ResolutionTaskHolder@166 {
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+}
+
+ResolutionTaskHolder@167 {
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+}
+
+ResolutionTaskHolder@168 {
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+}
+
+ResolutionTaskHolder@169 {
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+    <name not found> = EmptyList@113[empty]
+}
+
+TypeDeserializer@170 {
+    classDescriptors('2': Integer@171) = DeserializedClassDescriptor@172['Any']
+}
+
+TypeDeserializer@173 {
+    classDescriptors('2': Integer@171) = DeserializedClassDescriptor@172['Any']
+}
+
+TypeDeserializer@174 {
+    classDescriptors('2': Integer@171) = DeserializedClassDescriptor@172['Any']
+}
+
+TypeDeserializer@175 {
+    classDescriptors('3': Integer@176) = DeserializedClassDescriptor@172['Any']
+    classDescriptors('4': Integer@177) = DeserializedClassDescriptor@2['ExtensionFunction0']
+}
+
+TypeDeserializer@178 {
+    classDescriptors('3': Integer@176) = DeserializedClassDescriptor@172['Any']
+    classDescriptors('4': Integer@177) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.lazy.log

@@ -100,7 +100,6 @@ LazyJavaPackageFragment@44['io'] {
     membersProtos = LinkedHashMap@69 // through DeserializedPackageMemberScope@66
     properties('bar': Name@62) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
     properties('baz': Name@63) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
-    properties('foo': Name@65) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
 }
 
 LazyJavaPackageFragment@33['java'] {
@@ -151,7 +150,6 @@ LazyJavaPackageFragment@7['kotlin'] {
     membersProtos = LinkedHashMap@88 // through DeserializedPackageMemberScope@83
     properties('bar': Name@62) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
     properties('baz': Name@63) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
-    properties('foo': Name@65) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
     properties('io': Name@84) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
     properties('jvm': Name@85) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
     properties('reflect': Name@86) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
@@ -176,15 +174,347 @@ LazyJavaPackageFragment@8['reflect'] {
     memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
 }
 
-TypeDeserializer@95 {
-    classDescriptors('2': Integer@96) = DeserializedClassDescriptor@97['Any']
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
 }
 
-TypeDeserializer@98 {
-    classDescriptors('2': Integer@96) = DeserializedClassDescriptor@97['Any']
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
 }
 
-TypeDeserializer@99 {
-    classDescriptors('3': Integer@100) = DeserializedClassDescriptor@97['Any']
-    classDescriptors('4': Integer@101) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@103 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@111 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@113 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@115 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+}
+
+TypeDeserializer@119 {
+    classDescriptors('2': Integer@120) = DeserializedClassDescriptor@121['Any']
+}
+
+TypeDeserializer@122 {
+    classDescriptors('2': Integer@120) = DeserializedClassDescriptor@121['Any']
+}
+
+TypeDeserializer@123 {
+    classDescriptors('3': Integer@124) = DeserializedClassDescriptor@121['Any']
+    classDescriptors('4': Integer@125) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.lazy.log

@@ -237,24 +237,66 @@ LazyJavaPackageFragment@14['reflect'] {
     memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@124
 }
 
-TypeDeserializer@128 {
-    classDescriptors('2': Integer@129) = DeserializedClassDescriptor@130['Any']
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+    <name not found> = EmptyList@98[empty]
+    <name not found> = EmptyList@98[empty]
+    <name not found> = EmptyList@98[empty]
+    <name not found> = EmptyList@98[empty]
 }
 
-TypeDeserializer@131 {
-    classDescriptors('2': Integer@129) = DeserializedClassDescriptor@130['Any']
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+    <name not found> = EmptyList@98[empty]
+    <name not found> = EmptyList@98[empty]
+    <name not found> = EmptyList@98[empty]
+    <name not found> = EmptyList@98[empty]
 }
 
-TypeDeserializer@132 {
-    classDescriptors('2': Integer@129) = DeserializedClassDescriptor@130['Any']
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+    <name not found> = EmptyList@98[empty]
+    <name not found> = EmptyList@98[empty]
+    <name not found> = EmptyList@98[empty]
+    <name not found> = EmptyList@98[empty]
 }
 
-TypeDeserializer@133 {
-    classDescriptors('3': Integer@134) = DeserializedClassDescriptor@130['Any']
-    classDescriptors('4': Integer@135) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
 }
 
-TypeDeserializer@136 {
-    classDescriptors('3': Integer@134) = DeserializedClassDescriptor@130['Any']
-    classDescriptors('4': Integer@135) = DeserializedClassDescriptor@4['Function1']
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+}
+
+TypeDeserializer@152 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@155 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@156 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@157 {
+    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
+    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@2['Function0']
+}
+
+TypeDeserializer@160 {
+    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
+    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@4['Function1']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.lazy.log

@@ -63,6 +63,11 @@ DeserializedType@30['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
+DeserializedType@22['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
 DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
@@ -78,11 +83,6 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
 DeserializedType@37['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
 }
@@ -186,116 +186,170 @@ LazyJavaPackageFragment@71['io'] {
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('x': Name@111) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('y': Name@112) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('z': Name@113) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
 }
 
 LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('lang': Name@116) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('lang': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@112
+    functions('lang': Name@113) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@112
+    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
 }
 
 LazyJavaPackageFragment@79['jvm'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@115
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('ExtensionFunction0': Name@122) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('ExtensionFunction1': Name@123) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('io': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('jvm': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('reflect': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = DeserializedPackageMemberScope@127 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('io': Name@128) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('io': Name@128) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('jvm': Name@129) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('jvm': Name@129) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('reflect': Name@130) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('reflect': Name@130) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@121
-    membersProtos = LinkedHashMap@132 // through DeserializedPackageMemberScope@127
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('io': Name@128) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('jvm': Name@129) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('reflect': Name@130) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('x': Name@111) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('y': Name@112) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('z': Name@113) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
+    classes('Any': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('ExtensionFunction0': Name@119) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('ExtensionFunction1': Name@120) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('io': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('jvm': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('reflect': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    deserializedPackageScope = DeserializedPackageMemberScope@124 // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('io': Name@125) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('jvm': Name@126) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('reflect': Name@127) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@118
+    membersProtos = LinkedHashMap@129 // through DeserializedPackageMemberScope@124
+    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
 }
 
 LazyJavaPackageFragment@56['lang'] {
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@130
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('KExtensionFunction0': Name@136) = DeserializedClassDescriptor@6['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('KExtensionFunction1': Name@137) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    memberIndex = computeMemberIndex$1@138 // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('KExtensionFunction0': Name@133) = DeserializedClassDescriptor@6['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('KExtensionFunction1': Name@134) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@132
 }
 
-TypeDeserializer@139 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
 
-TypeDeserializer@142 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
 
-TypeDeserializer@143 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
 
-TypeDeserializer@144 {
-    classDescriptors('3': Integer@145) = DeserializedClassDescriptor@141['Any']
-    classDescriptors('4': Integer@146) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-TypeDeserializer@147 {
-    classDescriptors('3': Integer@145) = DeserializedClassDescriptor@141['Any']
-    classDescriptors('4': Integer@146) = DeserializedClassDescriptor@4['ExtensionFunction1']
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+}
+
+TypeDeserializer@160 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@163 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@164 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@165 {
+    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
+    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@2['ExtensionFunction0']
+}
+
+TypeDeserializer@168 {
+    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
+    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.lazy.log

@@ -58,7 +58,12 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@34['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -73,12 +78,7 @@ DeserializedType@30['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -186,116 +186,170 @@ LazyJavaPackageFragment@71['io'] {
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('x': Name@111) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('y': Name@112) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('z': Name@113) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
 }
 
 LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('lang': Name@116) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('lang': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@112
+    functions('lang': Name@113) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@112
+    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
 }
 
 LazyJavaPackageFragment@79['jvm'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@115
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('ExtensionFunction0': Name@122) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('ExtensionFunction1': Name@123) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('io': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('jvm': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('reflect': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = DeserializedPackageMemberScope@127 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('io': Name@128) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('io': Name@128) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('jvm': Name@129) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('jvm': Name@129) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('reflect': Name@130) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('reflect': Name@130) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@121
-    membersProtos = LinkedHashMap@132 // through DeserializedPackageMemberScope@127
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('io': Name@128) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('jvm': Name@129) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('reflect': Name@130) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('x': Name@111) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('y': Name@112) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('z': Name@113) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
+    classes('Any': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('ExtensionFunction0': Name@119) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('ExtensionFunction1': Name@120) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('io': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('jvm': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('reflect': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    deserializedPackageScope = DeserializedPackageMemberScope@124 // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('io': Name@125) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('jvm': Name@126) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('reflect': Name@127) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@118
+    membersProtos = LinkedHashMap@129 // through DeserializedPackageMemberScope@124
+    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
 }
 
 LazyJavaPackageFragment@56['lang'] {
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@130
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('KExtensionFunction0': Name@136) = DeserializedClassDescriptor@6['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('KExtensionFunction1': Name@137) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    memberIndex = computeMemberIndex$1@138 // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('KExtensionFunction0': Name@133) = DeserializedClassDescriptor@6['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('KExtensionFunction1': Name@134) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@132
 }
 
-TypeDeserializer@139 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
 
-TypeDeserializer@142 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
 
-TypeDeserializer@143 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
 
-TypeDeserializer@144 {
-    classDescriptors('3': Integer@145) = DeserializedClassDescriptor@141['Any']
-    classDescriptors('4': Integer@146) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-TypeDeserializer@147 {
-    classDescriptors('3': Integer@145) = DeserializedClassDescriptor@141['Any']
-    classDescriptors('4': Integer@146) = DeserializedClassDescriptor@4['ExtensionFunction1']
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+}
+
+TypeDeserializer@160 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@163 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@164 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@165 {
+    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
+    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@2['ExtensionFunction0']
+}
+
+TypeDeserializer@168 {
+    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
+    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.lazy.log

@@ -58,17 +58,7 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,7 +68,17 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@22['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -192,116 +192,224 @@ LazyJavaPackageFragment@74['io'] {
     properties('bar': Name@105) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
     properties('baz': Name@106) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
     properties('foo': Name@107) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
-    properties('x': Name@117) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
-    properties('y': Name@118) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
-    properties('z': Name@119) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
 }
 
 LazyJavaPackageFragment@55['java'] {
-    classes('lang': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('lang': Name@122) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('lang': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('lang': Name@119) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@118
 }
 
 LazyJavaPackageFragment@83['jvm'] {
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('Unit': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    memberIndex = computeMemberIndex$1@125 // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('Unit': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    memberIndex = computeMemberIndex$1@122 // through LazyPackageFragmentScopeForJavaPackage@121
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('ExtensionFunction0': Name@128) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('ExtensionFunction1': Name@129) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Unit': Name@104) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('io': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('jvm': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('reflect': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    deserializedPackageScope = DeserializedPackageMemberScope@133 // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('bar': Name@105) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('baz': Name@106) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('foo': Name@107) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('io': Name@134) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    functions('io': Name@134) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('jvm': Name@135) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    functions('jvm': Name@135) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('reflect': Name@136) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    functions('reflect': Name@136) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@127
-    membersProtos = LinkedHashMap@138 // through DeserializedPackageMemberScope@133
-    properties('bar': Name@105) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    properties('baz': Name@106) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    properties('foo': Name@107) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    properties('io': Name@134) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    properties('jvm': Name@135) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    properties('reflect': Name@136) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    properties('x': Name@117) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    properties('y': Name@118) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    properties('z': Name@119) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
+    classes('Any': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('ExtensionFunction0': Name@125) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('ExtensionFunction1': Name@126) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('Unit': Name@104) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('io': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('jvm': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('reflect': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    deserializedPackageScope = DeserializedPackageMemberScope@130 // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('bar': Name@105) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('baz': Name@106) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('foo': Name@107) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('io': Name@131) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    functions('io': Name@131) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('jvm': Name@132) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    functions('jvm': Name@132) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('reflect': Name@133) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    functions('reflect': Name@133) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@124
+    membersProtos = LinkedHashMap@135 // through DeserializedPackageMemberScope@130
+    properties('bar': Name@105) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    properties('baz': Name@106) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    properties('foo': Name@107) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    properties('io': Name@131) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    properties('jvm': Name@132) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    properties('reflect': Name@133) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
 }
 
 LazyJavaPackageFragment@57['lang'] {
-    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    memberIndex = computeMemberIndex$1@140 // through LazyPackageFragmentScopeForJavaPackage@139
+    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@136
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('KExtensionFunction0': Name@142) = DeserializedClassDescriptor@6['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('KExtensionFunction1': Name@143) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('Unit': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@141
-    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@141
-    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@141
-    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@141
-    memberIndex = computeMemberIndex$1@144 // through LazyPackageFragmentScopeForJavaPackage@141
+    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('KExtensionFunction0': Name@139) = DeserializedClassDescriptor@6['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('KExtensionFunction1': Name@140) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('Unit': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@138
+    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@138
+    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@138
+    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@138
+    memberIndex = computeMemberIndex$1@141 // through LazyPackageFragmentScopeForJavaPackage@138
 }
 
-TypeDeserializer@145 {
-    classDescriptors('2': Integer@146) = DeserializedClassDescriptor@147['Any']
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
 }
 
-TypeDeserializer@148 {
-    classDescriptors('2': Integer@146) = DeserializedClassDescriptor@147['Any']
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
 }
 
-TypeDeserializer@149 {
-    classDescriptors('2': Integer@146) = DeserializedClassDescriptor@147['Any']
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
+    <name not found> = EmptyList@110[empty]
 }
 
-TypeDeserializer@150 {
-    classDescriptors('3': Integer@151) = DeserializedClassDescriptor@147['Any']
-    classDescriptors('4': Integer@152) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
 }
 
-TypeDeserializer@153 {
-    classDescriptors('3': Integer@151) = DeserializedClassDescriptor@147['Any']
-    classDescriptors('4': Integer@152) = DeserializedClassDescriptor@4['ExtensionFunction1']
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
+}
+
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
+}
+
+TypeDeserializer@175 {
+    classDescriptors('2': Integer@176) = DeserializedClassDescriptor@177['Any']
+}
+
+TypeDeserializer@178 {
+    classDescriptors('2': Integer@176) = DeserializedClassDescriptor@177['Any']
+}
+
+TypeDeserializer@179 {
+    classDescriptors('2': Integer@176) = DeserializedClassDescriptor@177['Any']
+}
+
+TypeDeserializer@180 {
+    classDescriptors('3': Integer@181) = DeserializedClassDescriptor@177['Any']
+    classDescriptors('4': Integer@182) = DeserializedClassDescriptor@2['ExtensionFunction0']
+}
+
+TypeDeserializer@183 {
+    classDescriptors('3': Integer@181) = DeserializedClassDescriptor@177['Any']
+    classDescriptors('4': Integer@182) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.lazy.log

@@ -58,12 +58,12 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -73,7 +73,7 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -183,9 +183,6 @@ LazyJavaPackageFragment@71['io'] {
     functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
     memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
     membersProtos = LinkedHashMap@110 // through DeserializedPackageMemberScope@108
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
 }
 
 LazyJavaPackageFragment@54['java'] {
@@ -237,9 +234,6 @@ LazyJavaPackageFragment@13['kotlin'] {
     functions('reflect': Name@127) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
     memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@118
     membersProtos = LinkedHashMap@129 // through DeserializedPackageMemberScope@124
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
     properties('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
     properties('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
     properties('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
@@ -272,24 +266,282 @@ LazyJavaPackageFragment@14['reflect'] {
     memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@132
 }
 
-TypeDeserializer@136 {
-    classDescriptors('2': Integer@137) = DeserializedClassDescriptor@138['Any']
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
 
-TypeDeserializer@139 {
-    classDescriptors('2': Integer@137) = DeserializedClassDescriptor@138['Any']
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
 
-TypeDeserializer@140 {
-    classDescriptors('2': Integer@137) = DeserializedClassDescriptor@138['Any']
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
 
-TypeDeserializer@141 {
-    classDescriptors('3': Integer@142) = DeserializedClassDescriptor@138['Any']
-    classDescriptors('4': Integer@143) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-TypeDeserializer@144 {
-    classDescriptors('3': Integer@142) = DeserializedClassDescriptor@138['Any']
-    classDescriptors('4': Integer@143) = DeserializedClassDescriptor@4['ExtensionFunction1']
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+}
+
+ResolutionTaskHolder@161 {
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+}
+
+ResolutionTaskHolder@162 {
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+}
+
+ResolutionTaskHolder@163 {
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+}
+
+ResolutionTaskHolder@164 {
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+}
+
+ResolutionTaskHolder@165 {
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+}
+
+ResolutionTaskHolder@166 {
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+}
+
+ResolutionTaskHolder@167 {
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+}
+
+ResolutionTaskHolder@168 {
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+}
+
+ResolutionTaskHolder@169 {
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+}
+
+ResolutionTaskHolder@170 {
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+}
+
+ResolutionTaskHolder@171 {
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+}
+
+TypeDeserializer@172 {
+    classDescriptors('2': Integer@173) = DeserializedClassDescriptor@174['Any']
+}
+
+TypeDeserializer@175 {
+    classDescriptors('2': Integer@173) = DeserializedClassDescriptor@174['Any']
+}
+
+TypeDeserializer@176 {
+    classDescriptors('2': Integer@173) = DeserializedClassDescriptor@174['Any']
+}
+
+TypeDeserializer@177 {
+    classDescriptors('3': Integer@178) = DeserializedClassDescriptor@174['Any']
+    classDescriptors('4': Integer@179) = DeserializedClassDescriptor@2['ExtensionFunction0']
+}
+
+TypeDeserializer@180 {
+    classDescriptors('3': Integer@178) = DeserializedClassDescriptor@174['Any']
+    classDescriptors('4': Integer@179) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.lazy.log

@@ -52,57 +52,232 @@ LazyJavaPackageFragment@22['io'] {
     membersProtos = LinkedHashMap@42 // through DeserializedPackageMemberScope@40
     properties('extA': Name@34) = EmptyList@37[empty] // through DeserializedPackageMemberScope@40
     properties('extInt': Name@35) = EmptyList@37[empty] // through DeserializedPackageMemberScope@40
-    properties('x': Name@43) = EmptyList@37[empty] // through DeserializedPackageMemberScope@40
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@46) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('lang': Name@45) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
 }
 
 LazyJavaPackageFragment@27['jvm'] {
-    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('String': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('extA': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('extInt': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('extA': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('extInt': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('String': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('extA': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('extInt': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('extA': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('extInt': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
 }
 
 LazyJavaPackageFragment@17['kotlin'] {
-    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('String': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('extA': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('extInt': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('io': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('jvm': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = DeserializedPackageMemberScope@53 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('extA': Name@34) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
-    functions('extA': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('extInt': Name@35) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
-    functions('extInt': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('io': Name@54) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
-    functions('io': Name@54) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('jvm': Name@55) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
-    functions('jvm': Name@55) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@50
-    membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@53
-    properties('extA': Name@34) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
-    properties('extInt': Name@35) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
-    properties('io': Name@54) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
-    properties('jvm': Name@55) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
-    properties('x': Name@43) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
+    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('String': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('extA': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('extInt': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('io': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('jvm': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    deserializedPackageScope = DeserializedPackageMemberScope@52 // through LazyPackageFragmentScopeForJavaPackage@49
+    functions('extA': Name@34) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
+    functions('extA': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@49
+    functions('extInt': Name@35) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
+    functions('extInt': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@49
+    functions('io': Name@53) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
+    functions('io': Name@53) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@49
+    functions('jvm': Name@54) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
+    functions('jvm': Name@54) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@49
+    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@49
+    membersProtos = LinkedHashMap@56 // through DeserializedPackageMemberScope@52
+    properties('extA': Name@34) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
+    properties('extInt': Name@35) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
+    properties('io': Name@53) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
+    properties('jvm': Name@54) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('extA': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('extInt': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('extA': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('extInt': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('extA': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@57
+    classes('extInt': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@57
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@57
+    functions('extA': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@57
+    functions('extInt': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@57
+    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@57
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@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> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.lazy.log

@@ -140,7 +140,6 @@ LazyJavaPackageFragment@60['io'] {
     functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
     membersProtos = LinkedHashMap@89 // through DeserializedPackageMemberScope@87
-    properties('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@87
 }
 
 LazyJavaPackageFragment@47['java'] {
@@ -177,7 +176,6 @@ LazyJavaPackageFragment@12['kotlin'] {
     functions('reflect': Name@105) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@97
     memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@97
     membersProtos = LinkedHashMap@107 // through DeserializedPackageMemberScope@102
-    properties('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
     properties('io': Name@103) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
     properties('jvm': Name@104) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
     properties('reflect': Name@105) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
@@ -200,20 +198,178 @@ LazyJavaPackageFragment@13['reflect'] {
     memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@110
 }
 
-TypeDeserializer@112 {
-    classDescriptors('2': Integer@113) = DeserializedClassDescriptor@114['Any']
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
 }
 
-TypeDeserializer@115 {
-    classDescriptors('2': Integer@113) = DeserializedClassDescriptor@114['Any']
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
 }
 
-TypeDeserializer@116 {
-    classDescriptors('3': Integer@117) = DeserializedClassDescriptor@114['Any']
-    classDescriptors('4': Integer@118) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@123 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
 }
 
-TypeDeserializer@119 {
-    classDescriptors('3': Integer@117) = DeserializedClassDescriptor@114['Any']
-    classDescriptors('4': Integer@118) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@124 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@125 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@127 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@128 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@130 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+TypeDeserializer@131 {
+    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+}
+
+TypeDeserializer@134 {
+    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+}
+
+TypeDeserializer@135 {
+    classDescriptors('3': Integer@136) = DeserializedClassDescriptor@133['Any']
+    classDescriptors('4': Integer@137) = DeserializedClassDescriptor@2['ExtensionFunction0']
+}
+
+TypeDeserializer@138 {
+    classDescriptors('3': Integer@136) = DeserializedClassDescriptor@133['Any']
+    classDescriptors('4': Integer@137) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.lazy.log

@@ -22,12 +22,12 @@ DeserializedTypeParameterDescriptor@11['T'] {
     upperBoundsAsType = DeserializedType@14['kotlin.Any']
 }
 
-DeserializedType@10['kotlin.Any'] {
+DeserializedType@14['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@15
     memberScope = DeserializedClassMemberScope@16
 }
 
-DeserializedType@14['kotlin.Any'] {
+DeserializedType@10['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@15
     memberScope = DeserializedClassMemberScope@16
 }
@@ -74,91 +74,163 @@ LazyJavaPackageFragmentProvider@20 {
 LazyJavaPackageFragment@22['<root>'] {
     classes('KMemberFunction0': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
     classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('foo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('kotlin': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('t': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('foo': Name@57) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('kotlin': Name@62) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('kotlin': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('t': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@55
+    functions('kotlin': Name@60) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@55
+    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@55
 }
 
 LazyJavaPackageFragment@41['io'] {
-    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('foo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('t': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = DeserializedPackageMemberScope@65 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('foo': Name@57) = EmptyList@61[empty] // through DeserializedPackageMemberScope@65
-    functions('foo': Name@57) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@64
-    membersProtos = LinkedHashMap@67 // through DeserializedPackageMemberScope@65
-    properties('foo': Name@57) = EmptyList@61[empty] // through DeserializedPackageMemberScope@65
-    properties('t': Name@59) = EmptyList@61[empty] // through DeserializedPackageMemberScope@65
+    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('t': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    deserializedPackageScope = DeserializedPackageMemberScope@64 // through LazyPackageFragmentScopeForJavaPackage@63
+    membersProtos = LinkedHashMap@65 // through DeserializedPackageMemberScope@64
+    properties('t': Name@58) = EmptyList@61[empty] // through DeserializedPackageMemberScope@64
 }
 
 LazyJavaPackageFragment@28['java'] {
-    classes('lang': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('lang': Name@70) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('lang': Name@68) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
 }
 
 LazyJavaPackageFragment@47['jvm'] {
-    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('foo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('t': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('foo': Name@57) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('t': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@70
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    classes('Any': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('ExtensionFunction0': Name@76) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('foo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('io': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('jvm': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('reflect': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('t': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = DeserializedPackageMemberScope@80 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('foo': Name@57) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80
-    functions('foo': Name@57) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('io': Name@81) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80
-    functions('io': Name@81) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('jvm': Name@82) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80
-    functions('jvm': Name@82) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('reflect': Name@83) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80
-    functions('reflect': Name@83) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@75
-    membersProtos = LinkedHashMap@85 // through DeserializedPackageMemberScope@80
-    properties('foo': Name@57) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80
-    properties('io': Name@81) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80
-    properties('jvm': Name@82) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80
-    properties('reflect': Name@83) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80
-    properties('t': Name@59) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80
+    classes('Any': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('ExtensionFunction0': Name@73) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('io': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('jvm': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('reflect': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('t': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    deserializedPackageScope = DeserializedPackageMemberScope@77 // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('io': Name@78) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
+    functions('io': Name@78) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('jvm': Name@79) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
+    functions('jvm': Name@79) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('reflect': Name@80) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
+    functions('reflect': Name@80) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@72
+    membersProtos = LinkedHashMap@82 // through DeserializedPackageMemberScope@77
+    properties('io': Name@78) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
+    properties('jvm': Name@79) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
+    properties('reflect': Name@80) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
+    properties('t': Name@58) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
 }
 
 LazyJavaPackageFragment@30['lang'] {
-    classes('foo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('t': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('foo': Name@57) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('t': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    classes('KMemberFunction0': Name@88) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('KMemberFunction0': Name@90) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('KMemberFunction0': Name@84) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@85
+    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('KMemberFunction0': Name@86) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
-TypeDeserializer@92 {
-    classDescriptors('2': Integer@93) = DeserializedClassDescriptor@94['Any']
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
 }
 
-TypeDeserializer@95 {
-    classDescriptors('3': Integer@96) = DeserializedClassDescriptor@94['Any']
-    classDescriptors('4': Integer@97) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
+}
+
+TypeDeserializer@104 {
+    classDescriptors('2': Integer@105) = DeserializedClassDescriptor@106['Any']
+}
+
+TypeDeserializer@107 {
+    classDescriptors('3': Integer@108) = DeserializedClassDescriptor@106['Any']
+    classDescriptors('4': Integer@109) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.lazy.log

@@ -65,3 +65,39 @@ LazyJavaPackageFragment@7['lang'] {
     functions('Inner': Name@19) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@39
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
 }
+
+ResolutionTaskHolder@41 {
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+}

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.lazy.log

@@ -22,12 +22,12 @@ DeserializedTypeParameterDescriptor@11['T'] {
     upperBoundsAsType = DeserializedType@14['kotlin.Any']
 }
 
-DeserializedType@10['kotlin.Any'] {
+DeserializedType@14['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@15
     memberScope = DeserializedClassMemberScope@16
 }
 
-DeserializedType@14['kotlin.Any'] {
+DeserializedType@10['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@15
     memberScope = DeserializedClassMemberScope@16
 }
@@ -85,69 +85,544 @@ LazyJavaPackageFragment@39['io'] {
     memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@58
     membersProtos = LinkedHashMap@61 // through DeserializedPackageMemberScope@59
     properties('Inner': Name@50) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
-    properties('x': Name@62) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
-    properties('y': Name@63) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
 }
 
 LazyJavaPackageFragment@28['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@66) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@63
+    functions('lang': Name@64) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@63
+    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@63
 }
 
 LazyJavaPackageFragment@44['jvm'] {
-    classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('Inner': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('Inner': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@66
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    classes('Any': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('ExtensionFunction0': Name@72) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('io': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('jvm': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('reflect': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = DeserializedPackageMemberScope@76 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('Inner': Name@50) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    functions('Inner': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('io': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    functions('io': Name@77) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('jvm': Name@78) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    functions('jvm': Name@78) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('reflect': Name@79) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    functions('reflect': Name@79) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@71
-    membersProtos = LinkedHashMap@81 // through DeserializedPackageMemberScope@76
-    properties('Inner': Name@50) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    properties('io': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    properties('jvm': Name@78) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    properties('reflect': Name@79) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    properties('x': Name@62) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    properties('y': Name@63) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
+    classes('Any': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('ExtensionFunction0': Name@70) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('io': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('jvm': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('reflect': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    deserializedPackageScope = DeserializedPackageMemberScope@74 // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('Inner': Name@50) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    functions('Inner': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('io': Name@75) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    functions('io': Name@75) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('jvm': Name@76) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    functions('jvm': Name@76) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('reflect': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    functions('reflect': Name@77) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@69
+    membersProtos = LinkedHashMap@79 // through DeserializedPackageMemberScope@74
+    properties('Inner': Name@50) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    properties('io': Name@75) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    properties('jvm': Name@76) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    properties('reflect': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
 }
 
 LazyJavaPackageFragment@30['lang'] {
-    classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('Inner': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('Inner': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    classes('KMemberFunction0': Name@84) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('KMemberFunction0': Name@86) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('KMemberFunction0': Name@82) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('KMemberFunction0': Name@84) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
-TypeDeserializer@88 {
-    classDescriptors('2': Integer@89) = DeserializedClassDescriptor@90['Any']
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
 }
 
-TypeDeserializer@91 {
-    classDescriptors('3': Integer@92) = DeserializedClassDescriptor@90['Any']
-    classDescriptors('4': Integer@93) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+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 }
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+}
+
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+}
+
+ResolutionTaskHolder@125 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@127 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@128 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@130 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@132 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@133 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@134 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@135 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@137 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@138 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+TypeDeserializer@139 {
+    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+}
+
+TypeDeserializer@142 {
+    classDescriptors('3': Integer@143) = DeserializedClassDescriptor@141['Any']
+    classDescriptors('4': Integer@144) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.lazy.log

@@ -86,71 +86,341 @@ LazyJavaPackageFragment@38['io'] {
     memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@58
     membersProtos = LinkedHashMap@61 // through DeserializedPackageMemberScope@59
     properties('Inner': Name@49) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
-    properties('x': Name@62) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
-    properties('y': Name@63) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
 }
 
 LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@66) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@63
+    functions('lang': Name@64) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@63
+    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@63
 }
 
 LazyJavaPackageFragment@43['jvm'] {
-    classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('Inner': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('Inner': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@66
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    classes('Any': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('ExtensionFunction0': Name@72) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('io': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('jvm': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('reflect': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = DeserializedPackageMemberScope@76 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('Inner': Name@49) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    functions('Inner': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('io': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    functions('io': Name@77) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('jvm': Name@78) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    functions('jvm': Name@78) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('reflect': Name@79) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    functions('reflect': Name@79) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@71
-    membersProtos = LinkedHashMap@81 // through DeserializedPackageMemberScope@76
-    properties('Inner': Name@49) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    properties('io': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    properties('jvm': Name@78) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    properties('reflect': Name@79) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    properties('x': Name@62) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    properties('y': Name@63) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
+    classes('Any': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('ExtensionFunction0': Name@70) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('io': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('jvm': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('reflect': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    deserializedPackageScope = DeserializedPackageMemberScope@74 // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('Inner': Name@49) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    functions('Inner': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('io': Name@75) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    functions('io': Name@75) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('jvm': Name@76) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    functions('jvm': Name@76) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('reflect': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    functions('reflect': Name@77) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@69
+    membersProtos = LinkedHashMap@79 // through DeserializedPackageMemberScope@74
+    properties('Inner': Name@49) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    properties('io': Name@75) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    properties('jvm': Name@76) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    properties('reflect': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
 }
 
 LazyJavaPackageFragment@29['lang'] {
-    classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('Inner': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('Inner': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    classes('KMemberFunction0': Name@84) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('KMemberFunction0': Name@86) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('KMemberFunction0': Name@82) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('KMemberFunction0': Name@84) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
-TypeDeserializer@88 {
-    classDescriptors('2': Integer@89) = DeserializedClassDescriptor@90['Any']
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
 }
 
-TypeDeserializer@91 {
-    classDescriptors('3': Integer@92) = DeserializedClassDescriptor@90['Any']
-    classDescriptors('4': Integer@93) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@111 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@113 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@115 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+TypeDeserializer@120 {
+    classDescriptors('2': Integer@121) = DeserializedClassDescriptor@122['Any']
+}
+
+TypeDeserializer@123 {
+    classDescriptors('3': Integer@124) = DeserializedClassDescriptor@122['Any']
+    classDescriptors('4': Integer@125) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.lazy.log

@@ -22,12 +22,12 @@ DeserializedTypeParameterDescriptor@11['T'] {
     upperBoundsAsType = DeserializedType@14['kotlin.Any']
 }
 
-DeserializedType@14['kotlin.Any'] {
+DeserializedType@10['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@15
     memberScope = DeserializedClassMemberScope@16
 }
 
-DeserializedType@10['kotlin.Any'] {
+DeserializedType@14['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@15
     memberScope = DeserializedClassMemberScope@16
 }
@@ -133,11 +133,129 @@ LazyJavaPackageFragment@6['reflect'] {
     memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
 }
 
-TypeDeserializer@80 {
-    classDescriptors('2': Integer@81) = DeserializedClassDescriptor@82['Any']
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
 }
 
-TypeDeserializer@83 {
-    classDescriptors('3': Integer@84) = DeserializedClassDescriptor@82['Any']
-    classDescriptors('4': Integer@85) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+}
+
+TypeDeserializer@94 {
+    classDescriptors('2': Integer@95) = DeserializedClassDescriptor@96['Any']
+}
+
+TypeDeserializer@97 {
+    classDescriptors('3': Integer@98) = DeserializedClassDescriptor@96['Any']
+    classDescriptors('4': Integer@99) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/javaStaticMethod.lazy.log

@@ -76,11 +76,11 @@ DeserializedType@28['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@41
 }
 
-DeserializedType@43['kotlin.Any'] {
+DeserializedType@24['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@40
 }
 
-DeserializedType@24['kotlin.Any'] {
+DeserializedType@43['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@40
 }
 
@@ -171,12 +171,10 @@ LazyJavaPackageFragment@70['<root>'] {
     classes('KFunction1': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@116
     classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@116
     classes('Unit': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@116
     classes('kotlin': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@116
     classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@116
     classes('test': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@116
     deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('invoke': Name@9) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@116
     functions('kotlin': Name@125) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@116
     functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@116
     functions('test': Name@126) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@116
@@ -187,11 +185,8 @@ LazyJavaPackageFragment@92['io'] {
     classes('Array': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@128
     classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@128
     classes('Unit': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@128
     classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@128
     deserializedPackageScope = DeserializedPackageMemberScope@129 // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('invoke': Name@9) = EmptyList@57[empty] // through DeserializedPackageMemberScope@129
-    functions('invoke': Name@9) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@128
     functions('main2': Name@122) = EmptyList@57[empty] // through DeserializedPackageMemberScope@129
     functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@128
     memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@128
@@ -209,10 +204,8 @@ LazyJavaPackageFragment@99['jvm'] {
     classes('Array': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@136
     classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@136
     classes('Unit': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@136
     classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@136
     deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('invoke': Name@9) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@136
     functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@136
     memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@136
 }
@@ -223,14 +216,11 @@ LazyJavaPackageFragment@7['kotlin'] {
     classes('Function1': Name@140) = DeserializedClassDescriptor@2['Function1'] // through LazyPackageFragmentScopeForJavaPackage@139
     classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@139
     classes('Unit': Name@120) = DeserializedClassDescriptor@6['Unit'] // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@139
     classes('io': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@139
     classes('jvm': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@139
     classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@139
     classes('reflect': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@139
     deserializedPackageScope = DeserializedPackageMemberScope@144 // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('invoke': Name@9) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
-    functions('invoke': Name@9) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@139
     functions('io': Name@145) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
     functions('io': Name@145) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@139
     functions('jvm': Name@146) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
@@ -247,10 +237,8 @@ LazyJavaPackageFragment@7['kotlin'] {
 }
 
 LazyJavaPackageFragment@79['lang'] {
-    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@150
     classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@150
     deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('invoke': Name@9) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@150
     functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@150
     memberIndex = computeMemberIndex$1@151 // through LazyPackageFragmentScopeForJavaPackage@150
 }
@@ -260,10 +248,8 @@ LazyJavaPackageFragment@15['reflect'] {
     classes('KFunction1': Name@153) = DeserializedClassDescriptor@4['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@152
     classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@152
     classes('Unit': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@152
     classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@152
     deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('invoke': Name@9) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@152
     functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@152
     memberIndex = computeMemberIndex$1@154 // through LazyPackageFragmentScopeForJavaPackage@152
 }
@@ -279,15 +265,65 @@ NestedClassDescriptors@159 {
     findNestedClass('invoke': Name@9) = null
 }
 
-TypeDeserializer@160 {
-    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
 }
 
-TypeDeserializer@163 {
-    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
 }
 
-TypeDeserializer@164 {
-    classDescriptors('3': Integer@165) = DeserializedClassDescriptor@162['Any']
-    classDescriptors('4': Integer@166) = DeserializedClassDescriptor@2['Function1']
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+}
+
+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 }
+}
+
+TypeDeserializer@192 {
+    classDescriptors('2': Integer@193) = DeserializedClassDescriptor@194['Any']
+}
+
+TypeDeserializer@195 {
+    classDescriptors('2': Integer@193) = DeserializedClassDescriptor@194['Any']
+}
+
+TypeDeserializer@196 {
+    classDescriptors('3': Integer@197) = DeserializedClassDescriptor@194['Any']
+    classDescriptors('4': Integer@198) = DeserializedClassDescriptor@2['Function1']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.lazy.log

@@ -122,11 +122,25 @@ LazyJavaPackageFragment@6['reflect'] {
     memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
-TypeDeserializer@76 {
-    classDescriptors('2': Integer@77) = DeserializedClassDescriptor@78['Any']
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
 }
 
-TypeDeserializer@79 {
-    classDescriptors('3': Integer@80) = DeserializedClassDescriptor@78['Any']
-    classDescriptors('4': Integer@81) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+}
+
+TypeDeserializer@84 {
+    classDescriptors('2': Integer@85) = DeserializedClassDescriptor@86['Any']
+}
+
+TypeDeserializer@87 {
+    classDescriptors('3': Integer@88) = DeserializedClassDescriptor@86['Any']
+    classDescriptors('4': Integer@89) = DeserializedClassDescriptor@2['Function0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.lazy.log

@@ -75,69 +75,159 @@ LazyJavaPackageFragment@34['io'] {
     memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
     membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
     properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
 }
 
 LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('lang': Name@61) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('lang': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@39['jvm'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Any': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Function0': Name@67) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('io': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('jvm': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('reflect': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = DeserializedPackageMemberScope@71 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('io': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('io': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('jvm': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('jvm': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('reflect': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('reflect': Name@74) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@65
-    membersProtos = LinkedHashMap@76 // through DeserializedPackageMemberScope@71
-    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('io': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('jvm': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('reflect': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Function0': Name@66) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('io': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('reflect': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('io': Name@71) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('jvm': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('reflect': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@64
+    membersProtos = LinkedHashMap@75 // through DeserializedPackageMemberScope@70
+    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@79) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('KFunction0': Name@81) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('KFunction0': Name@78) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('KFunction0': Name@80) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-TypeDeserializer@83 {
-    classDescriptors('2': Integer@84) = DeserializedClassDescriptor@85['Any']
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
 }
 
-TypeDeserializer@86 {
-    classDescriptors('3': Integer@87) = DeserializedClassDescriptor@85['Any']
-    classDescriptors('4': Integer@88) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+}
+
+TypeDeserializer@98 {
+    classDescriptors('2': Integer@99) = DeserializedClassDescriptor@100['Any']
+}
+
+TypeDeserializer@101 {
+    classDescriptors('3': Integer@102) = DeserializedClassDescriptor@100['Any']
+    classDescriptors('4': Integer@103) = DeserializedClassDescriptor@2['Function0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.lazy.log

@@ -133,11 +133,39 @@ LazyJavaPackageFragment@8['reflect'] {
     memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
-TypeDeserializer@79 {
-    classDescriptors('2': Integer@80) = DeserializedClassDescriptor@81['Any']
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
 }
 
-TypeDeserializer@82 {
-    classDescriptors('3': Integer@83) = DeserializedClassDescriptor@81['Any']
-    classDescriptors('4': Integer@84) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+}
+
+TypeDeserializer@87 {
+    classDescriptors('2': Integer@88) = DeserializedClassDescriptor@89['Any']
+}
+
+TypeDeserializer@90 {
+    classDescriptors('3': Integer@91) = DeserializedClassDescriptor@89['Any']
+    classDescriptors('4': Integer@92) = DeserializedClassDescriptor@2['Function0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.lazy.log

@@ -75,69 +75,119 @@ LazyJavaPackageFragment@34['io'] {
     memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
     membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
     properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
 }
 
 LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('lang': Name@61) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('lang': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@39['jvm'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Any': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Function0': Name@67) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('io': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('jvm': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('reflect': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = DeserializedPackageMemberScope@71 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('io': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('io': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('jvm': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('jvm': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('reflect': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('reflect': Name@74) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@65
-    membersProtos = LinkedHashMap@76 // through DeserializedPackageMemberScope@71
-    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('io': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('jvm': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('reflect': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Function0': Name@66) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('io': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('reflect': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('io': Name@71) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('jvm': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('reflect': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@64
+    membersProtos = LinkedHashMap@75 // through DeserializedPackageMemberScope@70
+    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@79) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('KFunction0': Name@81) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('KFunction0': Name@78) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('KFunction0': Name@80) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-TypeDeserializer@83 {
-    classDescriptors('2': Integer@84) = DeserializedClassDescriptor@85['Any']
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
 }
 
-TypeDeserializer@86 {
-    classDescriptors('3': Integer@87) = DeserializedClassDescriptor@85['Any']
-    classDescriptors('4': Integer@88) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+}
+
+TypeDeserializer@98 {
+    classDescriptors('2': Integer@99) = DeserializedClassDescriptor@100['Any']
+}
+
+TypeDeserializer@101 {
+    classDescriptors('3': Integer@102) = DeserializedClassDescriptor@100['Any']
+    classDescriptors('4': Integer@103) = DeserializedClassDescriptor@2['Function0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.lazy.log

@@ -46,12 +46,12 @@ DeserializedTypeParameterDescriptor@23['R'] {
     upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -244,24 +244,54 @@ LazyJavaPackageFragment@14['reflect'] {
     memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@118
 }
 
-TypeDeserializer@122 {
-    classDescriptors('2': Integer@123) = DeserializedClassDescriptor@124['Any']
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
 }
 
-TypeDeserializer@125 {
-    classDescriptors('2': Integer@123) = DeserializedClassDescriptor@124['Any']
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
 }
 
-TypeDeserializer@126 {
-    classDescriptors('2': Integer@123) = DeserializedClassDescriptor@124['Any']
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
 }
 
-TypeDeserializer@127 {
-    classDescriptors('3': Integer@128) = DeserializedClassDescriptor@124['Any']
-    classDescriptors('4': Integer@129) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
 }
 
-TypeDeserializer@130 {
-    classDescriptors('3': Integer@128) = DeserializedClassDescriptor@124['Any']
-    classDescriptors('4': Integer@129) = DeserializedClassDescriptor@4['Function1']
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+}
+
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+}
+
+TypeDeserializer@146 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
+}
+
+TypeDeserializer@149 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
+}
+
+TypeDeserializer@150 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
+}
+
+TypeDeserializer@151 {
+    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
+    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@2['Function0']
+}
+
+TypeDeserializer@154 {
+    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
+    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@4['Function1']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.lazy.log

@@ -46,11 +46,6 @@ DeserializedTypeParameterDescriptor@23['R'] {
     upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
 }
 
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
 DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
@@ -61,6 +56,11 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
+DeserializedType@22['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@27
+    memberScope = DeserializedClassMemberScope@28
+}
+
 DeserializedType@29['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
 }
@@ -164,116 +164,140 @@ LazyJavaPackageFragment@63['io'] {
     properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
     properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
     properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('x': Name@103) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('y': Name@104) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('z': Name@105) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
 }
 
 LazyJavaPackageFragment@46['java'] {
-    classes('lang': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('lang': Name@108) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('lang': Name@105) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
 }
 
 LazyJavaPackageFragment@71['jvm'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@107
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Function0': Name@114) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Function1': Name@115) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Unit': Name@90) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('io': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('jvm': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('reflect': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = DeserializedPackageMemberScope@119 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('io': Name@120) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('io': Name@120) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('jvm': Name@121) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('jvm': Name@121) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('reflect': Name@122) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('reflect': Name@122) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@113
-    membersProtos = LinkedHashMap@124 // through DeserializedPackageMemberScope@119
-    properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('io': Name@120) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('jvm': Name@121) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('reflect': Name@122) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('x': Name@103) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('y': Name@104) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('z': Name@105) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
+    classes('Any': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Function0': Name@111) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Function1': Name@112) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Unit': Name@90) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('io': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('jvm': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('reflect': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    deserializedPackageScope = DeserializedPackageMemberScope@116 // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('io': Name@117) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('io': Name@117) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('jvm': Name@118) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('jvm': Name@118) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('reflect': Name@119) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('reflect': Name@119) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@110
+    membersProtos = LinkedHashMap@121 // through DeserializedPackageMemberScope@116
+    properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('io': Name@117) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('jvm': Name@118) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('reflect': Name@119) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
 }
 
 LazyJavaPackageFragment@48['lang'] {
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    memberIndex = computeMemberIndex$1@126 // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@122
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
+    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@122
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('KFunction0': Name@128) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('KFunction1': Name@129) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('KFunction0': Name@125) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('KFunction1': Name@126) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@124
 }
 
-TypeDeserializer@131 {
-    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
 }
 
-TypeDeserializer@134 {
-    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
 }
 
-TypeDeserializer@135 {
-    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
 }
 
-TypeDeserializer@136 {
-    classDescriptors('3': Integer@137) = DeserializedClassDescriptor@133['Any']
-    classDescriptors('4': Integer@138) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
 }
 
-TypeDeserializer@139 {
-    classDescriptors('3': Integer@137) = DeserializedClassDescriptor@133['Any']
-    classDescriptors('4': Integer@138) = DeserializedClassDescriptor@4['Function1']
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+}
+
+TypeDeserializer@152 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@155 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@156 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@157 {
+    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
+    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@2['Function0']
+}
+
+TypeDeserializer@160 {
+    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
+    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@4['Function1']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.lazy.log

@@ -52,6 +52,11 @@ DeserializedTypeParameterDescriptor@27['R'] {
     upperBounds = LinkedHashSet@29[1] { DeserializedType@30['kotlin.Any'] }
 }
 
+DeserializedType@30['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@31
+    memberScope = DeserializedClassMemberScope@32
+}
+
 DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@31
     memberScope = DeserializedClassMemberScope@32
@@ -62,11 +67,6 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@32
 }
 
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@31
-    memberScope = DeserializedClassMemberScope@32
-}
-
 DeserializedType@33['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@31
 }
@@ -274,24 +274,60 @@ LazyJavaPackageFragment@18['reflect'] {
     memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@125
 }
 
-TypeDeserializer@129 {
-    classDescriptors('2': Integer@130) = DeserializedClassDescriptor@131['Any']
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
 }
 
-TypeDeserializer@132 {
-    classDescriptors('2': Integer@130) = DeserializedClassDescriptor@131['Any']
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
 }
 
-TypeDeserializer@133 {
-    classDescriptors('2': Integer@130) = DeserializedClassDescriptor@131['Any']
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
 }
 
-TypeDeserializer@134 {
-    classDescriptors('3': Integer@135) = DeserializedClassDescriptor@131['Any']
-    classDescriptors('4': Integer@136) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
 }
 
-TypeDeserializer@137 {
-    classDescriptors('3': Integer@135) = DeserializedClassDescriptor@131['Any']
-    classDescriptors('4': Integer@136) = DeserializedClassDescriptor@4['Function1']
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+}
+
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+}
+
+TypeDeserializer@153 {
+    classDescriptors('2': Integer@154) = DeserializedClassDescriptor@155['Any']
+}
+
+TypeDeserializer@156 {
+    classDescriptors('2': Integer@154) = DeserializedClassDescriptor@155['Any']
+}
+
+TypeDeserializer@157 {
+    classDescriptors('2': Integer@154) = DeserializedClassDescriptor@155['Any']
+}
+
+TypeDeserializer@158 {
+    classDescriptors('3': Integer@159) = DeserializedClassDescriptor@155['Any']
+    classDescriptors('4': Integer@160) = DeserializedClassDescriptor@2['Function0']
+}
+
+TypeDeserializer@161 {
+    classDescriptors('3': Integer@159) = DeserializedClassDescriptor@155['Any']
+    classDescriptors('4': Integer@160) = DeserializedClassDescriptor@4['Function1']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.lazy.log

@@ -46,7 +46,7 @@ DeserializedTypeParameterDescriptor@23['R'] {
     upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -56,7 +56,7 @@ DeserializedType@18['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -164,116 +164,140 @@ LazyJavaPackageFragment@63['io'] {
     properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
     properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
     properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('x': Name@103) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('y': Name@104) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('z': Name@105) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
 }
 
 LazyJavaPackageFragment@46['java'] {
-    classes('lang': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('lang': Name@108) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('lang': Name@105) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
 }
 
 LazyJavaPackageFragment@71['jvm'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@107
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Function0': Name@114) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Function1': Name@115) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Unit': Name@90) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('io': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('jvm': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('reflect': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = DeserializedPackageMemberScope@119 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('io': Name@120) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('io': Name@120) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('jvm': Name@121) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('jvm': Name@121) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('reflect': Name@122) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('reflect': Name@122) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@113
-    membersProtos = LinkedHashMap@124 // through DeserializedPackageMemberScope@119
-    properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('io': Name@120) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('jvm': Name@121) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('reflect': Name@122) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('x': Name@103) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('y': Name@104) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('z': Name@105) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
+    classes('Any': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Function0': Name@111) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Function1': Name@112) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Unit': Name@90) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('io': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('jvm': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('reflect': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    deserializedPackageScope = DeserializedPackageMemberScope@116 // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('io': Name@117) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('io': Name@117) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('jvm': Name@118) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('jvm': Name@118) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('reflect': Name@119) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('reflect': Name@119) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@110
+    membersProtos = LinkedHashMap@121 // through DeserializedPackageMemberScope@116
+    properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('io': Name@117) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('jvm': Name@118) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('reflect': Name@119) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
 }
 
 LazyJavaPackageFragment@48['lang'] {
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    memberIndex = computeMemberIndex$1@126 // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@122
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
+    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@122
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('KFunction0': Name@128) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('KFunction1': Name@129) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('KFunction0': Name@125) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('KFunction1': Name@126) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@124
 }
 
-TypeDeserializer@131 {
-    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
 }
 
-TypeDeserializer@134 {
-    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
 }
 
-TypeDeserializer@135 {
-    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
 }
 
-TypeDeserializer@136 {
-    classDescriptors('3': Integer@137) = DeserializedClassDescriptor@133['Any']
-    classDescriptors('4': Integer@138) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
 }
 
-TypeDeserializer@139 {
-    classDescriptors('3': Integer@137) = DeserializedClassDescriptor@133['Any']
-    classDescriptors('4': Integer@138) = DeserializedClassDescriptor@4['Function1']
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+}
+
+TypeDeserializer@152 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@155 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@156 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@157 {
+    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
+    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@2['Function0']
+}
+
+TypeDeserializer@160 {
+    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
+    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@4['Function1']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.lazy.log

@@ -26,12 +26,12 @@ DeserializedTypeParameterDescriptor@13['T'] {
     upperBoundsAsType = DeserializedType@16['kotlin.Any']
 }
 
-DeserializedType@16['kotlin.Any'] {
+DeserializedType@12['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@17
     memberScope = DeserializedClassMemberScope@18
 }
 
-DeserializedType@12['kotlin.Any'] {
+DeserializedType@16['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@17
     memberScope = DeserializedClassMemberScope@18
 }
@@ -73,88 +73,149 @@ LazyJavaPackageFragment@24['<root>'] {
     classes('Int': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
     classes('KMemberFunction0': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
     classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('kotlin': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('foo': Name@54) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('kotlin': Name@58) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('kotlin': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('kotlin': Name@56) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@51
 }
 
 LazyJavaPackageFragment@41['io'] {
-    classes('Int': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = DeserializedPackageMemberScope@61 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@61
-    functions('foo': Name@54) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@60
-    membersProtos = LinkedHashMap@63 // through DeserializedPackageMemberScope@61
-    properties('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@61
+    classes('Int': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@66) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('lang': Name@62) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
 }
 
 LazyJavaPackageFragment@45['jvm'] {
-    classes('Int': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('foo': Name@54) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('Int': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    classes('Any': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('ExtensionFunction0': Name@72) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('Int': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('io': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('jvm': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('reflect': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = DeserializedPackageMemberScope@76 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    functions('foo': Name@54) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('io': Name@77) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    functions('io': Name@77) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('jvm': Name@78) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    functions('jvm': Name@78) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('reflect': Name@79) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    functions('reflect': Name@79) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@71
-    membersProtos = LinkedHashMap@81 // through DeserializedPackageMemberScope@76
-    properties('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    properties('io': Name@77) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    properties('jvm': Name@78) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    properties('reflect': Name@79) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
+    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('ExtensionFunction0': Name@67) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('Int': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('io': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('jvm': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('reflect': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    deserializedPackageScope = DeserializedPackageMemberScope@71 // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('io': Name@72) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
+    functions('io': Name@72) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('jvm': Name@73) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
+    functions('jvm': Name@73) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('reflect': Name@74) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
+    functions('reflect': Name@74) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@66
+    membersProtos = LinkedHashMap@76 // through DeserializedPackageMemberScope@71
+    properties('io': Name@72) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
+    properties('jvm': Name@73) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
+    properties('reflect': Name@74) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
 }
 
 LazyJavaPackageFragment@34['lang'] {
-    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('foo': Name@54) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@77
 }
 
 LazyJavaPackageFragment@8['reflect'] {
-    classes('KMemberFunction0': Name@84) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('KMemberFunction0': Name@86) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('KMemberFunction0': Name@78) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('KMemberFunction0': Name@80) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-TypeDeserializer@88 {
-    classDescriptors('2': Integer@89) = DeserializedClassDescriptor@90['Any']
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
 }
 
-TypeDeserializer@91 {
-    classDescriptors('3': Integer@92) = DeserializedClassDescriptor@90['Any']
-    classDescriptors('4': Integer@93) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+}
+
+TypeDeserializer@94 {
+    classDescriptors('2': Integer@95) = DeserializedClassDescriptor@96['Any']
+}
+
+TypeDeserializer@97 {
+    classDescriptors('3': Integer@98) = DeserializedClassDescriptor@96['Any']
+    classDescriptors('4': Integer@99) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.lazy.log

@@ -38,7 +38,7 @@ DeserializedTypeParameterDescriptor@21['T'] {
     upperBoundsAsType = DeserializedType@24['kotlin.Any']
 }
 
-DeserializedType@16['kotlin.Any'] {
+DeserializedType@20['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@25
     memberScope = DeserializedClassMemberScope@26
 }
@@ -48,12 +48,12 @@ DeserializedType@24['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@26
 }
 
-DeserializedType@12['kotlin.Any'] {
+DeserializedType@16['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@25
     memberScope = DeserializedClassMemberScope@26
 }
 
-DeserializedType@20['kotlin.Any'] {
+DeserializedType@12['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@25
     memberScope = DeserializedClassMemberScope@26
 }
@@ -113,91 +113,152 @@ LazyJavaPackageFragment@32['<root>'] {
     classes('KMemberFunction2': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@76
     classes('String': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@76
     classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('kotlin': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('kotlin': Name@84) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('kotlin': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('kotlin': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@60['io'] {
-    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('String': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = DeserializedPackageMemberScope@87 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@87
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
-    membersProtos = LinkedHashMap@89 // through DeserializedPackageMemberScope@87
-    properties('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@87
+    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('String': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
 LazyJavaPackageFragment@45['java'] {
-    classes('lang': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('lang': Name@92) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@91
+    classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('lang': Name@88) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
 LazyJavaPackageFragment@67['jvm'] {
-    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('String': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@90
+    classes('String': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@90
+    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@90
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    classes('Any': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('ExtensionFunction2': Name@98) = DeserializedClassDescriptor@2['ExtensionFunction2'] // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('String': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('io': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('jvm': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('reflect': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = DeserializedPackageMemberScope@102 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('io': Name@103) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-    functions('io': Name@103) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('jvm': Name@104) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-    functions('jvm': Name@104) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('reflect': Name@105) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-    functions('reflect': Name@105) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@97
-    membersProtos = LinkedHashMap@107 // through DeserializedPackageMemberScope@102
-    properties('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-    properties('io': Name@103) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-    properties('jvm': Name@104) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-    properties('reflect': Name@105) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
+    classes('Any': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('ExtensionFunction2': Name@93) = DeserializedClassDescriptor@2['ExtensionFunction2'] // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('String': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('io': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('jvm': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('reflect': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    deserializedPackageScope = DeserializedPackageMemberScope@97 // through LazyPackageFragmentScopeForJavaPackage@92
+    functions('io': Name@98) = EmptyList@83[empty] // through DeserializedPackageMemberScope@97
+    functions('io': Name@98) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@92
+    functions('jvm': Name@99) = EmptyList@83[empty] // through DeserializedPackageMemberScope@97
+    functions('jvm': Name@99) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@92
+    functions('reflect': Name@100) = EmptyList@83[empty] // through DeserializedPackageMemberScope@97
+    functions('reflect': Name@100) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@92
+    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@92
+    membersProtos = LinkedHashMap@102 // through DeserializedPackageMemberScope@97
+    properties('io': Name@98) = EmptyList@83[empty] // through DeserializedPackageMemberScope@97
+    properties('jvm': Name@99) = EmptyList@83[empty] // through DeserializedPackageMemberScope@97
+    properties('reflect': Name@100) = EmptyList@83[empty] // through DeserializedPackageMemberScope@97
 }
 
 LazyJavaPackageFragment@47['lang'] {
-    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@103
 }
 
 LazyJavaPackageFragment@8['reflect'] {
-    classes('KMemberFunction2': Name@110) = DeserializedClassDescriptor@4['KMemberFunction2'] // through LazyPackageFragmentScopeForJavaPackage@111
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('KMemberFunction2': Name@112) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    memberIndex = computeMemberIndex$1@113 // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('KMemberFunction2': Name@104) = DeserializedClassDescriptor@4['KMemberFunction2'] // through LazyPackageFragmentScopeForJavaPackage@105
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('KMemberFunction2': Name@106) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@105
 }
 
-TypeDeserializer@114 {
-    classDescriptors('2': Integer@115) = DeserializedClassDescriptor@116['Any']
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
 }
 
-TypeDeserializer@117 {
-    classDescriptors('3': Integer@118) = DeserializedClassDescriptor@116['Any']
-    classDescriptors('4': Integer@119) = DeserializedClassDescriptor@2['ExtensionFunction2']
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+}
+
+TypeDeserializer@120 {
+    classDescriptors('2': Integer@121) = DeserializedClassDescriptor@122['Any']
+}
+
+TypeDeserializer@123 {
+    classDescriptors('3': Integer@124) = DeserializedClassDescriptor@122['Any']
+    classDescriptors('4': Integer@125) = DeserializedClassDescriptor@2['ExtensionFunction2']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.lazy.log

@@ -58,17 +58,7 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,7 +68,17 @@ DeserializedType@22['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@34['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@18['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -186,116 +186,152 @@ LazyJavaPackageFragment@71['io'] {
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('x': Name@111) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('y': Name@112) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('z': Name@113) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
 }
 
 LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('lang': Name@116) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('lang': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@112
+    functions('lang': Name@113) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@112
+    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
 }
 
 LazyJavaPackageFragment@79['jvm'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@115
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('ExtensionFunction0': Name@122) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('ExtensionFunction1': Name@123) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('io': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('jvm': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('reflect': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = DeserializedPackageMemberScope@127 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('io': Name@128) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('io': Name@128) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('jvm': Name@129) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('jvm': Name@129) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('reflect': Name@130) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('reflect': Name@130) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@121
-    membersProtos = LinkedHashMap@132 // through DeserializedPackageMemberScope@127
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('io': Name@128) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('jvm': Name@129) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('reflect': Name@130) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('x': Name@111) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('y': Name@112) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('z': Name@113) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
+    classes('Any': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('ExtensionFunction0': Name@119) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('ExtensionFunction1': Name@120) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('io': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('jvm': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('reflect': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    deserializedPackageScope = DeserializedPackageMemberScope@124 // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('io': Name@125) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('jvm': Name@126) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('reflect': Name@127) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@118
+    membersProtos = LinkedHashMap@129 // through DeserializedPackageMemberScope@124
+    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
 }
 
 LazyJavaPackageFragment@56['lang'] {
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@130
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('KMemberFunction0': Name@136) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('KMemberFunction1': Name@137) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    memberIndex = computeMemberIndex$1@138 // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('KMemberFunction0': Name@133) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('KMemberFunction1': Name@134) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@132
 }
 
-TypeDeserializer@139 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
 
-TypeDeserializer@142 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
 
-TypeDeserializer@143 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
 
-TypeDeserializer@144 {
-    classDescriptors('3': Integer@145) = DeserializedClassDescriptor@141['Any']
-    classDescriptors('4': Integer@146) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-TypeDeserializer@147 {
-    classDescriptors('3': Integer@145) = DeserializedClassDescriptor@141['Any']
-    classDescriptors('4': Integer@146) = DeserializedClassDescriptor@4['ExtensionFunction1']
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+}
+
+TypeDeserializer@160 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@163 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@164 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@165 {
+    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
+    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@2['ExtensionFunction0']
+}
+
+TypeDeserializer@168 {
+    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
+    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.lazy.log

@@ -58,7 +58,7 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,7 +78,7 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -186,116 +186,152 @@ LazyJavaPackageFragment@71['io'] {
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('x': Name@111) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('y': Name@112) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('z': Name@113) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
 }
 
 LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('lang': Name@116) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('lang': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@112
+    functions('lang': Name@113) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@112
+    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
 }
 
 LazyJavaPackageFragment@79['jvm'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@115
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('ExtensionFunction0': Name@122) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('ExtensionFunction1': Name@123) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('io': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('jvm': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('reflect': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = DeserializedPackageMemberScope@127 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('io': Name@128) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('io': Name@128) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('jvm': Name@129) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('jvm': Name@129) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('reflect': Name@130) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('reflect': Name@130) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@121
-    membersProtos = LinkedHashMap@132 // through DeserializedPackageMemberScope@127
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('io': Name@128) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('jvm': Name@129) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('reflect': Name@130) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('x': Name@111) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('y': Name@112) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('z': Name@113) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
+    classes('Any': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('ExtensionFunction0': Name@119) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('ExtensionFunction1': Name@120) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('io': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('jvm': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('reflect': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    deserializedPackageScope = DeserializedPackageMemberScope@124 // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('io': Name@125) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('jvm': Name@126) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('reflect': Name@127) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@118
+    membersProtos = LinkedHashMap@129 // through DeserializedPackageMemberScope@124
+    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
 }
 
 LazyJavaPackageFragment@56['lang'] {
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@130
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('KMemberFunction0': Name@136) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('KMemberFunction1': Name@137) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    memberIndex = computeMemberIndex$1@138 // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('KMemberFunction0': Name@133) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('KMemberFunction1': Name@134) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@132
 }
 
-TypeDeserializer@139 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
 
-TypeDeserializer@142 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
 
-TypeDeserializer@143 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
 
-TypeDeserializer@144 {
-    classDescriptors('3': Integer@145) = DeserializedClassDescriptor@141['Any']
-    classDescriptors('4': Integer@146) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-TypeDeserializer@147 {
-    classDescriptors('3': Integer@145) = DeserializedClassDescriptor@141['Any']
-    classDescriptors('4': Integer@146) = DeserializedClassDescriptor@4['ExtensionFunction1']
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+}
+
+TypeDeserializer@160 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@163 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@164 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@165 {
+    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
+    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@2['ExtensionFunction0']
+}
+
+TypeDeserializer@168 {
+    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
+    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.lazy.log

@@ -58,12 +58,12 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@34['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -73,12 +73,12 @@ DeserializedType@18['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@34['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -187,116 +187,152 @@ LazyJavaPackageFragment@72['io'] {
     properties('bar': Name@100) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
     properties('baz': Name@101) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
     properties('foo': Name@102) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
-    properties('x': Name@112) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
-    properties('y': Name@113) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
-    properties('z': Name@114) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
 }
 
 LazyJavaPackageFragment@55['java'] {
-    classes('lang': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('lang': Name@117) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    memberIndex = computeMemberIndex$1@118 // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('lang': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('lang': Name@114) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    memberIndex = computeMemberIndex$1@115 // through LazyPackageFragmentScopeForJavaPackage@113
 }
 
 LazyJavaPackageFragment@80['jvm'] {
-    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('String': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('Unit': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('String': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('Unit': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@116
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('ExtensionFunction0': Name@123) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('ExtensionFunction1': Name@124) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('String': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('Unit': Name@99) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('io': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('jvm': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('reflect': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    deserializedPackageScope = DeserializedPackageMemberScope@128 // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('bar': Name@100) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('baz': Name@101) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('foo': Name@102) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('io': Name@129) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    functions('io': Name@129) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('jvm': Name@130) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    functions('jvm': Name@130) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('reflect': Name@131) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    functions('reflect': Name@131) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    memberIndex = computeMemberIndex$1@132 // through LazyPackageFragmentScopeForJavaPackage@122
-    membersProtos = LinkedHashMap@133 // through DeserializedPackageMemberScope@128
-    properties('bar': Name@100) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    properties('baz': Name@101) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    properties('foo': Name@102) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    properties('io': Name@129) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    properties('jvm': Name@130) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    properties('reflect': Name@131) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    properties('x': Name@112) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    properties('y': Name@113) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    properties('z': Name@114) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
+    classes('Any': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('ExtensionFunction0': Name@120) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('ExtensionFunction1': Name@121) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('String': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('Unit': Name@99) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('io': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('jvm': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('reflect': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    deserializedPackageScope = DeserializedPackageMemberScope@125 // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('bar': Name@100) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('baz': Name@101) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('foo': Name@102) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('io': Name@126) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    functions('io': Name@126) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('jvm': Name@127) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    functions('jvm': Name@127) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('reflect': Name@128) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    functions('reflect': Name@128) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    memberIndex = computeMemberIndex$1@129 // through LazyPackageFragmentScopeForJavaPackage@119
+    membersProtos = LinkedHashMap@130 // through DeserializedPackageMemberScope@125
+    properties('bar': Name@100) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    properties('baz': Name@101) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    properties('foo': Name@102) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    properties('io': Name@126) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    properties('jvm': Name@127) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    properties('reflect': Name@128) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
 }
 
 LazyJavaPackageFragment@57['lang'] {
-    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@134
-    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@131
+    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@131
+    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@131
+    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@131
+    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@131
+    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@131
+    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@131
+    memberIndex = computeMemberIndex$1@132 // through LazyPackageFragmentScopeForJavaPackage@131
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('KMemberFunction0': Name@137) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('KMemberFunction1': Name@138) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('String': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Unit': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    memberIndex = computeMemberIndex$1@139 // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('KMemberFunction0': Name@134) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('KMemberFunction1': Name@135) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('String': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('Unit': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@133
+    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@133
+    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@133
+    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@133
+    memberIndex = computeMemberIndex$1@136 // through LazyPackageFragmentScopeForJavaPackage@133
 }
 
-TypeDeserializer@140 {
-    classDescriptors('2': Integer@141) = DeserializedClassDescriptor@142['Any']
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+    <name not found> = EmptyList@105[empty]
+    <name not found> = EmptyList@105[empty]
+    <name not found> = EmptyList@105[empty]
+    <name not found> = EmptyList@105[empty]
 }
 
-TypeDeserializer@143 {
-    classDescriptors('2': Integer@141) = DeserializedClassDescriptor@142['Any']
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
+    <name not found> = EmptyList@105[empty]
+    <name not found> = EmptyList@105[empty]
+    <name not found> = EmptyList@105[empty]
+    <name not found> = EmptyList@105[empty]
 }
 
-TypeDeserializer@144 {
-    classDescriptors('2': Integer@141) = DeserializedClassDescriptor@142['Any']
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+    <name not found> = EmptyList@105[empty]
+    <name not found> = EmptyList@105[empty]
+    <name not found> = EmptyList@105[empty]
+    <name not found> = EmptyList@105[empty]
 }
 
-TypeDeserializer@145 {
-    classDescriptors('3': Integer@146) = DeserializedClassDescriptor@142['Any']
-    classDescriptors('4': Integer@147) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
 }
 
-TypeDeserializer@148 {
-    classDescriptors('3': Integer@146) = DeserializedClassDescriptor@142['Any']
-    classDescriptors('4': Integer@147) = DeserializedClassDescriptor@4['ExtensionFunction1']
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+}
+
+TypeDeserializer@161 {
+    classDescriptors('2': Integer@162) = DeserializedClassDescriptor@163['Any']
+}
+
+TypeDeserializer@164 {
+    classDescriptors('2': Integer@162) = DeserializedClassDescriptor@163['Any']
+}
+
+TypeDeserializer@165 {
+    classDescriptors('2': Integer@162) = DeserializedClassDescriptor@163['Any']
+}
+
+TypeDeserializer@166 {
+    classDescriptors('3': Integer@167) = DeserializedClassDescriptor@163['Any']
+    classDescriptors('4': Integer@168) = DeserializedClassDescriptor@2['ExtensionFunction0']
+}
+
+TypeDeserializer@169 {
+    classDescriptors('3': Integer@167) = DeserializedClassDescriptor@163['Any']
+    classDescriptors('4': Integer@168) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.lazy.log

@@ -58,7 +58,7 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -68,7 +68,12 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,11 +83,6 @@ DeserializedType@18['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
 DeserializedType@37['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
 }
@@ -155,141 +155,327 @@ LazyJavaPackageFragment@46['<root>'] {
     classes('KMemberFunction1': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@94
     classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@94
     classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('kotlin': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('kotlin': Name@105) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('kotlin': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    deserializedPackageScope = Empty@100 // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('kotlin': Name@101) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@94
 }
 
 LazyJavaPackageFragment@71['io'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = DeserializedPackageMemberScope@108 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
-    membersProtos = LinkedHashMap@110 // through DeserializedPackageMemberScope@108
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@104
 }
 
 LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('lang': Name@113) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('lang': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    deserializedPackageScope = Empty@100 // through LazyPackageFragmentScopeForJavaPackage@106
+    functions('lang': Name@107) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@106
+    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@106
 }
 
 LazyJavaPackageFragment@79['jvm'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@109
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('ExtensionFunction0': Name@119) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('ExtensionFunction1': Name@120) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('io': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('jvm': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('reflect': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = DeserializedPackageMemberScope@124 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('io': Name@125) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('jvm': Name@126) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('reflect': Name@127) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@118
-    membersProtos = LinkedHashMap@129 // through DeserializedPackageMemberScope@124
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-}
-
-LazyJavaPackageFragment@56['lang'] {
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('Any': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('ExtensionFunction0': Name@112) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('ExtensionFunction1': Name@113) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('io': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('jvm': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('reflect': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    deserializedPackageScope = DeserializedPackageMemberScope@117 // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('io': Name@118) = EmptyList@102[empty] // through DeserializedPackageMemberScope@117
+    functions('io': Name@118) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('jvm': Name@119) = EmptyList@102[empty] // through DeserializedPackageMemberScope@117
+    functions('jvm': Name@119) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('reflect': Name@120) = EmptyList@102[empty] // through DeserializedPackageMemberScope@117
+    functions('reflect': Name@120) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@111
+    membersProtos = LinkedHashMap@122 // through DeserializedPackageMemberScope@117
+    properties('io': Name@118) = EmptyList@102[empty] // through DeserializedPackageMemberScope@117
+    properties('jvm': Name@119) = EmptyList@102[empty] // through DeserializedPackageMemberScope@117
+    properties('reflect': Name@120) = EmptyList@102[empty] // through DeserializedPackageMemberScope@117
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('KMemberFunction0': Name@133) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('KMemberFunction1': Name@134) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('KMemberFunction0': Name@124) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('KMemberFunction1': Name@125) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@123
 }
 
-TypeDeserializer@136 {
-    classDescriptors('2': Integer@137) = DeserializedClassDescriptor@138['Any']
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
 }
 
-TypeDeserializer@139 {
-    classDescriptors('2': Integer@137) = DeserializedClassDescriptor@138['Any']
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
 }
 
-TypeDeserializer@140 {
-    classDescriptors('2': Integer@137) = DeserializedClassDescriptor@138['Any']
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
 }
 
-TypeDeserializer@141 {
-    classDescriptors('3': Integer@142) = DeserializedClassDescriptor@138['Any']
-    classDescriptors('4': Integer@143) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
 }
 
-TypeDeserializer@144 {
-    classDescriptors('3': Integer@142) = DeserializedClassDescriptor@138['Any']
-    classDescriptors('4': Integer@143) = DeserializedClassDescriptor@4['ExtensionFunction1']
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+}
+
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+}
+
+ResolutionTaskHolder@150 {
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+}
+
+ResolutionTaskHolder@151 {
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+}
+
+ResolutionTaskHolder@152 {
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+}
+
+ResolutionTaskHolder@153 {
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+}
+
+ResolutionTaskHolder@154 {
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+}
+
+ResolutionTaskHolder@155 {
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+}
+
+ResolutionTaskHolder@158 {
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+}
+
+ResolutionTaskHolder@159 {
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+}
+
+ResolutionTaskHolder@161 {
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+    <name not found> = EmptyList@102[empty]
+}
+
+TypeDeserializer@162 {
+    classDescriptors('2': Integer@163) = DeserializedClassDescriptor@164['Any']
+}
+
+TypeDeserializer@165 {
+    classDescriptors('2': Integer@163) = DeserializedClassDescriptor@164['Any']
+}
+
+TypeDeserializer@166 {
+    classDescriptors('2': Integer@163) = DeserializedClassDescriptor@164['Any']
+}
+
+TypeDeserializer@167 {
+    classDescriptors('3': Integer@168) = DeserializedClassDescriptor@164['Any']
+    classDescriptors('4': Integer@169) = DeserializedClassDescriptor@2['ExtensionFunction0']
+}
+
+TypeDeserializer@170 {
+    classDescriptors('3': Integer@168) = DeserializedClassDescriptor@164['Any']
+    classDescriptors('4': Integer@169) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.lazy.log

@@ -74,69 +74,398 @@ LazyJavaPackageFragment@35['io'] {
     memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
     membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
     properties('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    properties('y': Name@59) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
 }
 
 LazyJavaPackageFragment@24['java'] {
-    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('lang': Name@62) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('lang': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@40['jvm'] {
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    classes('Any': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('Function0': Name@68) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('io': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('jvm': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('reflect': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = DeserializedPackageMemberScope@72 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('io': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('io': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('jvm': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('jvm': Name@74) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('reflect': Name@75) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('reflect': Name@75) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@67
-    membersProtos = LinkedHashMap@77 // through DeserializedPackageMemberScope@72
-    properties('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('io': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('jvm': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('reflect': Name@75) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('y': Name@59) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
+    classes('Any': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('Function0': Name@66) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('io': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('reflect': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('io': Name@71) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('jvm': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('reflect': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@65
+    membersProtos = LinkedHashMap@75 // through DeserializedPackageMemberScope@70
+    properties('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
 }
 
 LazyJavaPackageFragment@26['lang'] {
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@80) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('KFunction0': Name@82) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('KFunction0': Name@78) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('KFunction0': Name@80) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-TypeDeserializer@84 {
-    classDescriptors('2': Integer@85) = DeserializedClassDescriptor@86['Any']
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
 }
 
-TypeDeserializer@87 {
-    classDescriptors('3': Integer@88) = DeserializedClassDescriptor@86['Any']
-    classDescriptors('4': Integer@89) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@122 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@123 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@125 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+TypeDeserializer@126 {
+    classDescriptors('2': Integer@127) = DeserializedClassDescriptor@128['Any']
+}
+
+TypeDeserializer@129 {
+    classDescriptors('3': Integer@130) = DeserializedClassDescriptor@128['Any']
+    classDescriptors('4': Integer@131) = DeserializedClassDescriptor@2['Function0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.lazy.log

@@ -75,69 +75,326 @@ LazyJavaPackageFragment@34['io'] {
     memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
     membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
     properties('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    properties('y': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
 }
 
 LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('lang': Name@61) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('lang': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@39['jvm'] {
-    classes('Int': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('Int': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Function0': Name@67) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Int': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('io': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('jvm': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('reflect': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = DeserializedPackageMemberScope@71 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('io': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('io': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('jvm': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('jvm': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('reflect': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('reflect': Name@74) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@66
-    membersProtos = LinkedHashMap@76 // through DeserializedPackageMemberScope@71
-    properties('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('io': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('jvm': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('reflect': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('y': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
+    classes('Any': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('Function0': Name@66) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('Int': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('io': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('reflect': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('io': Name@71) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('jvm': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('reflect': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@65
+    membersProtos = LinkedHashMap@75 // through DeserializedPackageMemberScope@70
+    properties('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@79) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('KFunction0': Name@81) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('KFunction0': Name@78) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('KFunction0': Name@80) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-TypeDeserializer@83 {
-    classDescriptors('2': Integer@84) = DeserializedClassDescriptor@85['Any']
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
 }
 
-TypeDeserializer@86 {
-    classDescriptors('3': Integer@87) = DeserializedClassDescriptor@85['Any']
-    classDescriptors('4': Integer@88) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+}
+
+TypeDeserializer@108 {
+    classDescriptors('2': Integer@109) = DeserializedClassDescriptor@110['Any']
+}
+
+TypeDeserializer@111 {
+    classDescriptors('3': Integer@112) = DeserializedClassDescriptor@110['Any']
+    classDescriptors('4': Integer@113) = DeserializedClassDescriptor@2['Function0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.lazy.log

@@ -92,11 +92,61 @@ LazyJavaPackageFragment@6['reflect'] {
     memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
-TypeDeserializer@67 {
-    classDescriptors('2': Integer@68) = DeserializedClassDescriptor@69['Any']
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
 }
 
-TypeDeserializer@70 {
-    classDescriptors('3': Integer@71) = DeserializedClassDescriptor@69['Any']
-    classDescriptors('4': Integer@72) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+}
+
+TypeDeserializer@77 {
+    classDescriptors('2': Integer@78) = DeserializedClassDescriptor@79['Any']
+}
+
+TypeDeserializer@80 {
+    classDescriptors('3': Integer@81) = DeserializedClassDescriptor@79['Any']
+    classDescriptors('4': Integer@82) = DeserializedClassDescriptor@2['Function0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.lazy.log

@@ -100,10 +100,15 @@ LazyJavaPackageFragment@8['reflect'] {
     classes('KFunction0': Name@55) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@56
 }
 
-TypeDeserializer@57 {
-    classDescriptors('2': Integer@58) = DeserializedClassDescriptor@59['Any']
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-TypeDeserializer@60 {
-    classDescriptors('4': Integer@61) = DeserializedClassDescriptor@2['Function0']
+TypeDeserializer@61 {
+    classDescriptors('2': Integer@62) = DeserializedClassDescriptor@63['Any']
+}
+
+TypeDeserializer@64 {
+    classDescriptors('4': Integer@65) = DeserializedClassDescriptor@2['Function0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.lazy.log

@@ -73,84 +73,142 @@ LazyJavaPackageFragmentProvider@22 {
 LazyJavaPackageFragment@24['<root>'] {
     classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@52
     classes('KMemberFunction0': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('kotlin': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('foo': Name@54) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('kotlin': Name@58) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('kotlin': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('kotlin': Name@56) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@52
 }
 
 LazyJavaPackageFragment@40['io'] {
-    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = DeserializedPackageMemberScope@61 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@61
-    functions('foo': Name@54) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@60
-    membersProtos = LinkedHashMap@63 // through DeserializedPackageMemberScope@61
-    properties('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@61
+    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@29['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@66) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('lang': Name@62) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
 }
 
 LazyJavaPackageFragment@45['jvm'] {
-    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('foo': Name@54) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    classes('Any': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('ExtensionFunction0': Name@72) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('io': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('jvm': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('reflect': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = DeserializedPackageMemberScope@76 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    functions('foo': Name@54) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('io': Name@77) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    functions('io': Name@77) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('jvm': Name@78) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    functions('jvm': Name@78) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('reflect': Name@79) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    functions('reflect': Name@79) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@71
-    membersProtos = LinkedHashMap@81 // through DeserializedPackageMemberScope@76
-    properties('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    properties('io': Name@77) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    properties('jvm': Name@78) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    properties('reflect': Name@79) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-}
-
-LazyJavaPackageFragment@31['lang'] {
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('foo': Name@54) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('ExtensionFunction0': Name@67) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('io': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('jvm': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('reflect': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    deserializedPackageScope = DeserializedPackageMemberScope@71 // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('io': Name@72) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
+    functions('io': Name@72) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('jvm': Name@73) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
+    functions('jvm': Name@73) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('reflect': Name@74) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
+    functions('reflect': Name@74) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@66
+    membersProtos = LinkedHashMap@76 // through DeserializedPackageMemberScope@71
+    properties('io': Name@72) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
+    properties('jvm': Name@73) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
+    properties('reflect': Name@74) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
 }
 
 LazyJavaPackageFragment@8['reflect'] {
-    classes('KMemberFunction0': Name@84) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('KMemberFunction0': Name@86) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('KMemberFunction0': Name@77) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@78
+    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('KMemberFunction0': Name@79) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@78
 }
 
-TypeDeserializer@88 {
-    classDescriptors('2': Integer@89) = DeserializedClassDescriptor@90['Any']
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
 }
 
-TypeDeserializer@91 {
-    classDescriptors('3': Integer@92) = DeserializedClassDescriptor@90['Any']
-    classDescriptors('4': Integer@93) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+}
+
+TypeDeserializer@93 {
+    classDescriptors('2': Integer@94) = DeserializedClassDescriptor@95['Any']
+}
+
+TypeDeserializer@96 {
+    classDescriptors('3': Integer@97) = DeserializedClassDescriptor@95['Any']
+    classDescriptors('4': Integer@98) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.lazy.log

@@ -95,73 +95,85 @@ LazyJavaPackageFragment@41['io'] {
     memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
     membersProtos = LinkedHashMap@64 // through DeserializedPackageMemberScope@62
     properties('foo': Name@55) = EmptyList@58[empty] // through DeserializedPackageMemberScope@62
-    properties('x': Name@65) = EmptyList@58[empty] // through DeserializedPackageMemberScope@62
 }
 
 LazyJavaPackageFragment@30['java'] {
-    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('lang': Name@68) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('lang': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('lang': Name@67) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@66
 }
 
 LazyJavaPackageFragment@46['jvm'] {
-    classes('Unit': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('foo': Name@55) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('Unit': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('foo': Name@55) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@69
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    classes('Any': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('ExtensionFunction0': Name@74) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('Unit': Name@54) = DeserializedClassDescriptor@6['Unit'] // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('io': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('jvm': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('reflect': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = DeserializedPackageMemberScope@78 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('foo': Name@55) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78
-    functions('foo': Name@55) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('io': Name@79) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78
-    functions('io': Name@79) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('jvm': Name@80) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78
-    functions('jvm': Name@80) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('reflect': Name@81) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78
-    functions('reflect': Name@81) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@73
-    membersProtos = LinkedHashMap@83 // through DeserializedPackageMemberScope@78
-    properties('foo': Name@55) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78
-    properties('io': Name@79) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78
-    properties('jvm': Name@80) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78
-    properties('reflect': Name@81) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78
-    properties('x': Name@65) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78
+    classes('Any': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('ExtensionFunction0': Name@73) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('Unit': Name@54) = DeserializedClassDescriptor@6['Unit'] // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('io': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('jvm': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('reflect': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    deserializedPackageScope = DeserializedPackageMemberScope@77 // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('foo': Name@55) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
+    functions('foo': Name@55) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('io': Name@78) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
+    functions('io': Name@78) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('jvm': Name@79) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
+    functions('jvm': Name@79) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('reflect': Name@80) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
+    functions('reflect': Name@80) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@72
+    membersProtos = LinkedHashMap@82 // through DeserializedPackageMemberScope@77
+    properties('foo': Name@55) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
+    properties('io': Name@78) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
+    properties('jvm': Name@79) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
+    properties('reflect': Name@80) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
 }
 
 LazyJavaPackageFragment@32['lang'] {
-    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('foo': Name@55) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('foo': Name@55) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
 LazyJavaPackageFragment@8['reflect'] {
-    classes('KMemberFunction0': Name@86) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('KMemberFunction0': Name@88) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('KMemberFunction0': Name@85) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@86
+    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('KMemberFunction0': Name@87) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
 }
 
-TypeDeserializer@90 {
-    classDescriptors('2': Integer@91) = DeserializedClassDescriptor@92['Any']
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
+    <name not found> = EmptyList@58[empty]
 }
 
-TypeDeserializer@93 {
-    classDescriptors('2': Integer@91) = DeserializedClassDescriptor@92['Any']
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
 }
 
-TypeDeserializer@94 {
-    classDescriptors('3': Integer@95) = DeserializedClassDescriptor@92['Any']
-    classDescriptors('4': Integer@96) = DeserializedClassDescriptor@2['ExtensionFunction0']
+TypeDeserializer@97 {
+    classDescriptors('2': Integer@98) = DeserializedClassDescriptor@99['Any']
+}
+
+TypeDeserializer@100 {
+    classDescriptors('2': Integer@98) = DeserializedClassDescriptor@99['Any']
+}
+
+TypeDeserializer@101 {
+    classDescriptors('3': Integer@102) = DeserializedClassDescriptor@99['Any']
+    classDescriptors('4': Integer@103) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.lazy.log

@@ -73,12 +73,17 @@ DeserializedTypeParameterDescriptor@39['T'] {
     upperBoundsAsType = DeserializedType@42['kotlin.Any']
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@38['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@43
     memberScope = DeserializedClassMemberScope@44
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@42['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@43
+    memberScope = DeserializedClassMemberScope@44
+}
+
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@43
     memberScope = DeserializedClassMemberScope@44
 }
@@ -93,12 +98,7 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@44
 }
 
-DeserializedType@42['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@43
-    memberScope = DeserializedClassMemberScope@44
-}
-
-DeserializedType@38['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@43
     memberScope = DeserializedClassMemberScope@44
 }
@@ -201,154 +201,318 @@ LazyJavaPackageFragment@57['<root>'] {
     classes('KMemberFunction0': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@121
     classes('String': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@121
     classes('Unit': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('bar': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('bazbaz': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foofoo': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('kotlin': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('other': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = Empty@133 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('bar': Name@128) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('bazbaz': Name@129) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('foofoo': Name@130) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('kotlin': Name@135) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('other': Name@136) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('bazbaz': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('foofoo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('kotlin': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('other': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    deserializedPackageScope = Empty@132 // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('bazbaz': Name@128) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('foofoo': Name@129) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('kotlin': Name@134) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('other': Name@135) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    memberIndex = computeMemberIndex$1@136 // through LazyPackageFragmentScopeForJavaPackage@121
 }
 
 LazyJavaPackageFragment@88['io'] {
-    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('String': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('Unit': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('bar': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('bazbaz': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('foofoo': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    deserializedPackageScope = DeserializedPackageMemberScope@140 // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('bar': Name@128) = EmptyList@134[empty] // through DeserializedPackageMemberScope@140
-    functions('bar': Name@128) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('bazbaz': Name@129) = EmptyList@134[empty] // through DeserializedPackageMemberScope@140
-    functions('bazbaz': Name@129) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('foofoo': Name@130) = EmptyList@134[empty] // through DeserializedPackageMemberScope@140
-    functions('foofoo': Name@130) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    memberIndex = computeMemberIndex$1@141 // through LazyPackageFragmentScopeForJavaPackage@138
-    membersProtos = LinkedHashMap@142 // through DeserializedPackageMemberScope@140
-    properties('bar': Name@128) = EmptyList@134[empty] // through DeserializedPackageMemberScope@140
-    properties('bazbaz': Name@129) = EmptyList@134[empty] // through DeserializedPackageMemberScope@140
-    properties('foofoo': Name@130) = EmptyList@134[empty] // through DeserializedPackageMemberScope@140
+    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('String': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('Unit': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('bazbaz': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('foofoo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    deserializedPackageScope = DeserializedPackageMemberScope@139 // through LazyPackageFragmentScopeForJavaPackage@137
+    functions('bazbaz': Name@128) = EmptyList@133[empty] // through DeserializedPackageMemberScope@139
+    functions('bazbaz': Name@128) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@137
+    functions('foofoo': Name@129) = EmptyList@133[empty] // through DeserializedPackageMemberScope@139
+    functions('foofoo': Name@129) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@137
+    memberIndex = computeMemberIndex$1@140 // through LazyPackageFragmentScopeForJavaPackage@137
+    membersProtos = LinkedHashMap@141 // through DeserializedPackageMemberScope@139
+    properties('foofoo': Name@129) = EmptyList@133[empty] // through DeserializedPackageMemberScope@139
 }
 
 LazyJavaPackageFragment@67['java'] {
-    classes('lang': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@144
-    deserializedPackageScope = Empty@133 // through LazyPackageFragmentScopeForJavaPackage@144
-    functions('lang': Name@145) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@144
-    memberIndex = computeMemberIndex$1@146 // through LazyPackageFragmentScopeForJavaPackage@144
+    classes('lang': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@143
+    deserializedPackageScope = Empty@132 // through LazyPackageFragmentScopeForJavaPackage@143
+    functions('lang': Name@144) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@143
+    memberIndex = computeMemberIndex$1@145 // through LazyPackageFragmentScopeForJavaPackage@143
 }
 
 LazyJavaPackageFragment@98['jvm'] {
-    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('String': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('Unit': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('bar': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('bazbaz': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('foofoo': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    deserializedPackageScope = Empty@133 // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('bar': Name@128) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('bazbaz': Name@129) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('foofoo': Name@130) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    memberIndex = computeMemberIndex$1@148 // through LazyPackageFragmentScopeForJavaPackage@147
+    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('String': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('Unit': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('bazbaz': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('foofoo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    deserializedPackageScope = Empty@132 // through LazyPackageFragmentScopeForJavaPackage@146
+    functions('bazbaz': Name@128) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@146
+    functions('foofoo': Name@129) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@146
+    memberIndex = computeMemberIndex$1@147 // through LazyPackageFragmentScopeForJavaPackage@146
 }
 
 LazyJavaPackageFragment@17['kotlin'] {
-    classes('Any': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('ExtensionFunction0': Name@151) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('ExtensionFunction1': Name@152) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('Function0': Name@153) = DeserializedClassDescriptor@6['Function0'] // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('String': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('Unit': Name@127) = DeserializedClassDescriptor@14['Unit'] // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('bar': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('bazbaz': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('foofoo': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('io': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('jvm': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('reflect': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    deserializedPackageScope = DeserializedPackageMemberScope@157 // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('bar': Name@128) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    functions('bar': Name@128) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('bazbaz': Name@129) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    functions('bazbaz': Name@129) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('foofoo': Name@130) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    functions('foofoo': Name@130) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('io': Name@158) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    functions('io': Name@158) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('jvm': Name@159) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    functions('jvm': Name@159) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('reflect': Name@160) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    functions('reflect': Name@160) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    memberIndex = computeMemberIndex$1@161 // through LazyPackageFragmentScopeForJavaPackage@150
-    membersProtos = LinkedHashMap@162 // through DeserializedPackageMemberScope@157
-    properties('bar': Name@128) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    properties('bazbaz': Name@129) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    properties('foofoo': Name@130) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    properties('io': Name@158) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    properties('jvm': Name@159) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    properties('reflect': Name@160) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
+    classes('Any': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('ExtensionFunction0': Name@150) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('ExtensionFunction1': Name@151) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('Function0': Name@152) = DeserializedClassDescriptor@6['Function0'] // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('String': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('Unit': Name@127) = DeserializedClassDescriptor@14['Unit'] // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('bazbaz': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('foofoo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('io': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('jvm': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('reflect': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    deserializedPackageScope = DeserializedPackageMemberScope@156 // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('bazbaz': Name@128) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
+    functions('bazbaz': Name@128) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('foofoo': Name@129) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
+    functions('foofoo': Name@129) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('io': Name@157) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
+    functions('io': Name@157) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('jvm': Name@158) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
+    functions('jvm': Name@158) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('reflect': Name@159) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
+    functions('reflect': Name@159) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    memberIndex = computeMemberIndex$1@160 // through LazyPackageFragmentScopeForJavaPackage@149
+    membersProtos = LinkedHashMap@161 // through DeserializedPackageMemberScope@156
+    properties('foofoo': Name@129) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
+    properties('io': Name@157) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
+    properties('jvm': Name@158) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
+    properties('reflect': Name@159) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
 }
 
 LazyJavaPackageFragment@69['lang'] {
-    classes('bar': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@163
-    classes('bazbaz': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@163
-    classes('foofoo': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@163
-    deserializedPackageScope = Empty@133 // through LazyPackageFragmentScopeForJavaPackage@163
-    functions('bar': Name@128) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@163
-    functions('bazbaz': Name@129) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@163
-    functions('foofoo': Name@130) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@163
-    memberIndex = computeMemberIndex$1@164 // through LazyPackageFragmentScopeForJavaPackage@163
+    classes('bazbaz': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@162
+    classes('foofoo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@162
+    deserializedPackageScope = Empty@132 // through LazyPackageFragmentScopeForJavaPackage@162
+    functions('bazbaz': Name@128) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@162
+    functions('foofoo': Name@129) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@162
+    memberIndex = computeMemberIndex$1@163 // through LazyPackageFragmentScopeForJavaPackage@162
 }
 
 LazyJavaPackageFragment@18['reflect'] {
-    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('KExtensionFunction1': Name@166) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('KFunction0': Name@167) = DeserializedClassDescriptor@10['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('KMemberFunction0': Name@168) = DeserializedClassDescriptor@12['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('String': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('Unit': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('bar': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('bazbaz': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('foofoo': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    deserializedPackageScope = Empty@133 // through LazyPackageFragmentScopeForJavaPackage@165
-    functions('bar': Name@128) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@165
-    functions('bazbaz': Name@129) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@165
-    functions('foofoo': Name@130) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@165
-    memberIndex = computeMemberIndex$1@169 // through LazyPackageFragmentScopeForJavaPackage@165
+    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('KExtensionFunction1': Name@165) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('KFunction0': Name@166) = DeserializedClassDescriptor@10['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('KMemberFunction0': Name@167) = DeserializedClassDescriptor@12['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('String': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('Unit': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('bazbaz': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('foofoo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@164
+    deserializedPackageScope = Empty@132 // through LazyPackageFragmentScopeForJavaPackage@164
+    functions('bazbaz': Name@128) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@164
+    functions('foofoo': Name@129) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@164
+    memberIndex = computeMemberIndex$1@168 // through LazyPackageFragmentScopeForJavaPackage@164
 }
 
-TypeDeserializer@170 {
-    classDescriptors('2': Integer@171) = DeserializedClassDescriptor@172['Any']
+ResolutionTaskHolder@169 {
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
 }
 
-TypeDeserializer@173 {
-    classDescriptors('2': Integer@171) = DeserializedClassDescriptor@172['Any']
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
 }
 
-TypeDeserializer@174 {
-    classDescriptors('2': Integer@171) = DeserializedClassDescriptor@172['Any']
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
 }
 
-TypeDeserializer@175 {
-    classDescriptors('2': Integer@171) = DeserializedClassDescriptor@172['Any']
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
 }
 
-TypeDeserializer@176 {
-    classDescriptors('3': Integer@177) = DeserializedClassDescriptor@172['Any']
-    classDescriptors('4': Integer@178) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
 }
 
-TypeDeserializer@179 {
-    classDescriptors('3': Integer@177) = DeserializedClassDescriptor@172['Any']
-    classDescriptors('4': Integer@178) = DeserializedClassDescriptor@4['ExtensionFunction1']
+ResolutionTaskHolder@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
 }
 
-TypeDeserializer@180 {
-    classDescriptors('3': Integer@177) = DeserializedClassDescriptor@172['Any']
-    classDescriptors('4': Integer@178) = DeserializedClassDescriptor@6['Function0']
+ResolutionTaskHolder@193 {
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+}
+
+ResolutionTaskHolder@194 {
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+}
+
+ResolutionTaskHolder@195 {
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+}
+
+ResolutionTaskHolder@196 {
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+}
+
+ResolutionTaskHolder@197 {
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+}
+
+ResolutionTaskHolder@198 {
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+}
+
+ResolutionTaskHolder@199 {
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+}
+
+ResolutionTaskHolder@200 {
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
+}
+
+TypeDeserializer@201 {
+    classDescriptors('2': Integer@202) = DeserializedClassDescriptor@203['Any']
+}
+
+TypeDeserializer@204 {
+    classDescriptors('2': Integer@202) = DeserializedClassDescriptor@203['Any']
+}
+
+TypeDeserializer@205 {
+    classDescriptors('2': Integer@202) = DeserializedClassDescriptor@203['Any']
+}
+
+TypeDeserializer@206 {
+    classDescriptors('2': Integer@202) = DeserializedClassDescriptor@203['Any']
+}
+
+TypeDeserializer@207 {
+    classDescriptors('3': Integer@208) = DeserializedClassDescriptor@203['Any']
+    classDescriptors('4': Integer@209) = DeserializedClassDescriptor@2['ExtensionFunction0']
+}
+
+TypeDeserializer@210 {
+    classDescriptors('3': Integer@208) = DeserializedClassDescriptor@203['Any']
+    classDescriptors('4': Integer@209) = DeserializedClassDescriptor@4['ExtensionFunction1']
+}
+
+TypeDeserializer@211 {
+    classDescriptors('3': Integer@208) = DeserializedClassDescriptor@203['Any']
+    classDescriptors('4': Integer@209) = DeserializedClassDescriptor@6['Function0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.lazy.log

@@ -46,11 +46,6 @@ DeserializedTypeParameterDescriptor@23['R'] {
     upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
 }
 
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
 DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
@@ -61,6 +56,11 @@ DeserializedType@18['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
+DeserializedType@26['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@27
+    memberScope = DeserializedClassMemberScope@28
+}
+
 DeserializedType@29['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
 }
@@ -159,116 +159,188 @@ LazyJavaPackageFragment@61['io'] {
     properties('bar': Name@86) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
     properties('baz': Name@87) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
     properties('foo': Name@88) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
-    properties('x': Name@98) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
-    properties('y': Name@99) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
-    properties('z': Name@100) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
 }
 
 LazyJavaPackageFragment@46['java'] {
-    classes('lang': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('lang': Name@103) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@102
+    classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('lang': Name@100) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
 }
 
 LazyJavaPackageFragment@68['jvm'] {
-    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('String': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('Unit': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@102
+    classes('String': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@102
+    classes('Unit': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@102
+    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@102
+    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@102
+    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@102
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@102
+    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@102
+    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@102
+    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@102
+    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@102
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Function0': Name@109) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Function1': Name@110) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('String': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Unit': Name@85) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('io': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('jvm': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('reflect': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = DeserializedPackageMemberScope@114 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('bar': Name@86) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('baz': Name@87) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('foo': Name@88) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('io': Name@115) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    functions('io': Name@115) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('jvm': Name@116) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    functions('jvm': Name@116) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('reflect': Name@117) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    functions('reflect': Name@117) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    memberIndex = computeMemberIndex$1@118 // through LazyPackageFragmentScopeForJavaPackage@108
-    membersProtos = LinkedHashMap@119 // through DeserializedPackageMemberScope@114
-    properties('bar': Name@86) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    properties('baz': Name@87) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    properties('foo': Name@88) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    properties('io': Name@115) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    properties('jvm': Name@116) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    properties('reflect': Name@117) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    properties('x': Name@98) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    properties('y': Name@99) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    properties('z': Name@100) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
+    classes('Any': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('Function0': Name@106) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('Function1': Name@107) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('String': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('Unit': Name@85) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('io': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('jvm': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('reflect': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    deserializedPackageScope = DeserializedPackageMemberScope@111 // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('bar': Name@86) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('baz': Name@87) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('foo': Name@88) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('io': Name@112) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    functions('io': Name@112) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('jvm': Name@113) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    functions('jvm': Name@113) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('reflect': Name@114) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    functions('reflect': Name@114) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    memberIndex = computeMemberIndex$1@115 // through LazyPackageFragmentScopeForJavaPackage@105
+    membersProtos = LinkedHashMap@116 // through DeserializedPackageMemberScope@111
+    properties('bar': Name@86) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    properties('baz': Name@87) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    properties('foo': Name@88) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    properties('io': Name@112) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    properties('jvm': Name@113) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    properties('reflect': Name@114) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
 }
 
 LazyJavaPackageFragment@48['lang'] {
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@120
-    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@120
+    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@117
+    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@117
+    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@117
+    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@117
+    memberIndex = computeMemberIndex$1@118 // through LazyPackageFragmentScopeForJavaPackage@117
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('KFunction0': Name@123) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('KFunction1': Name@124) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('String': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('Unit': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    memberIndex = computeMemberIndex$1@125 // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('KFunction0': Name@120) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('KFunction1': Name@121) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('String': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('Unit': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    memberIndex = computeMemberIndex$1@122 // through LazyPackageFragmentScopeForJavaPackage@119
 }
 
-TypeDeserializer@126 {
-    classDescriptors('2': Integer@127) = DeserializedClassDescriptor@128['Any']
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
 }
 
-TypeDeserializer@129 {
-    classDescriptors('2': Integer@127) = DeserializedClassDescriptor@128['Any']
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
 }
 
-TypeDeserializer@130 {
-    classDescriptors('2': Integer@127) = DeserializedClassDescriptor@128['Any']
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
+    <name not found> = EmptyList@91[empty]
 }
 
-TypeDeserializer@131 {
-    classDescriptors('3': Integer@132) = DeserializedClassDescriptor@128['Any']
-    classDescriptors('4': Integer@133) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
 }
 
-TypeDeserializer@134 {
-    classDescriptors('3': Integer@132) = DeserializedClassDescriptor@128['Any']
-    classDescriptors('4': Integer@133) = DeserializedClassDescriptor@4['Function1']
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
+}
+
+ResolutionTaskHolder@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
+}
+
+TypeDeserializer@147 {
+    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
+}
+
+TypeDeserializer@150 {
+    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
+}
+
+TypeDeserializer@151 {
+    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
+}
+
+TypeDeserializer@152 {
+    classDescriptors('3': Integer@153) = DeserializedClassDescriptor@149['Any']
+    classDescriptors('4': Integer@154) = DeserializedClassDescriptor@2['Function0']
+}
+
+TypeDeserializer@155 {
+    classDescriptors('3': Integer@153) = DeserializedClassDescriptor@149['Any']
+    classDescriptors('4': Integer@154) = DeserializedClassDescriptor@4['Function1']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.lazy.log

@@ -46,12 +46,12 @@ DeserializedTypeParameterDescriptor@23['R'] {
     upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -164,116 +164,188 @@ LazyJavaPackageFragment@63['io'] {
     properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
     properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
     properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('x': Name@103) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('y': Name@104) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('z': Name@105) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
 }
 
 LazyJavaPackageFragment@46['java'] {
-    classes('lang': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('lang': Name@108) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('lang': Name@105) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
 }
 
 LazyJavaPackageFragment@71['jvm'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@107
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Function0': Name@114) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Function1': Name@115) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Unit': Name@90) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('io': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('jvm': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('reflect': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = DeserializedPackageMemberScope@119 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('io': Name@120) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('io': Name@120) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('jvm': Name@121) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('jvm': Name@121) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('reflect': Name@122) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('reflect': Name@122) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@113
-    membersProtos = LinkedHashMap@124 // through DeserializedPackageMemberScope@119
-    properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('io': Name@120) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('jvm': Name@121) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('reflect': Name@122) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('x': Name@103) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('y': Name@104) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('z': Name@105) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
+    classes('Any': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Function0': Name@111) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Function1': Name@112) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Unit': Name@90) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('io': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('jvm': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('reflect': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    deserializedPackageScope = DeserializedPackageMemberScope@116 // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('io': Name@117) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('io': Name@117) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('jvm': Name@118) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('jvm': Name@118) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('reflect': Name@119) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('reflect': Name@119) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@110
+    membersProtos = LinkedHashMap@121 // through DeserializedPackageMemberScope@116
+    properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('io': Name@117) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('jvm': Name@118) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('reflect': Name@119) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
 }
 
 LazyJavaPackageFragment@48['lang'] {
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    memberIndex = computeMemberIndex$1@126 // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@122
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
+    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@122
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('KFunction0': Name@128) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('KFunction1': Name@129) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('KFunction0': Name@125) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('KFunction1': Name@126) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@124
 }
 
-TypeDeserializer@131 {
-    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
 }
 
-TypeDeserializer@134 {
-    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
 }
 
-TypeDeserializer@135 {
-    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
+    <name not found> = EmptyList@96[empty]
 }
 
-TypeDeserializer@136 {
-    classDescriptors('3': Integer@137) = DeserializedClassDescriptor@133['Any']
-    classDescriptors('4': Integer@138) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
 }
 
-TypeDeserializer@139 {
-    classDescriptors('3': Integer@137) = DeserializedClassDescriptor@133['Any']
-    classDescriptors('4': Integer@138) = DeserializedClassDescriptor@4['Function1']
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+}
+
+TypeDeserializer@152 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@155 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@156 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@157 {
+    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
+    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@2['Function0']
+}
+
+TypeDeserializer@160 {
+    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
+    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@4['Function1']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.lazy.log

@@ -46,11 +46,6 @@ DeserializedTypeParameterDescriptor@23['R'] {
     upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
 }
 
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
 DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
@@ -61,6 +56,11 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
+DeserializedType@22['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@27
+    memberScope = DeserializedClassMemberScope@28
+}
+
 DeserializedType@29['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
 }
@@ -165,116 +165,248 @@ LazyJavaPackageFragment@64['io'] {
     properties('bar': Name@92) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
     properties('baz': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
     properties('foo': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-    properties('x': Name@104) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-    properties('y': Name@105) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-    properties('z': Name@106) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
 }
 
 LazyJavaPackageFragment@47['java'] {
-    classes('lang': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('lang': Name@109) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    memberIndex = computeMemberIndex$1@110 // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('lang': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('lang': Name@106) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@105
 }
 
 LazyJavaPackageFragment@72['jvm'] {
-    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('String': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('Unit': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    memberIndex = computeMemberIndex$1@112 // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('String': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('Unit': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@108
+    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@108
+    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@108
+    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@108
+    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@108
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('Function0': Name@115) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('Function1': Name@116) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('String': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('Unit': Name@91) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('io': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('jvm': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('reflect': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    deserializedPackageScope = DeserializedPackageMemberScope@120 // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('bar': Name@92) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('baz': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('foo': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('io': Name@121) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    functions('io': Name@121) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('jvm': Name@122) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    functions('jvm': Name@122) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('reflect': Name@123) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    functions('reflect': Name@123) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    memberIndex = computeMemberIndex$1@124 // through LazyPackageFragmentScopeForJavaPackage@114
-    membersProtos = LinkedHashMap@125 // through DeserializedPackageMemberScope@120
-    properties('bar': Name@92) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    properties('baz': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    properties('foo': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    properties('io': Name@121) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    properties('jvm': Name@122) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    properties('reflect': Name@123) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    properties('x': Name@104) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    properties('y': Name@105) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    properties('z': Name@106) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
+    classes('Any': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('Function0': Name@112) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('Function1': Name@113) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('String': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('Unit': Name@91) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('io': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('jvm': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('reflect': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    deserializedPackageScope = DeserializedPackageMemberScope@117 // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('bar': Name@92) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('baz': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('foo': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('io': Name@118) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    functions('io': Name@118) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('jvm': Name@119) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    functions('jvm': Name@119) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('reflect': Name@120) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    functions('reflect': Name@120) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@111
+    membersProtos = LinkedHashMap@122 // through DeserializedPackageMemberScope@117
+    properties('bar': Name@92) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    properties('baz': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    properties('foo': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    properties('io': Name@118) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    properties('jvm': Name@119) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    properties('reflect': Name@120) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
 }
 
 LazyJavaPackageFragment@49['lang'] {
-    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@126
-    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@126
+    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@123
+    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@123
+    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@123
+    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@123
+    memberIndex = computeMemberIndex$1@124 // through LazyPackageFragmentScopeForJavaPackage@123
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('KFunction0': Name@129) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('KFunction1': Name@130) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('String': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('Unit': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@128
+    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('KFunction0': Name@126) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('KFunction1': Name@127) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('String': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('Unit': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@125
 }
 
-TypeDeserializer@132 {
-    classDescriptors('2': Integer@133) = DeserializedClassDescriptor@134['Any']
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
 }
 
-TypeDeserializer@135 {
-    classDescriptors('2': Integer@133) = DeserializedClassDescriptor@134['Any']
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
 }
 
-TypeDeserializer@136 {
-    classDescriptors('2': Integer@133) = DeserializedClassDescriptor@134['Any']
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
+    <name not found> = EmptyList@97[empty]
 }
 
-TypeDeserializer@137 {
-    classDescriptors('3': Integer@138) = DeserializedClassDescriptor@134['Any']
-    classDescriptors('4': Integer@139) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
 }
 
-TypeDeserializer@140 {
-    classDescriptors('3': Integer@138) = DeserializedClassDescriptor@134['Any']
-    classDescriptors('4': Integer@139) = DeserializedClassDescriptor@4['Function1']
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+}
+
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+}
+
+TypeDeserializer@153 {
+    classDescriptors('2': Integer@154) = DeserializedClassDescriptor@155['Any']
+}
+
+TypeDeserializer@156 {
+    classDescriptors('2': Integer@154) = DeserializedClassDescriptor@155['Any']
+}
+
+TypeDeserializer@157 {
+    classDescriptors('2': Integer@154) = DeserializedClassDescriptor@155['Any']
+}
+
+TypeDeserializer@158 {
+    classDescriptors('3': Integer@159) = DeserializedClassDescriptor@155['Any']
+    classDescriptors('4': Integer@160) = DeserializedClassDescriptor@2['Function0']
+}
+
+TypeDeserializer@161 {
+    classDescriptors('3': Integer@159) = DeserializedClassDescriptor@155['Any']
+    classDescriptors('4': Integer@160) = DeserializedClassDescriptor@4['Function1']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.lazy.log

@@ -46,12 +46,12 @@ DeserializedTypeParameterDescriptor@23['R'] {
     upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
 }
 
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -244,24 +244,66 @@ LazyJavaPackageFragment@14['reflect'] {
     memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@118
 }
 
-TypeDeserializer@122 {
-    classDescriptors('2': Integer@123) = DeserializedClassDescriptor@124['Any']
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
 }
 
-TypeDeserializer@125 {
-    classDescriptors('2': Integer@123) = DeserializedClassDescriptor@124['Any']
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
 }
 
-TypeDeserializer@126 {
-    classDescriptors('2': Integer@123) = DeserializedClassDescriptor@124['Any']
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
 }
 
-TypeDeserializer@127 {
-    classDescriptors('3': Integer@128) = DeserializedClassDescriptor@124['Any']
-    classDescriptors('4': Integer@129) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
 }
 
-TypeDeserializer@130 {
-    classDescriptors('3': Integer@128) = DeserializedClassDescriptor@124['Any']
-    classDescriptors('4': Integer@129) = DeserializedClassDescriptor@4['Function1']
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+}
+
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+}
+
+TypeDeserializer@146 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
+}
+
+TypeDeserializer@149 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
+}
+
+TypeDeserializer@150 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
+}
+
+TypeDeserializer@151 {
+    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
+    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@2['Function0']
+}
+
+TypeDeserializer@154 {
+    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
+    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@4['Function1']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.lazy.log

@@ -124,10 +124,282 @@ LazyJavaPackageFragment@6['reflect'] {
     classes('KFunction0': Name@65) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@66
 }
 
-TypeDeserializer@67 {
-    classDescriptors('2': Integer@68) = DeserializedClassDescriptor@69['Any']
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
 }
 
-TypeDeserializer@70 {
-    classDescriptors('4': Integer@71) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@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]
+    <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]
+    <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]
+    <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@72 {
+    <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]
+    <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@73 {
+    <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]
+    <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@74 {
+    <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]
+    <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@75 {
+    <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]
+    <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@76 {
+    <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]
+    <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@77 {
+    <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]
+    <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@78 {
+    <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]
+    <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@79 {
+    <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@80 {
+    <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@81 {
+    <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@82 {
+    <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@83 {
+    <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@84 {
+    <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]
+}
+
+TypeDeserializer@85 {
+    classDescriptors('2': Integer@86) = DeserializedClassDescriptor@87['Any']
+}
+
+TypeDeserializer@88 {
+    classDescriptors('4': Integer@89) = DeserializedClassDescriptor@2['Function0']
 }