Update lazy logs after field rename

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

@@ -24,116 +24,116 @@ DeserializedType@11['kotlin.Function0'] {
 }
 
 LazyJavaPackageFragmentProvider@13 {
-    _packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
-    _packageFragments('A': FqName@16) = null
-    _packageFragments('B': FqName@17) = null
-    _packageFragments('C': FqName@18) = null
-    _packageFragments('D': FqName@19) = null
-    _packageFragments('java': FqName@20) = LazyJavaPackageFragment@21['java']
-    _packageFragments('java.lang': FqName@22) = LazyJavaPackageFragment@23['lang']
-    _packageFragments('kotlin': FqName@24) = LazyJavaPackageFragment@5['kotlin']
-    _packageFragments('kotlin.io': FqName@25) = LazyJavaPackageFragment@26['io']
-    _packageFragments('kotlin.jvm': FqName@27) = LazyJavaPackageFragment@28['jvm']
-    _packageFragments('kotlin.reflect': FqName@29) = LazyJavaPackageFragment@6['reflect']
+    packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
+    packageFragments('A': FqName@16) = null
+    packageFragments('B': FqName@17) = null
+    packageFragments('C': FqName@18) = null
+    packageFragments('D': FqName@19) = null
+    packageFragments('java': FqName@20) = LazyJavaPackageFragment@21['java']
+    packageFragments('java.lang': FqName@22) = LazyJavaPackageFragment@23['lang']
+    packageFragments('kotlin': FqName@24) = LazyJavaPackageFragment@5['kotlin']
+    packageFragments('kotlin.io': FqName@25) = LazyJavaPackageFragment@26['io']
+    packageFragments('kotlin.jvm': FqName@27) = LazyJavaPackageFragment@28['jvm']
+    packageFragments('kotlin.reflect': FqName@29) = LazyJavaPackageFragment@6['reflect']
 }
 
 LazyJavaPackageFragment@15['<root>'] {
-    _functions('A': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('B': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('C': Name@34) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('D': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('A': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('B': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('C': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('D': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('A': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('B': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('C': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('D': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('A': Name@30) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('B': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('C': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('D': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@26['io'] {
-    _functions('A': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('B': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('C': Name@34) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('D': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@38
     classes('A': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('B': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('C': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('D': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('B': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('C': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('D': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@38
     deserializedPackageScope = DeserializedPackageMemberScope@39 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('A': Name@30) = EmptyList@31[empty] // through DeserializedPackageMemberScope@39
-    functions('B': Name@33) = EmptyList@31[empty] // through DeserializedPackageMemberScope@39
-    functions('C': Name@34) = EmptyList@31[empty] // through DeserializedPackageMemberScope@39
-    functions('D': Name@35) = EmptyList@31[empty] // through DeserializedPackageMemberScope@39
+    functions('A': Name@30) = EmptyList@36[empty] // through DeserializedPackageMemberScope@39
+    functions('A': Name@30) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('B': Name@32) = EmptyList@36[empty] // through DeserializedPackageMemberScope@39
+    functions('B': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('C': Name@33) = EmptyList@36[empty] // through DeserializedPackageMemberScope@39
+    functions('C': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('D': Name@34) = EmptyList@36[empty] // through DeserializedPackageMemberScope@39
+    functions('D': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@38
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
     membersProtos = HashMap@41 // through DeserializedPackageMemberScope@39
-    properties('A': Name@30) = EmptyList@31[empty] // through DeserializedPackageMemberScope@39
-    properties('B': Name@33) = EmptyList@31[empty] // through DeserializedPackageMemberScope@39
-    properties('C': Name@34) = EmptyList@31[empty] // through DeserializedPackageMemberScope@39
-    properties('D': Name@35) = EmptyList@31[empty] // through DeserializedPackageMemberScope@39
+    properties('A': Name@30) = EmptyList@36[empty] // through DeserializedPackageMemberScope@39
+    properties('B': Name@32) = EmptyList@36[empty] // through DeserializedPackageMemberScope@39
+    properties('C': Name@33) = EmptyList@36[empty] // through DeserializedPackageMemberScope@39
+    properties('D': Name@34) = EmptyList@36[empty] // through DeserializedPackageMemberScope@39
 }
 
 LazyJavaPackageFragment@21['java'] {
-    _functions('lang': Name@42) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('lang': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('lang': Name@44) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@43
     memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
 }
 
 LazyJavaPackageFragment@28['jvm'] {
-    _functions('A': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    _functions('B': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    _functions('C': Name@34) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    _functions('D': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@46
     classes('A': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('B': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('C': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('D': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('B': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('C': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('D': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('A': Name@30) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('B': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('C': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('D': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@46
     memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    _functions('A': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    _functions('B': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    _functions('C': Name@34) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    _functions('D': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    _functions('io': Name@49) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    _functions('jvm': Name@50) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@48
     classes('A': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('Any': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('B': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('C': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('D': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('Function0': Name@52) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('io': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('jvm': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = DeserializedPackageMemberScope@55 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('A': Name@30) = EmptyList@31[empty] // through DeserializedPackageMemberScope@55
-    functions('B': Name@33) = EmptyList@31[empty] // through DeserializedPackageMemberScope@55
-    functions('C': Name@34) = EmptyList@31[empty] // through DeserializedPackageMemberScope@55
-    functions('D': Name@35) = EmptyList@31[empty] // through DeserializedPackageMemberScope@55
-    functions('io': Name@49) = EmptyList@31[empty] // through DeserializedPackageMemberScope@55
-    functions('jvm': Name@50) = EmptyList@31[empty] // through DeserializedPackageMemberScope@55
+    classes('Any': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('B': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('C': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('D': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('Function0': Name@50) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('io': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('jvm': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    deserializedPackageScope = DeserializedPackageMemberScope@53 // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('A': Name@30) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
+    functions('A': Name@30) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('B': Name@32) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
+    functions('B': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('C': Name@33) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
+    functions('C': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('D': Name@34) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
+    functions('D': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('io': Name@54) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
+    functions('io': Name@54) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('jvm': Name@55) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
+    functions('jvm': Name@55) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@48
     memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@48
-    membersProtos = HashMap@57 // through DeserializedPackageMemberScope@55
-    properties('A': Name@30) = EmptyList@31[empty] // through DeserializedPackageMemberScope@55
-    properties('B': Name@33) = EmptyList@31[empty] // through DeserializedPackageMemberScope@55
-    properties('C': Name@34) = EmptyList@31[empty] // through DeserializedPackageMemberScope@55
-    properties('D': Name@35) = EmptyList@31[empty] // through DeserializedPackageMemberScope@55
-    properties('io': Name@49) = EmptyList@31[empty] // through DeserializedPackageMemberScope@55
-    properties('jvm': Name@50) = EmptyList@31[empty] // through DeserializedPackageMemberScope@55
+    membersProtos = HashMap@57 // through DeserializedPackageMemberScope@53
+    properties('A': Name@30) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
+    properties('B': Name@32) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
+    properties('C': Name@33) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
+    properties('D': Name@34) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
+    properties('io': Name@54) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
+    properties('jvm': Name@55) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
 }
 
 LazyJavaPackageFragment@23['lang'] {
-    _functions('A': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('B': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('C': Name@34) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('D': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@58
     classes('A': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('B': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('C': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('D': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('B': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('C': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('D': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('A': Name@30) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('B': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('C': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('D': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
     memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
 }
 

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

@@ -12,93 +12,93 @@ DeserializedClassDescriptor@2['Unit'] {
 }
 
 LazyJavaPackageFragmentProvider@7 {
-    _packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    _packageFragments('Any': FqName@10) = null
-    _packageFragments('Int': FqName@11) = null
-    _packageFragments('Unit': FqName@12) = null
-    _packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    _packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    _packageFragments('java.lang.Any': FqName@17) = null
-    _packageFragments('java.lang.Int': FqName@18) = null
-    _packageFragments('java.lang.Unit': FqName@19) = null
-    _packageFragments('kotlin': FqName@20) = LazyJavaPackageFragment@6['kotlin']
-    _packageFragments('kotlin.Any': FqName@21) = null
-    _packageFragments('kotlin.Int': FqName@22) = null
-    _packageFragments('kotlin.Unit': FqName@23) = null
-    _packageFragments('kotlin.io': FqName@24) = LazyJavaPackageFragment@25['io']
-    _packageFragments('kotlin.io.Any': FqName@26) = null
-    _packageFragments('kotlin.io.Int': FqName@27) = null
-    _packageFragments('kotlin.io.Unit': FqName@28) = null
-    _packageFragments('kotlin.jvm': FqName@29) = LazyJavaPackageFragment@30['jvm']
-    _packageFragments('kotlin.jvm.Any': FqName@31) = null
-    _packageFragments('kotlin.jvm.Int': FqName@32) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@33) = null
+    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
+    packageFragments('Any': FqName@10) = null
+    packageFragments('Int': FqName@11) = null
+    packageFragments('Unit': FqName@12) = null
+    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
+    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
+    packageFragments('java.lang.Any': FqName@17) = null
+    packageFragments('java.lang.Int': FqName@18) = null
+    packageFragments('java.lang.Unit': FqName@19) = null
+    packageFragments('kotlin': FqName@20) = LazyJavaPackageFragment@6['kotlin']
+    packageFragments('kotlin.Any': FqName@21) = null
+    packageFragments('kotlin.Int': FqName@22) = null
+    packageFragments('kotlin.Unit': FqName@23) = null
+    packageFragments('kotlin.io': FqName@24) = LazyJavaPackageFragment@25['io']
+    packageFragments('kotlin.io.Any': FqName@26) = null
+    packageFragments('kotlin.io.Int': FqName@27) = null
+    packageFragments('kotlin.io.Unit': FqName@28) = null
+    packageFragments('kotlin.jvm': FqName@29) = LazyJavaPackageFragment@30['jvm']
+    packageFragments('kotlin.jvm.Any': FqName@31) = null
+    packageFragments('kotlin.jvm.Int': FqName@32) = null
+    packageFragments('kotlin.jvm.Unit': FqName@33) = null
 }
 
 LazyJavaPackageFragment@9['<root>'] {
-    _functions('foo': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('Any': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('Int': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('Unit': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('Any': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('Unit': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('foo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('foo': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@35
 }
 
 LazyJavaPackageFragment@25['io'] {
-    _functions('foo': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('Any': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('Int': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('Unit': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('foo': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('Any': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('Unit': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('foo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@42
     deserializedPackageScope = DeserializedPackageMemberScope@43 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('foo': Name@34) = EmptyList@35[empty] // through DeserializedPackageMemberScope@43
+    functions('foo': Name@38) = EmptyList@40[empty] // through DeserializedPackageMemberScope@43
+    functions('foo': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@42
     memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
     membersProtos = HashMap@45 // through DeserializedPackageMemberScope@43
-    properties('foo': Name@34) = EmptyList@35[empty] // through DeserializedPackageMemberScope@43
+    properties('foo': Name@38) = EmptyList@40[empty] // through DeserializedPackageMemberScope@43
 }
 
 LazyJavaPackageFragment@14['java'] {
-    _functions('lang': Name@46) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('lang': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('lang': Name@48) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@47
     memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@47
 }
 
 LazyJavaPackageFragment@30['jvm'] {
-    _functions('foo': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('Any': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('Int': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('Unit': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('foo': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('Any': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('Unit': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('foo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('foo': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@50
     memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@50
 }
 
 LazyJavaPackageFragment@6['kotlin'] {
-    _functions('foo': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    _functions('io': Name@53) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    _functions('jvm': Name@54) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('Any': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('Int': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('Unit': Name@39) = DeserializedClassDescriptor@2['Unit'] // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('foo': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('io': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('jvm': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = DeserializedPackageMemberScope@57 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('foo': Name@34) = EmptyList@35[empty] // through DeserializedPackageMemberScope@57
-    functions('io': Name@53) = EmptyList@35[empty] // through DeserializedPackageMemberScope@57
-    functions('jvm': Name@54) = EmptyList@35[empty] // through DeserializedPackageMemberScope@57
+    classes('Any': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('Unit': Name@37) = DeserializedClassDescriptor@2['Unit'] // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('foo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('io': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('jvm': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    deserializedPackageScope = DeserializedPackageMemberScope@55 // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('foo': Name@38) = EmptyList@40[empty] // through DeserializedPackageMemberScope@55
+    functions('foo': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('io': Name@56) = EmptyList@40[empty] // through DeserializedPackageMemberScope@55
+    functions('io': Name@56) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('jvm': Name@57) = EmptyList@40[empty] // through DeserializedPackageMemberScope@55
+    functions('jvm': Name@57) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@52
     memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@52
-    membersProtos = HashMap@59 // through DeserializedPackageMemberScope@57
-    properties('foo': Name@34) = EmptyList@35[empty] // through DeserializedPackageMemberScope@57
-    properties('io': Name@53) = EmptyList@35[empty] // through DeserializedPackageMemberScope@57
-    properties('jvm': Name@54) = EmptyList@35[empty] // through DeserializedPackageMemberScope@57
+    membersProtos = HashMap@59 // through DeserializedPackageMemberScope@55
+    properties('foo': Name@38) = EmptyList@40[empty] // through DeserializedPackageMemberScope@55
+    properties('io': Name@56) = EmptyList@40[empty] // through DeserializedPackageMemberScope@55
+    properties('jvm': Name@57) = EmptyList@40[empty] // through DeserializedPackageMemberScope@55
 }
 
 LazyJavaPackageFragment@16['lang'] {
-    _functions('foo': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('foo': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('foo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@60
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@60
+    functions('foo': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@60
     memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@60
 }

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

@@ -72,77 +72,77 @@ DeserializedType@39['kotlin.ExtensionFunction0'] {
 }
 
 LazyJavaPackageFragmentProvider@42 {
-    _packageFragments('<root>': FqName@43) = LazyJavaPackageFragment@44['<root>']
-    _packageFragments('A': FqName@45) = null
-    _packageFragments('java': FqName@46) = LazyJavaPackageFragment@47['java']
-    _packageFragments('java.lang': FqName@48) = LazyJavaPackageFragment@49['lang']
-    _packageFragments('java.lang.A': FqName@50) = null
-    _packageFragments('kotlin': FqName@51) = LazyJavaPackageFragment@7['kotlin']
-    _packageFragments('kotlin.A': FqName@52) = null
-    _packageFragments('kotlin.io': FqName@53) = LazyJavaPackageFragment@54['io']
-    _packageFragments('kotlin.io.A': FqName@55) = null
-    _packageFragments('kotlin.jvm': FqName@56) = LazyJavaPackageFragment@57['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@58) = null
-    _packageFragments('kotlin.reflect': FqName@59) = LazyJavaPackageFragment@15['reflect']
+    packageFragments('<root>': FqName@43) = LazyJavaPackageFragment@44['<root>']
+    packageFragments('A': FqName@45) = null
+    packageFragments('java': FqName@46) = LazyJavaPackageFragment@47['java']
+    packageFragments('java.lang': FqName@48) = LazyJavaPackageFragment@49['lang']
+    packageFragments('java.lang.A': FqName@50) = null
+    packageFragments('kotlin': FqName@51) = LazyJavaPackageFragment@7['kotlin']
+    packageFragments('kotlin.A': FqName@52) = null
+    packageFragments('kotlin.io': FqName@53) = LazyJavaPackageFragment@54['io']
+    packageFragments('kotlin.io.A': FqName@55) = null
+    packageFragments('kotlin.jvm': FqName@56) = LazyJavaPackageFragment@57['jvm']
+    packageFragments('kotlin.jvm.A': FqName@58) = null
+    packageFragments('kotlin.reflect': FqName@59) = LazyJavaPackageFragment@15['reflect']
 }
 
 LazyJavaPackageFragment@44['<root>'] {
-    _functions('foo': Name@60) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('foo': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@62
+    classes('foo': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('foo': Name@60) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@61
 }
 
 LazyJavaPackageFragment@54['io'] {
-    _functions('foo': Name@60) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@65
     classes('foo': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@65
     deserializedPackageScope = DeserializedPackageMemberScope@66 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('foo': Name@60) = EmptyList@61[empty] // through DeserializedPackageMemberScope@66
+    functions('foo': Name@60) = EmptyList@63[empty] // through DeserializedPackageMemberScope@66
+    functions('foo': Name@60) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@65
     memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
     membersProtos = HashMap@68 // through DeserializedPackageMemberScope@66
-    properties('A': Name@69) = EmptyList@61[empty] // through DeserializedPackageMemberScope@66
-    properties('foo': Name@60) = EmptyList@61[empty] // through DeserializedPackageMemberScope@66
+    properties('A': Name@69) = EmptyList@63[empty] // through DeserializedPackageMemberScope@66
+    properties('foo': Name@60) = EmptyList@63[empty] // through DeserializedPackageMemberScope@66
 }
 
 LazyJavaPackageFragment@47['java'] {
-    _functions('lang': Name@70) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('lang': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@71
+    functions('lang': Name@72) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@71
     memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
 LazyJavaPackageFragment@57['jvm'] {
-    _functions('foo': Name@60) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@74
     classes('foo': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@74
+    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('foo': Name@60) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@74
     memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@74
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    _functions('foo': Name@60) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    _functions('io': Name@77) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    _functions('jvm': Name@78) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('Any': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('ExtensionFunction0': Name@80) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('foo': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('io': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('jvm': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = DeserializedPackageMemberScope@83 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('foo': Name@60) = EmptyList@61[empty] // through DeserializedPackageMemberScope@83
-    functions('io': Name@77) = EmptyList@61[empty] // through DeserializedPackageMemberScope@83
-    functions('jvm': Name@78) = EmptyList@61[empty] // through DeserializedPackageMemberScope@83
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@76
-    membersProtos = HashMap@85 // through DeserializedPackageMemberScope@83
-    properties('A': Name@69) = EmptyList@61[empty] // through DeserializedPackageMemberScope@83
-    properties('foo': Name@60) = EmptyList@61[empty] // through DeserializedPackageMemberScope@83
-    properties('io': Name@77) = EmptyList@61[empty] // through DeserializedPackageMemberScope@83
-    properties('jvm': Name@78) = EmptyList@61[empty] // through DeserializedPackageMemberScope@83
+    classes('Any': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('ExtensionFunction0': Name@78) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('foo': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('io': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('jvm': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = DeserializedPackageMemberScope@81 // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('foo': Name@60) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    functions('foo': Name@60) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('io': Name@82) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    functions('io': Name@82) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('jvm': Name@83) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    functions('jvm': Name@83) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@77
+    membersProtos = HashMap@85 // through DeserializedPackageMemberScope@81
+    properties('A': Name@69) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    properties('foo': Name@60) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    properties('io': Name@82) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    properties('jvm': Name@83) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
 }
 
 LazyJavaPackageFragment@49['lang'] {
-    _functions('foo': Name@60) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@86
     classes('foo': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@86
+    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('foo': Name@60) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@86
     memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@86
 }
 

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

@@ -30,98 +30,98 @@ DeserializedType@14['kotlin.Function0'] {
 }
 
 LazyJavaPackageFragmentProvider@16 {
-    _packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    _packageFragments('A': FqName@19) = null
-    _packageFragments('KFunction0': FqName@20) = null
-    _packageFragments('SomeOtherClass': FqName@21) = null
-    _packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    _packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    _packageFragments('java.lang.A': FqName@26) = null
-    _packageFragments('java.lang.KFunction0': FqName@27) = null
-    _packageFragments('kotlin': FqName@28) = LazyJavaPackageFragment@5['kotlin']
-    _packageFragments('kotlin.A': FqName@29) = null
-    _packageFragments('kotlin.KFunction0': FqName@30) = null
-    _packageFragments('kotlin.io': FqName@31) = LazyJavaPackageFragment@32['io']
-    _packageFragments('kotlin.io.A': FqName@33) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@34) = null
-    _packageFragments('kotlin.jvm': FqName@35) = LazyJavaPackageFragment@36['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@37) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@38) = null
-    _packageFragments('kotlin.reflect': FqName@39) = LazyJavaPackageFragment@6['reflect']
-    _packageFragments('kotlin.reflect.KFunction0': FqName@40) = null
+    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
+    packageFragments('A': FqName@19) = null
+    packageFragments('KFunction0': FqName@20) = null
+    packageFragments('SomeOtherClass': FqName@21) = null
+    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
+    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
+    packageFragments('java.lang.A': FqName@26) = null
+    packageFragments('java.lang.KFunction0': FqName@27) = null
+    packageFragments('kotlin': FqName@28) = LazyJavaPackageFragment@5['kotlin']
+    packageFragments('kotlin.A': FqName@29) = null
+    packageFragments('kotlin.KFunction0': FqName@30) = null
+    packageFragments('kotlin.io': FqName@31) = LazyJavaPackageFragment@32['io']
+    packageFragments('kotlin.io.A': FqName@33) = null
+    packageFragments('kotlin.io.KFunction0': FqName@34) = null
+    packageFragments('kotlin.jvm': FqName@35) = LazyJavaPackageFragment@36['jvm']
+    packageFragments('kotlin.jvm.A': FqName@37) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@38) = null
+    packageFragments('kotlin.reflect': FqName@39) = LazyJavaPackageFragment@6['reflect']
+    packageFragments('kotlin.reflect.KFunction0': FqName@40) = null
 }
 
 LazyJavaPackageFragment@18['<root>'] {
-    _functions('A': Name@41) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    _functions('kotlin': Name@44) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('KFunction0': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('kotlin': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('KFunction0': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('kotlin': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('A': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('kotlin': Name@47) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@42
 }
 
 LazyJavaPackageFragment@32['io'] {
-    _functions('A': Name@41) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@49
     classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@49
     deserializedPackageScope = DeserializedPackageMemberScope@50 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('A': Name@41) = EmptyList@42[empty] // through DeserializedPackageMemberScope@50
+    functions('A': Name@41) = EmptyList@46[empty] // through DeserializedPackageMemberScope@50
+    functions('A': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@49
     memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
     membersProtos = HashMap@52 // through DeserializedPackageMemberScope@50
-    properties('A': Name@41) = EmptyList@42[empty] // through DeserializedPackageMemberScope@50
-    properties('x': Name@53) = EmptyList@42[empty] // 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'] {
-    _functions('lang': Name@54) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('lang': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@55
+    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
 }
 
 LazyJavaPackageFragment@36['jvm'] {
-    _functions('A': Name@41) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@58
     classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@47 // 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
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    _functions('A': Name@41) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    _functions('io': Name@61) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    _functions('jvm': Name@62) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    _functions('reflect': Name@63) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@60
     classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('Any': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('Function0': Name@65) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('io': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('jvm': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('reflect': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = DeserializedPackageMemberScope@69 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('A': Name@41) = EmptyList@42[empty] // through DeserializedPackageMemberScope@69
-    functions('io': Name@61) = EmptyList@42[empty] // through DeserializedPackageMemberScope@69
-    functions('jvm': Name@62) = EmptyList@42[empty] // through DeserializedPackageMemberScope@69
-    functions('reflect': Name@63) = EmptyList@42[empty] // through DeserializedPackageMemberScope@69
+    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 = HashMap@71 // through DeserializedPackageMemberScope@69
-    properties('A': Name@41) = EmptyList@42[empty] // through DeserializedPackageMemberScope@69
-    properties('io': Name@61) = EmptyList@42[empty] // through DeserializedPackageMemberScope@69
-    properties('jvm': Name@62) = EmptyList@42[empty] // through DeserializedPackageMemberScope@69
-    properties('reflect': Name@63) = EmptyList@42[empty] // through DeserializedPackageMemberScope@69
-    properties('x': Name@53) = EmptyList@42[empty] // through DeserializedPackageMemberScope@69
+    membersProtos = HashMap@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
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    _functions('A': Name@41) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@72
     classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@47 // 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
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    _functions('KFunction0': Name@74) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('KFunction0': Name@76) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@75
+    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
 }
 

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

@@ -30,118 +30,118 @@ DeserializedType@14['kotlin.Function0'] {
 }
 
 LazyJavaPackageFragmentProvider@16 {
-    _packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    _packageFragments('A': FqName@19) = null
-    _packageFragments('B': FqName@20) = null
-    _packageFragments('KFunction0': FqName@21) = null
-    _packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    _packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    _packageFragments('java.lang.A': FqName@26) = null
-    _packageFragments('java.lang.B': FqName@27) = null
-    _packageFragments('java.lang.KFunction0': FqName@28) = null
-    _packageFragments('kotlin': FqName@29) = LazyJavaPackageFragment@5['kotlin']
-    _packageFragments('kotlin.A': FqName@30) = null
-    _packageFragments('kotlin.B': FqName@31) = null
-    _packageFragments('kotlin.KFunction0': FqName@32) = null
-    _packageFragments('kotlin.io': FqName@33) = LazyJavaPackageFragment@34['io']
-    _packageFragments('kotlin.io.A': FqName@35) = null
-    _packageFragments('kotlin.io.B': FqName@36) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@37) = null
-    _packageFragments('kotlin.jvm': FqName@38) = LazyJavaPackageFragment@39['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@40) = null
-    _packageFragments('kotlin.jvm.B': FqName@41) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@42) = null
-    _packageFragments('kotlin.reflect': FqName@43) = LazyJavaPackageFragment@6['reflect']
-    _packageFragments('kotlin.reflect.KFunction0': FqName@44) = null
+    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
+    packageFragments('A': FqName@19) = null
+    packageFragments('B': FqName@20) = null
+    packageFragments('KFunction0': FqName@21) = null
+    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
+    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
+    packageFragments('java.lang.A': FqName@26) = null
+    packageFragments('java.lang.B': FqName@27) = null
+    packageFragments('java.lang.KFunction0': FqName@28) = null
+    packageFragments('kotlin': FqName@29) = LazyJavaPackageFragment@5['kotlin']
+    packageFragments('kotlin.A': FqName@30) = null
+    packageFragments('kotlin.B': FqName@31) = null
+    packageFragments('kotlin.KFunction0': FqName@32) = null
+    packageFragments('kotlin.io': FqName@33) = LazyJavaPackageFragment@34['io']
+    packageFragments('kotlin.io.A': FqName@35) = null
+    packageFragments('kotlin.io.B': FqName@36) = null
+    packageFragments('kotlin.io.KFunction0': FqName@37) = null
+    packageFragments('kotlin.jvm': FqName@38) = LazyJavaPackageFragment@39['jvm']
+    packageFragments('kotlin.jvm.A': FqName@40) = null
+    packageFragments('kotlin.jvm.B': FqName@41) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@42) = null
+    packageFragments('kotlin.reflect': FqName@43) = LazyJavaPackageFragment@6['reflect']
+    packageFragments('kotlin.reflect.KFunction0': FqName@44) = null
 }
 
 LazyJavaPackageFragment@18['<root>'] {
-    _functions('A': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    _functions('B': Name@48) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    _functions('kotlin': Name@49) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('B': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('KFunction0': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('kotlin': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('KFunction0': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('kotlin': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('kotlin': Name@52) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@46
 }
 
 LazyJavaPackageFragment@34['io'] {
-    _functions('A': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    _functions('B': Name@48) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@54
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('B': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@54
     deserializedPackageScope = DeserializedPackageMemberScope@55 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('A': Name@45) = EmptyList@46[empty] // through DeserializedPackageMemberScope@55
-    functions('B': Name@48) = EmptyList@46[empty] // through DeserializedPackageMemberScope@55
+    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
+    functions('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
+    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
     memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
     membersProtos = HashMap@57 // through DeserializedPackageMemberScope@55
-    properties('A': Name@45) = EmptyList@46[empty] // through DeserializedPackageMemberScope@55
-    properties('B': Name@48) = EmptyList@46[empty] // through DeserializedPackageMemberScope@55
-    properties('x': Name@58) = EmptyList@46[empty] // through DeserializedPackageMemberScope@55
-    properties('y': Name@59) = EmptyList@46[empty] // 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'] {
-    _functions('lang': Name@60) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@61
+    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
 }
 
 LazyJavaPackageFragment@39['jvm'] {
-    _functions('A': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    _functions('B': Name@48) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@64
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('B': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@52 // 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
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    _functions('A': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('B': Name@48) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('io': Name@67) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('jvm': Name@68) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('reflect': Name@69) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@66
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Any': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('B': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Function0': Name@71) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('io': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('jvm': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('reflect': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = DeserializedPackageMemberScope@75 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('A': Name@45) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
-    functions('B': Name@48) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
-    functions('io': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
-    functions('jvm': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
-    functions('reflect': Name@69) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
+    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 = HashMap@77 // through DeserializedPackageMemberScope@75
-    properties('A': Name@45) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
-    properties('B': Name@48) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
-    properties('io': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
-    properties('jvm': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
-    properties('reflect': Name@69) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
-    properties('x': Name@58) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
-    properties('y': Name@59) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
+    membersProtos = HashMap@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
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    _functions('A': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    _functions('B': Name@48) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@78
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('B': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@52 // 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
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    _functions('KFunction0': Name@80) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('KFunction0': Name@82) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@81
+    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
 }
 

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

@@ -30,118 +30,118 @@ DeserializedType@14['kotlin.Function0'] {
 }
 
 LazyJavaPackageFragmentProvider@16 {
-    _packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    _packageFragments('A': FqName@19) = null
-    _packageFragments('B': FqName@20) = null
-    _packageFragments('KFunction0': FqName@21) = null
-    _packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    _packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    _packageFragments('java.lang.A': FqName@26) = null
-    _packageFragments('java.lang.B': FqName@27) = null
-    _packageFragments('java.lang.KFunction0': FqName@28) = null
-    _packageFragments('kotlin': FqName@29) = LazyJavaPackageFragment@5['kotlin']
-    _packageFragments('kotlin.A': FqName@30) = null
-    _packageFragments('kotlin.B': FqName@31) = null
-    _packageFragments('kotlin.KFunction0': FqName@32) = null
-    _packageFragments('kotlin.io': FqName@33) = LazyJavaPackageFragment@34['io']
-    _packageFragments('kotlin.io.A': FqName@35) = null
-    _packageFragments('kotlin.io.B': FqName@36) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@37) = null
-    _packageFragments('kotlin.jvm': FqName@38) = LazyJavaPackageFragment@39['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@40) = null
-    _packageFragments('kotlin.jvm.B': FqName@41) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@42) = null
-    _packageFragments('kotlin.reflect': FqName@43) = LazyJavaPackageFragment@6['reflect']
-    _packageFragments('kotlin.reflect.KFunction0': FqName@44) = null
+    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
+    packageFragments('A': FqName@19) = null
+    packageFragments('B': FqName@20) = null
+    packageFragments('KFunction0': FqName@21) = null
+    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
+    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
+    packageFragments('java.lang.A': FqName@26) = null
+    packageFragments('java.lang.B': FqName@27) = null
+    packageFragments('java.lang.KFunction0': FqName@28) = null
+    packageFragments('kotlin': FqName@29) = LazyJavaPackageFragment@5['kotlin']
+    packageFragments('kotlin.A': FqName@30) = null
+    packageFragments('kotlin.B': FqName@31) = null
+    packageFragments('kotlin.KFunction0': FqName@32) = null
+    packageFragments('kotlin.io': FqName@33) = LazyJavaPackageFragment@34['io']
+    packageFragments('kotlin.io.A': FqName@35) = null
+    packageFragments('kotlin.io.B': FqName@36) = null
+    packageFragments('kotlin.io.KFunction0': FqName@37) = null
+    packageFragments('kotlin.jvm': FqName@38) = LazyJavaPackageFragment@39['jvm']
+    packageFragments('kotlin.jvm.A': FqName@40) = null
+    packageFragments('kotlin.jvm.B': FqName@41) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@42) = null
+    packageFragments('kotlin.reflect': FqName@43) = LazyJavaPackageFragment@6['reflect']
+    packageFragments('kotlin.reflect.KFunction0': FqName@44) = null
 }
 
 LazyJavaPackageFragment@18['<root>'] {
-    _functions('A': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    _functions('B': Name@48) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    _functions('kotlin': Name@49) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('B': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('KFunction0': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('kotlin': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('KFunction0': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('kotlin': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('kotlin': Name@52) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@46
 }
 
 LazyJavaPackageFragment@34['io'] {
-    _functions('A': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    _functions('B': Name@48) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@54
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('B': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@54
     deserializedPackageScope = DeserializedPackageMemberScope@55 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('A': Name@45) = EmptyList@46[empty] // through DeserializedPackageMemberScope@55
-    functions('B': Name@48) = EmptyList@46[empty] // through DeserializedPackageMemberScope@55
+    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
+    functions('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
+    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
     memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
     membersProtos = HashMap@57 // through DeserializedPackageMemberScope@55
-    properties('A': Name@45) = EmptyList@46[empty] // through DeserializedPackageMemberScope@55
-    properties('B': Name@48) = EmptyList@46[empty] // through DeserializedPackageMemberScope@55
-    properties('x': Name@58) = EmptyList@46[empty] // through DeserializedPackageMemberScope@55
-    properties('y': Name@59) = EmptyList@46[empty] // 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'] {
-    _functions('lang': Name@60) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@61
+    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
 }
 
 LazyJavaPackageFragment@39['jvm'] {
-    _functions('A': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    _functions('B': Name@48) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@64
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('B': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@52 // 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
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    _functions('A': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('B': Name@48) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('io': Name@67) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('jvm': Name@68) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('reflect': Name@69) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@66
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Any': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('B': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Function0': Name@71) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('io': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('jvm': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('reflect': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = DeserializedPackageMemberScope@75 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('A': Name@45) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
-    functions('B': Name@48) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
-    functions('io': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
-    functions('jvm': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
-    functions('reflect': Name@69) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
+    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 = HashMap@77 // through DeserializedPackageMemberScope@75
-    properties('A': Name@45) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
-    properties('B': Name@48) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
-    properties('io': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
-    properties('jvm': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
-    properties('reflect': Name@69) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
-    properties('x': Name@58) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
-    properties('y': Name@59) = EmptyList@46[empty] // through DeserializedPackageMemberScope@75
+    membersProtos = HashMap@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
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    _functions('A': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    _functions('B': Name@48) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@78
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('B': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@52 // 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
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    _functions('KFunction0': Name@80) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('KFunction0': Name@82) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@81
+    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
 }
 

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

@@ -30,95 +30,95 @@ DeserializedType@14['kotlin.Function0'] {
 }
 
 LazyJavaPackageFragmentProvider@16 {
-    _packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    _packageFragments('A': FqName@19) = null
-    _packageFragments('KFunction0': FqName@20) = null
-    _packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
-    _packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
-    _packageFragments('java.lang.A': FqName@25) = null
-    _packageFragments('java.lang.KFunction0': FqName@26) = null
-    _packageFragments('kotlin': FqName@27) = LazyJavaPackageFragment@5['kotlin']
-    _packageFragments('kotlin.A': FqName@28) = null
-    _packageFragments('kotlin.KFunction0': FqName@29) = null
-    _packageFragments('kotlin.io': FqName@30) = LazyJavaPackageFragment@31['io']
-    _packageFragments('kotlin.io.A': FqName@32) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@33) = null
-    _packageFragments('kotlin.jvm': FqName@34) = LazyJavaPackageFragment@35['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@36) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@37) = null
-    _packageFragments('kotlin.reflect': FqName@38) = LazyJavaPackageFragment@6['reflect']
-    _packageFragments('kotlin.reflect.KFunction0': FqName@39) = null
+    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
+    packageFragments('A': FqName@19) = null
+    packageFragments('KFunction0': FqName@20) = null
+    packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
+    packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
+    packageFragments('java.lang.A': FqName@25) = null
+    packageFragments('java.lang.KFunction0': FqName@26) = null
+    packageFragments('kotlin': FqName@27) = LazyJavaPackageFragment@5['kotlin']
+    packageFragments('kotlin.A': FqName@28) = null
+    packageFragments('kotlin.KFunction0': FqName@29) = null
+    packageFragments('kotlin.io': FqName@30) = LazyJavaPackageFragment@31['io']
+    packageFragments('kotlin.io.A': FqName@32) = null
+    packageFragments('kotlin.io.KFunction0': FqName@33) = null
+    packageFragments('kotlin.jvm': FqName@34) = LazyJavaPackageFragment@35['jvm']
+    packageFragments('kotlin.jvm.A': FqName@36) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@37) = null
+    packageFragments('kotlin.reflect': FqName@38) = LazyJavaPackageFragment@6['reflect']
+    packageFragments('kotlin.reflect.KFunction0': FqName@39) = null
 }
 
 LazyJavaPackageFragment@18['<root>'] {
-    _functions('A': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    _functions('kotlin': Name@43) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('KFunction0': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('kotlin': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('KFunction0': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('kotlin': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('kotlin': Name@46) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@41
 }
 
 LazyJavaPackageFragment@31['io'] {
-    _functions('A': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
     classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@48
     deserializedPackageScope = DeserializedPackageMemberScope@49 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('A': Name@40) = EmptyList@41[empty] // through DeserializedPackageMemberScope@49
+    functions('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@49
+    functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
     memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
     membersProtos = HashMap@51 // through DeserializedPackageMemberScope@49
-    properties('A': Name@40) = EmptyList@41[empty] // through DeserializedPackageMemberScope@49
+    properties('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@49
 }
 
 LazyJavaPackageFragment@22['java'] {
-    _functions('lang': Name@52) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('lang': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@53
+    classes('lang': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
+    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@53
+    functions('lang': Name@54) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@53
     memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@53
 }
 
 LazyJavaPackageFragment@35['jvm'] {
-    _functions('A': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@56
     classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@56
+    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@56
     memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    _functions('A': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('io': Name@59) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('jvm': Name@60) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('reflect': Name@61) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@58
     classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('Any': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('Function0': Name@63) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('io': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('jvm': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('reflect': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = DeserializedPackageMemberScope@67 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('A': Name@40) = EmptyList@41[empty] // through DeserializedPackageMemberScope@67
-    functions('io': Name@59) = EmptyList@41[empty] // through DeserializedPackageMemberScope@67
-    functions('jvm': Name@60) = EmptyList@41[empty] // through DeserializedPackageMemberScope@67
-    functions('reflect': Name@61) = EmptyList@41[empty] // through DeserializedPackageMemberScope@67
+    classes('Any': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('Function0': Name@60) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('io': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('jvm': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('reflect': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    deserializedPackageScope = DeserializedPackageMemberScope@64 // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
+    functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('io': Name@65) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
+    functions('io': Name@65) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('jvm': Name@66) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
+    functions('jvm': Name@66) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('reflect': Name@67) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
+    functions('reflect': Name@67) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@58
     memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@58
-    membersProtos = HashMap@69 // through DeserializedPackageMemberScope@67
-    properties('A': Name@40) = EmptyList@41[empty] // through DeserializedPackageMemberScope@67
-    properties('io': Name@59) = EmptyList@41[empty] // through DeserializedPackageMemberScope@67
-    properties('jvm': Name@60) = EmptyList@41[empty] // through DeserializedPackageMemberScope@67
-    properties('reflect': Name@61) = EmptyList@41[empty] // through DeserializedPackageMemberScope@67
+    membersProtos = HashMap@69 // through DeserializedPackageMemberScope@64
+    properties('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
+    properties('io': Name@65) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
+    properties('jvm': Name@66) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
+    properties('reflect': Name@67) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
 }
 
 LazyJavaPackageFragment@24['lang'] {
-    _functions('A': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@70
     classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@70
+    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@70
     memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    _functions('KFunction0': Name@72) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('KFunction0': Name@74) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('KFunction0': Name@72) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@73
+    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('KFunction0': Name@74) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@73
     memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 

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

@@ -58,12 +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@18['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -73,12 +73,12 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@34['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -104,170 +104,170 @@ DeserializedType@42['kotlin.ExtensionFunction1'] {
 }
 
 LazyJavaPackageFragmentProvider@44 {
-    _packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
-    _packageFragments('A': FqName@47) = null
-    _packageFragments('Int': FqName@48) = null
-    _packageFragments('KMemberFunction0': FqName@49) = null
-    _packageFragments('KMemberFunction1': FqName@50) = null
-    _packageFragments('String': FqName@51) = null
-    _packageFragments('Unit': FqName@52) = null
-    _packageFragments('first': FqName@53) = null
-    _packageFragments('first.A': FqName@54) = null
-    _packageFragments('first.Int': FqName@55) = null
-    _packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    _packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    _packageFragments('java.lang.A': FqName@60) = null
-    _packageFragments('java.lang.Int': FqName@61) = null
-    _packageFragments('java.lang.KMemberFunction0': FqName@62) = null
-    _packageFragments('java.lang.KMemberFunction1': FqName@63) = null
-    _packageFragments('java.lang.String': FqName@64) = null
-    _packageFragments('java.lang.Unit': FqName@65) = null
-    _packageFragments('kotlin': FqName@66) = LazyJavaPackageFragment@13['kotlin']
-    _packageFragments('kotlin.A': FqName@67) = null
-    _packageFragments('kotlin.Int': FqName@68) = null
-    _packageFragments('kotlin.KMemberFunction0': FqName@69) = null
-    _packageFragments('kotlin.KMemberFunction1': FqName@70) = null
-    _packageFragments('kotlin.String': FqName@71) = null
-    _packageFragments('kotlin.Unit': FqName@72) = null
-    _packageFragments('kotlin.io': FqName@73) = LazyJavaPackageFragment@74['io']
-    _packageFragments('kotlin.io.A': FqName@75) = null
-    _packageFragments('kotlin.io.Int': FqName@76) = null
-    _packageFragments('kotlin.io.KMemberFunction0': FqName@77) = null
-    _packageFragments('kotlin.io.KMemberFunction1': FqName@78) = null
-    _packageFragments('kotlin.io.String': FqName@79) = null
-    _packageFragments('kotlin.io.Unit': FqName@80) = null
-    _packageFragments('kotlin.jvm': FqName@81) = LazyJavaPackageFragment@82['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@83) = null
-    _packageFragments('kotlin.jvm.Int': FqName@84) = null
-    _packageFragments('kotlin.jvm.KMemberFunction0': FqName@85) = null
-    _packageFragments('kotlin.jvm.KMemberFunction1': FqName@86) = null
-    _packageFragments('kotlin.jvm.String': FqName@87) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@88) = null
-    _packageFragments('kotlin.reflect': FqName@89) = LazyJavaPackageFragment@14['reflect']
-    _packageFragments('kotlin.reflect.A': FqName@90) = null
-    _packageFragments('kotlin.reflect.Int': FqName@91) = null
-    _packageFragments('kotlin.reflect.KMemberFunction0': FqName@92) = null
-    _packageFragments('kotlin.reflect.KMemberFunction1': FqName@93) = null
-    _packageFragments('kotlin.reflect.String': FqName@94) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@95) = null
-    _packageFragments('other': FqName@96) = null
-    _packageFragments('other.A': FqName@97) = null
-    _packageFragments('other.Int': FqName@98) = null
-    _packageFragments('other.KMemberFunction0': FqName@99) = null
-    _packageFragments('other.KMemberFunction1': FqName@100) = null
-    _packageFragments('other.String': FqName@101) = null
-    _packageFragments('other.Unit': FqName@102) = null
-    _packageFragments('other.first': FqName@103) = null
+    packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
+    packageFragments('A': FqName@47) = null
+    packageFragments('Int': FqName@48) = null
+    packageFragments('KMemberFunction0': FqName@49) = null
+    packageFragments('KMemberFunction1': FqName@50) = null
+    packageFragments('String': FqName@51) = null
+    packageFragments('Unit': FqName@52) = null
+    packageFragments('first': FqName@53) = null
+    packageFragments('first.A': FqName@54) = null
+    packageFragments('first.Int': FqName@55) = null
+    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
+    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
+    packageFragments('java.lang.A': FqName@60) = null
+    packageFragments('java.lang.Int': FqName@61) = null
+    packageFragments('java.lang.KMemberFunction0': FqName@62) = null
+    packageFragments('java.lang.KMemberFunction1': FqName@63) = null
+    packageFragments('java.lang.String': FqName@64) = null
+    packageFragments('java.lang.Unit': FqName@65) = null
+    packageFragments('kotlin': FqName@66) = LazyJavaPackageFragment@13['kotlin']
+    packageFragments('kotlin.A': FqName@67) = null
+    packageFragments('kotlin.Int': FqName@68) = null
+    packageFragments('kotlin.KMemberFunction0': FqName@69) = null
+    packageFragments('kotlin.KMemberFunction1': FqName@70) = null
+    packageFragments('kotlin.String': FqName@71) = null
+    packageFragments('kotlin.Unit': FqName@72) = null
+    packageFragments('kotlin.io': FqName@73) = LazyJavaPackageFragment@74['io']
+    packageFragments('kotlin.io.A': FqName@75) = null
+    packageFragments('kotlin.io.Int': FqName@76) = null
+    packageFragments('kotlin.io.KMemberFunction0': FqName@77) = null
+    packageFragments('kotlin.io.KMemberFunction1': FqName@78) = null
+    packageFragments('kotlin.io.String': FqName@79) = null
+    packageFragments('kotlin.io.Unit': FqName@80) = null
+    packageFragments('kotlin.jvm': FqName@81) = LazyJavaPackageFragment@82['jvm']
+    packageFragments('kotlin.jvm.A': FqName@83) = null
+    packageFragments('kotlin.jvm.Int': FqName@84) = null
+    packageFragments('kotlin.jvm.KMemberFunction0': FqName@85) = null
+    packageFragments('kotlin.jvm.KMemberFunction1': FqName@86) = null
+    packageFragments('kotlin.jvm.String': FqName@87) = null
+    packageFragments('kotlin.jvm.Unit': FqName@88) = null
+    packageFragments('kotlin.reflect': FqName@89) = LazyJavaPackageFragment@14['reflect']
+    packageFragments('kotlin.reflect.A': FqName@90) = null
+    packageFragments('kotlin.reflect.Int': FqName@91) = null
+    packageFragments('kotlin.reflect.KMemberFunction0': FqName@92) = null
+    packageFragments('kotlin.reflect.KMemberFunction1': FqName@93) = null
+    packageFragments('kotlin.reflect.String': FqName@94) = null
+    packageFragments('kotlin.reflect.Unit': FqName@95) = null
+    packageFragments('other': FqName@96) = null
+    packageFragments('other.A': FqName@97) = null
+    packageFragments('other.Int': FqName@98) = null
+    packageFragments('other.KMemberFunction0': FqName@99) = null
+    packageFragments('other.KMemberFunction1': FqName@100) = null
+    packageFragments('other.String': FqName@101) = null
+    packageFragments('other.Unit': FqName@102) = null
+    packageFragments('other.first': FqName@103) = null
 }
 
 LazyJavaPackageFragment@74['io'] {
-    _functions('bar': Name@104) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    _functions('baz': Name@107) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    _functions('foo': Name@108) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('Int': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('String': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('Unit': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('bar': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('baz': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('first': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('foo': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    deserializedPackageScope = DeserializedPackageMemberScope@113 // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('bar': Name@104) = EmptyList@105[empty] // through DeserializedPackageMemberScope@113
-    functions('baz': Name@107) = EmptyList@105[empty] // through DeserializedPackageMemberScope@113
-    functions('foo': Name@108) = EmptyList@105[empty] // through DeserializedPackageMemberScope@113
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@106
-    membersProtos = HashMap@115 // through DeserializedPackageMemberScope@113
-    properties('bar': Name@104) = EmptyList@105[empty] // through DeserializedPackageMemberScope@113
-    properties('baz': Name@107) = EmptyList@105[empty] // through DeserializedPackageMemberScope@113
-    properties('foo': Name@108) = EmptyList@105[empty] // through DeserializedPackageMemberScope@113
+    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 = HashMap@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
 }
 
 LazyJavaPackageFragment@57['java'] {
-    _functions('lang': Name@116) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('lang': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    deserializedPackageScope = Empty@119 // through LazyPackageFragmentScopeForJavaPackage@117
+    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
 }
 
 LazyJavaPackageFragment@82['jvm'] {
-    _functions('bar': Name@104) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    _functions('baz': Name@107) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    _functions('foo': Name@108) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Int': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('String': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Unit': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('bar': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('baz': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('first': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foo': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = Empty@119 // through LazyPackageFragmentScopeForJavaPackage@121
+    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
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    _functions('bar': Name@104) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@123
-    _functions('baz': Name@107) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@123
-    _functions('foo': Name@108) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@123
-    _functions('io': Name@124) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@123
-    _functions('jvm': Name@125) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@123
-    _functions('reflect': Name@126) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('Any': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('ExtensionFunction0': Name@128) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('ExtensionFunction1': Name@129) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('Int': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('String': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('Unit': Name@111) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('bar': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('baz': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('first': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('foo': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('io': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('jvm': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('reflect': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    deserializedPackageScope = DeserializedPackageMemberScope@133 // through LazyPackageFragmentScopeForJavaPackage@123
-    functions('bar': Name@104) = EmptyList@105[empty] // through DeserializedPackageMemberScope@133
-    functions('baz': Name@107) = EmptyList@105[empty] // through DeserializedPackageMemberScope@133
-    functions('foo': Name@108) = EmptyList@105[empty] // through DeserializedPackageMemberScope@133
-    functions('io': Name@124) = EmptyList@105[empty] // through DeserializedPackageMemberScope@133
-    functions('jvm': Name@125) = EmptyList@105[empty] // through DeserializedPackageMemberScope@133
-    functions('reflect': Name@126) = EmptyList@105[empty] // through DeserializedPackageMemberScope@133
-    memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@123
-    membersProtos = HashMap@135 // through DeserializedPackageMemberScope@133
-    properties('bar': Name@104) = EmptyList@105[empty] // through DeserializedPackageMemberScope@133
-    properties('baz': Name@107) = EmptyList@105[empty] // through DeserializedPackageMemberScope@133
-    properties('foo': Name@108) = EmptyList@105[empty] // through DeserializedPackageMemberScope@133
-    properties('io': Name@124) = EmptyList@105[empty] // through DeserializedPackageMemberScope@133
-    properties('jvm': Name@125) = EmptyList@105[empty] // through DeserializedPackageMemberScope@133
-    properties('reflect': Name@126) = EmptyList@105[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@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 = HashMap@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
 }
 
 LazyJavaPackageFragment@59['lang'] {
-    _functions('bar': Name@104) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    _functions('baz': Name@107) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    _functions('foo': Name@108) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('bar': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('baz': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('first': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('foo': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    deserializedPackageScope = Empty@119 // through LazyPackageFragmentScopeForJavaPackage@136
+    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
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    _functions('bar': Name@104) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    _functions('baz': Name@107) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    _functions('foo': Name@108) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('Int': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('KMemberFunction0': Name@140) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('KMemberFunction1': Name@141) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('String': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('Unit': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('bar': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('baz': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('first': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('foo': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    deserializedPackageScope = Empty@119 // through LazyPackageFragmentScopeForJavaPackage@138
-    memberIndex = computeMemberIndex$1@142 // through LazyPackageFragmentScopeForJavaPackage@138
+    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
 }
 
 TypeDeserializer@143 {

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

@@ -27,12 +27,12 @@ DeserializedTypeParameterDescriptor@13['T'] {
     upperBoundsAsType = DeserializedType@16['kotlin.Any']
 }
 
-DeserializedType@12['kotlin.Any'] {
+DeserializedType@16['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@17
     memberScope = DeserializedClassMemberScope@18
 }
 
-DeserializedType@16['kotlin.Any'] {
+DeserializedType@12['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@17
     memberScope = DeserializedClassMemberScope@18
 }
@@ -50,129 +50,129 @@ DeserializedType@21['kotlin.ExtensionFunction0'] {
 }
 
 LazyJavaPackageFragmentProvider@23 {
-    _packageFragments('<root>': FqName@24) = LazyJavaPackageFragment@25['<root>']
-    _packageFragments('A': FqName@26) = null
-    _packageFragments('KExtensionFunction0': FqName@27) = null
-    _packageFragments('Unit': FqName@28) = null
-    _packageFragments('first': FqName@29) = null
-    _packageFragments('first.A': FqName@30) = null
-    _packageFragments('first.foo': FqName@31) = null
-    _packageFragments('java': FqName@32) = LazyJavaPackageFragment@33['java']
-    _packageFragments('java.lang': FqName@34) = LazyJavaPackageFragment@35['lang']
-    _packageFragments('java.lang.A': FqName@36) = null
-    _packageFragments('java.lang.KExtensionFunction0': FqName@37) = null
-    _packageFragments('java.lang.Unit': FqName@38) = null
-    _packageFragments('kotlin': FqName@39) = LazyJavaPackageFragment@7['kotlin']
-    _packageFragments('kotlin.A': FqName@40) = null
-    _packageFragments('kotlin.KExtensionFunction0': FqName@41) = null
-    _packageFragments('kotlin.Unit': FqName@42) = null
-    _packageFragments('kotlin.io': FqName@43) = LazyJavaPackageFragment@44['io']
-    _packageFragments('kotlin.io.A': FqName@45) = null
-    _packageFragments('kotlin.io.KExtensionFunction0': FqName@46) = null
-    _packageFragments('kotlin.io.Unit': FqName@47) = null
-    _packageFragments('kotlin.jvm': FqName@48) = LazyJavaPackageFragment@49['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@50) = null
-    _packageFragments('kotlin.jvm.KExtensionFunction0': FqName@51) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@52) = null
-    _packageFragments('kotlin.reflect': FqName@53) = LazyJavaPackageFragment@8['reflect']
-    _packageFragments('kotlin.reflect.KExtensionFunction0': FqName@54) = null
-    _packageFragments('other': FqName@55) = null
-    _packageFragments('other.A': FqName@56) = null
-    _packageFragments('other.KExtensionFunction0': FqName@57) = null
-    _packageFragments('other.Unit': FqName@58) = null
-    _packageFragments('other.first': FqName@59) = null
+    packageFragments('<root>': FqName@24) = LazyJavaPackageFragment@25['<root>']
+    packageFragments('A': FqName@26) = null
+    packageFragments('KExtensionFunction0': FqName@27) = null
+    packageFragments('Unit': FqName@28) = null
+    packageFragments('first': FqName@29) = null
+    packageFragments('first.A': FqName@30) = null
+    packageFragments('first.foo': FqName@31) = null
+    packageFragments('java': FqName@32) = LazyJavaPackageFragment@33['java']
+    packageFragments('java.lang': FqName@34) = LazyJavaPackageFragment@35['lang']
+    packageFragments('java.lang.A': FqName@36) = null
+    packageFragments('java.lang.KExtensionFunction0': FqName@37) = null
+    packageFragments('java.lang.Unit': FqName@38) = null
+    packageFragments('kotlin': FqName@39) = LazyJavaPackageFragment@7['kotlin']
+    packageFragments('kotlin.A': FqName@40) = null
+    packageFragments('kotlin.KExtensionFunction0': FqName@41) = null
+    packageFragments('kotlin.Unit': FqName@42) = null
+    packageFragments('kotlin.io': FqName@43) = LazyJavaPackageFragment@44['io']
+    packageFragments('kotlin.io.A': FqName@45) = null
+    packageFragments('kotlin.io.KExtensionFunction0': FqName@46) = null
+    packageFragments('kotlin.io.Unit': FqName@47) = null
+    packageFragments('kotlin.jvm': FqName@48) = LazyJavaPackageFragment@49['jvm']
+    packageFragments('kotlin.jvm.A': FqName@50) = null
+    packageFragments('kotlin.jvm.KExtensionFunction0': FqName@51) = null
+    packageFragments('kotlin.jvm.Unit': FqName@52) = null
+    packageFragments('kotlin.reflect': FqName@53) = LazyJavaPackageFragment@8['reflect']
+    packageFragments('kotlin.reflect.KExtensionFunction0': FqName@54) = null
+    packageFragments('other': FqName@55) = null
+    packageFragments('other.A': FqName@56) = null
+    packageFragments('other.KExtensionFunction0': FqName@57) = null
+    packageFragments('other.Unit': FqName@58) = null
+    packageFragments('other.first': FqName@59) = null
 }
 
 LazyJavaPackageFragment@44['io'] {
-    _functions('bar': Name@60) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    _functions('baz': Name@63) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    _functions('foo': Name@64) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('Unit': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('bar': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('baz': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('first': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('foo': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = DeserializedPackageMemberScope@67 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('bar': Name@60) = EmptyList@61[empty] // through DeserializedPackageMemberScope@67
-    functions('baz': Name@63) = EmptyList@61[empty] // through DeserializedPackageMemberScope@67
-    functions('foo': Name@64) = EmptyList@61[empty] // through DeserializedPackageMemberScope@67
-    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@62
-    membersProtos = HashMap@69 // through DeserializedPackageMemberScope@67
-    properties('bar': Name@60) = EmptyList@61[empty] // through DeserializedPackageMemberScope@67
-    properties('baz': Name@63) = EmptyList@61[empty] // through DeserializedPackageMemberScope@67
-    properties('foo': Name@64) = EmptyList@61[empty] // through DeserializedPackageMemberScope@67
+    classes('Unit': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('bar': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('baz': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('first': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('foo': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    deserializedPackageScope = DeserializedPackageMemberScope@66 // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('bar': Name@62) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
+    functions('bar': Name@62) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('baz': Name@63) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
+    functions('baz': Name@63) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('foo': Name@65) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
+    functions('foo': Name@65) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@61
+    membersProtos = HashMap@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'] {
-    _functions('lang': Name@70) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('lang': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@71
+    functions('lang': Name@73) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@71
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
 LazyJavaPackageFragment@49['jvm'] {
-    _functions('bar': Name@60) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    _functions('baz': Name@63) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    _functions('foo': Name@64) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('Unit': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('bar': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('Unit': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('bar': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@75
     classes('baz': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('first': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('foo': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('first': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('foo': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('bar': Name@62) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('baz': Name@63) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('foo': Name@65) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@75
     memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    _functions('bar': Name@60) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    _functions('baz': Name@63) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    _functions('foo': Name@64) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    _functions('io': Name@78) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    _functions('jvm': Name@79) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    _functions('reflect': Name@80) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('Any': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('ExtensionFunction0': Name@82) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('Unit': Name@65) = DeserializedClassDescriptor@6['Unit'] // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('bar': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('baz': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('first': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('foo': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('io': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('jvm': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('reflect': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = DeserializedPackageMemberScope@86 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('bar': Name@60) = EmptyList@61[empty] // through DeserializedPackageMemberScope@86
-    functions('baz': Name@63) = EmptyList@61[empty] // through DeserializedPackageMemberScope@86
-    functions('foo': Name@64) = EmptyList@61[empty] // through DeserializedPackageMemberScope@86
-    functions('io': Name@78) = EmptyList@61[empty] // through DeserializedPackageMemberScope@86
-    functions('jvm': Name@79) = EmptyList@61[empty] // through DeserializedPackageMemberScope@86
-    functions('reflect': Name@80) = EmptyList@61[empty] // through DeserializedPackageMemberScope@86
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@77
-    membersProtos = HashMap@88 // through DeserializedPackageMemberScope@86
-    properties('bar': Name@60) = EmptyList@61[empty] // through DeserializedPackageMemberScope@86
-    properties('baz': Name@63) = EmptyList@61[empty] // through DeserializedPackageMemberScope@86
-    properties('foo': Name@64) = EmptyList@61[empty] // through DeserializedPackageMemberScope@86
-    properties('io': Name@78) = EmptyList@61[empty] // through DeserializedPackageMemberScope@86
-    properties('jvm': Name@79) = EmptyList@61[empty] // through DeserializedPackageMemberScope@86
-    properties('reflect': Name@80) = EmptyList@61[empty] // through DeserializedPackageMemberScope@86
+    classes('Any': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('ExtensionFunction0': Name@79) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('Unit': Name@60) = DeserializedClassDescriptor@6['Unit'] // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('bar': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('baz': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('first': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('foo': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('io': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('jvm': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('reflect': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    deserializedPackageScope = DeserializedPackageMemberScope@83 // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('bar': Name@62) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
+    functions('bar': Name@62) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('baz': Name@63) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
+    functions('baz': Name@63) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('foo': Name@65) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
+    functions('foo': Name@65) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('io': Name@84) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
+    functions('io': Name@84) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('jvm': Name@85) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
+    functions('jvm': Name@85) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('reflect': Name@86) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
+    functions('reflect': Name@86) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@78
+    membersProtos = HashMap@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
 }
 
 LazyJavaPackageFragment@35['lang'] {
-    _functions('bar': Name@60) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    _functions('baz': Name@63) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    _functions('foo': Name@64) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('bar': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('bar': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@89
     classes('baz': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('first': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('foo': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('first': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('foo': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('bar': Name@62) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('baz': Name@63) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('foo': Name@65) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@89
     memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
 }
 
 LazyJavaPackageFragment@8['reflect'] {
-    _functions('KExtensionFunction0': Name@91) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('KExtensionFunction0': Name@93) = DeserializedClassDescriptor@4['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('KExtensionFunction0': Name@91) = DeserializedClassDescriptor@4['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@92
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@92
+    functions('KExtensionFunction0': Name@93) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@92
     memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
 }
 

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

@@ -46,7 +46,7 @@ DeserializedTypeParameterDescriptor@23['R'] {
     upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
 }
 
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -56,7 +56,7 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -82,159 +82,159 @@ DeserializedType@34['kotlin.Function1'] {
 }
 
 LazyJavaPackageFragmentProvider@36 {
-    _packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
-    _packageFragments('Int': FqName@39) = null
-    _packageFragments('KFunction0': FqName@40) = null
-    _packageFragments('KFunction1': FqName@41) = null
-    _packageFragments('String': FqName@42) = null
-    _packageFragments('Unit': FqName@43) = null
-    _packageFragments('first': FqName@44) = null
-    _packageFragments('first.Int': FqName@45) = null
-    _packageFragments('first.bar': FqName@46) = null
-    _packageFragments('first.baz': FqName@47) = null
-    _packageFragments('first.foo': FqName@48) = null
-    _packageFragments('java': FqName@49) = LazyJavaPackageFragment@50['java']
-    _packageFragments('java.lang': FqName@51) = LazyJavaPackageFragment@52['lang']
-    _packageFragments('java.lang.Int': FqName@53) = null
-    _packageFragments('java.lang.KFunction0': FqName@54) = null
-    _packageFragments('java.lang.KFunction1': FqName@55) = null
-    _packageFragments('java.lang.String': FqName@56) = null
-    _packageFragments('java.lang.Unit': FqName@57) = null
-    _packageFragments('kotlin': FqName@58) = LazyJavaPackageFragment@13['kotlin']
-    _packageFragments('kotlin.Int': FqName@59) = null
-    _packageFragments('kotlin.KFunction0': FqName@60) = null
-    _packageFragments('kotlin.KFunction1': FqName@61) = null
-    _packageFragments('kotlin.String': FqName@62) = null
-    _packageFragments('kotlin.Unit': FqName@63) = null
-    _packageFragments('kotlin.io': FqName@64) = LazyJavaPackageFragment@65['io']
-    _packageFragments('kotlin.io.Int': FqName@66) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@67) = null
-    _packageFragments('kotlin.io.KFunction1': FqName@68) = null
-    _packageFragments('kotlin.io.String': FqName@69) = null
-    _packageFragments('kotlin.io.Unit': FqName@70) = null
-    _packageFragments('kotlin.jvm': FqName@71) = LazyJavaPackageFragment@72['jvm']
-    _packageFragments('kotlin.jvm.Int': FqName@73) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@74) = null
-    _packageFragments('kotlin.jvm.KFunction1': FqName@75) = null
-    _packageFragments('kotlin.jvm.String': FqName@76) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@77) = null
-    _packageFragments('kotlin.reflect': FqName@78) = LazyJavaPackageFragment@14['reflect']
-    _packageFragments('kotlin.reflect.Int': FqName@79) = null
-    _packageFragments('kotlin.reflect.KFunction0': FqName@80) = null
-    _packageFragments('kotlin.reflect.KFunction1': FqName@81) = null
-    _packageFragments('kotlin.reflect.String': FqName@82) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@83) = null
-    _packageFragments('other': FqName@84) = null
-    _packageFragments('other.Int': FqName@85) = null
-    _packageFragments('other.KFunction0': FqName@86) = null
-    _packageFragments('other.KFunction1': FqName@87) = null
-    _packageFragments('other.String': FqName@88) = null
-    _packageFragments('other.Unit': FqName@89) = null
+    packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
+    packageFragments('Int': FqName@39) = null
+    packageFragments('KFunction0': FqName@40) = null
+    packageFragments('KFunction1': FqName@41) = null
+    packageFragments('String': FqName@42) = null
+    packageFragments('Unit': FqName@43) = null
+    packageFragments('first': FqName@44) = null
+    packageFragments('first.Int': FqName@45) = null
+    packageFragments('first.bar': FqName@46) = null
+    packageFragments('first.baz': FqName@47) = null
+    packageFragments('first.foo': FqName@48) = null
+    packageFragments('java': FqName@49) = LazyJavaPackageFragment@50['java']
+    packageFragments('java.lang': FqName@51) = LazyJavaPackageFragment@52['lang']
+    packageFragments('java.lang.Int': FqName@53) = null
+    packageFragments('java.lang.KFunction0': FqName@54) = null
+    packageFragments('java.lang.KFunction1': FqName@55) = null
+    packageFragments('java.lang.String': FqName@56) = null
+    packageFragments('java.lang.Unit': FqName@57) = null
+    packageFragments('kotlin': FqName@58) = LazyJavaPackageFragment@13['kotlin']
+    packageFragments('kotlin.Int': FqName@59) = null
+    packageFragments('kotlin.KFunction0': FqName@60) = null
+    packageFragments('kotlin.KFunction1': FqName@61) = null
+    packageFragments('kotlin.String': FqName@62) = null
+    packageFragments('kotlin.Unit': FqName@63) = null
+    packageFragments('kotlin.io': FqName@64) = LazyJavaPackageFragment@65['io']
+    packageFragments('kotlin.io.Int': FqName@66) = null
+    packageFragments('kotlin.io.KFunction0': FqName@67) = null
+    packageFragments('kotlin.io.KFunction1': FqName@68) = null
+    packageFragments('kotlin.io.String': FqName@69) = null
+    packageFragments('kotlin.io.Unit': FqName@70) = null
+    packageFragments('kotlin.jvm': FqName@71) = LazyJavaPackageFragment@72['jvm']
+    packageFragments('kotlin.jvm.Int': FqName@73) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@74) = null
+    packageFragments('kotlin.jvm.KFunction1': FqName@75) = null
+    packageFragments('kotlin.jvm.String': FqName@76) = null
+    packageFragments('kotlin.jvm.Unit': FqName@77) = null
+    packageFragments('kotlin.reflect': FqName@78) = LazyJavaPackageFragment@14['reflect']
+    packageFragments('kotlin.reflect.Int': FqName@79) = null
+    packageFragments('kotlin.reflect.KFunction0': FqName@80) = null
+    packageFragments('kotlin.reflect.KFunction1': FqName@81) = null
+    packageFragments('kotlin.reflect.String': FqName@82) = null
+    packageFragments('kotlin.reflect.Unit': FqName@83) = null
+    packageFragments('other': FqName@84) = null
+    packageFragments('other.Int': FqName@85) = null
+    packageFragments('other.KFunction0': FqName@86) = null
+    packageFragments('other.KFunction1': FqName@87) = null
+    packageFragments('other.String': FqName@88) = null
+    packageFragments('other.Unit': FqName@89) = null
 }
 
 LazyJavaPackageFragment@65['io'] {
-    _functions('bar': Name@90) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    _functions('baz': Name@93) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    _functions('foo': Name@94) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('Int': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('String': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('Unit': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('bar': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = DeserializedPackageMemberScope@98 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('bar': Name@90) = EmptyList@91[empty] // through DeserializedPackageMemberScope@98
-    functions('baz': Name@93) = EmptyList@91[empty] // through DeserializedPackageMemberScope@98
-    functions('foo': Name@94) = EmptyList@91[empty] // through DeserializedPackageMemberScope@98
-    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@92
-    membersProtos = HashMap@100 // through DeserializedPackageMemberScope@98
-    properties('bar': Name@90) = EmptyList@91[empty] // through DeserializedPackageMemberScope@98
-    properties('baz': Name@93) = EmptyList@91[empty] // through DeserializedPackageMemberScope@98
-    properties('foo': Name@94) = EmptyList@91[empty] // through DeserializedPackageMemberScope@98
+    classes('Int': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
+    classes('String': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@91
+    classes('Unit': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@91
+    classes('bar': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@91
+    classes('baz': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@91
+    classes('foo': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@91
+    deserializedPackageScope = DeserializedPackageMemberScope@97 // through LazyPackageFragmentScopeForJavaPackage@91
+    functions('bar': Name@94) = EmptyList@98[empty] // through DeserializedPackageMemberScope@97
+    functions('bar': Name@94) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@91
+    functions('baz': Name@95) = EmptyList@98[empty] // through DeserializedPackageMemberScope@97
+    functions('baz': Name@95) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@91
+    functions('foo': Name@96) = EmptyList@98[empty] // through DeserializedPackageMemberScope@97
+    functions('foo': Name@96) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@91
+    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@91
+    membersProtos = HashMap@100 // through DeserializedPackageMemberScope@97
+    properties('bar': Name@94) = EmptyList@98[empty] // through DeserializedPackageMemberScope@97
+    properties('baz': Name@95) = EmptyList@98[empty] // through DeserializedPackageMemberScope@97
+    properties('foo': Name@96) = EmptyList@98[empty] // through DeserializedPackageMemberScope@97
 }
 
 LazyJavaPackageFragment@50['java'] {
-    _functions('lang': Name@101) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@102
+    classes('lang': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@102
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@102
+    functions('lang': Name@104) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@102
     memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@102
 }
 
 LazyJavaPackageFragment@72['jvm'] {
-    _functions('bar': Name@90) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    _functions('baz': Name@93) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    _functions('foo': Name@94) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('Int': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('String': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('Unit': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('bar': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('Int': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('String': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('Unit': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('bar': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('baz': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('foo': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@106
+    functions('bar': Name@94) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@106
+    functions('baz': Name@95) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@106
+    functions('foo': Name@96) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@106
     memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@106
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    _functions('bar': Name@90) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    _functions('baz': Name@93) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    _functions('foo': Name@94) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    _functions('io': Name@109) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    _functions('jvm': Name@110) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    _functions('reflect': Name@111) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Any': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Function0': Name@113) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Function1': Name@114) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Int': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('String': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Unit': Name@97) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('bar': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('io': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('jvm': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('reflect': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = DeserializedPackageMemberScope@118 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('bar': Name@90) = EmptyList@91[empty] // through DeserializedPackageMemberScope@118
-    functions('baz': Name@93) = EmptyList@91[empty] // through DeserializedPackageMemberScope@118
-    functions('foo': Name@94) = EmptyList@91[empty] // through DeserializedPackageMemberScope@118
-    functions('io': Name@109) = EmptyList@91[empty] // through DeserializedPackageMemberScope@118
-    functions('jvm': Name@110) = EmptyList@91[empty] // through DeserializedPackageMemberScope@118
-    functions('reflect': Name@111) = EmptyList@91[empty] // through DeserializedPackageMemberScope@118
-    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@108
-    membersProtos = HashMap@120 // through DeserializedPackageMemberScope@118
-    properties('bar': Name@90) = EmptyList@91[empty] // through DeserializedPackageMemberScope@118
-    properties('baz': Name@93) = EmptyList@91[empty] // through DeserializedPackageMemberScope@118
-    properties('foo': Name@94) = EmptyList@91[empty] // through DeserializedPackageMemberScope@118
-    properties('io': Name@109) = EmptyList@91[empty] // through DeserializedPackageMemberScope@118
-    properties('jvm': Name@110) = EmptyList@91[empty] // through DeserializedPackageMemberScope@118
-    properties('reflect': Name@111) = EmptyList@91[empty] // through DeserializedPackageMemberScope@118
+    classes('Any': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('Function0': Name@110) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('Function1': Name@111) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('Int': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('String': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('Unit': Name@93) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('bar': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('baz': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('foo': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('io': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('jvm': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('reflect': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@109
+    deserializedPackageScope = DeserializedPackageMemberScope@115 // through LazyPackageFragmentScopeForJavaPackage@109
+    functions('bar': Name@94) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
+    functions('bar': Name@94) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@109
+    functions('baz': Name@95) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
+    functions('baz': Name@95) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@109
+    functions('foo': Name@96) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
+    functions('foo': Name@96) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@109
+    functions('io': Name@116) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
+    functions('io': Name@116) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@109
+    functions('jvm': Name@117) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
+    functions('jvm': Name@117) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@109
+    functions('reflect': Name@118) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
+    functions('reflect': Name@118) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@109
+    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@109
+    membersProtos = HashMap@120 // through DeserializedPackageMemberScope@115
+    properties('bar': Name@94) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
+    properties('baz': Name@95) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
+    properties('foo': Name@96) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
+    properties('io': Name@116) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
+    properties('jvm': Name@117) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
+    properties('reflect': Name@118) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
 }
 
 LazyJavaPackageFragment@52['lang'] {
-    _functions('bar': Name@90) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    _functions('baz': Name@93) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    _functions('foo': Name@94) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('bar': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('bar': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('baz': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('foo': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('bar': Name@94) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('baz': Name@95) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('foo': Name@96) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@121
     memberIndex = computeMemberIndex$1@122 // through LazyPackageFragmentScopeForJavaPackage@121
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    _functions('bar': Name@90) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@123
-    _functions('baz': Name@93) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@123
-    _functions('foo': Name@94) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('Int': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('KFunction0': Name@125) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('KFunction1': Name@126) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('String': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('Unit': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('bar': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@123
-    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('Int': Name@123) = 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@92) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('Unit': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('bar': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('baz': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('foo': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('bar': Name@94) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('baz': Name@95) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('foo': Name@96) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@124
 }
 
 TypeDeserializer@128 {

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

@@ -1,34 +1,34 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('A': FqName@3) = null
-    _packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    _packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    _packageFragments('java.lang.A': FqName@8) = null
-    _packageFragments('kotlin': FqName@9) = LazyJavaPackageFragment@10['kotlin']
-    _packageFragments('kotlin.A': FqName@11) = null
-    _packageFragments('kotlin.io': FqName@12) = LazyJavaPackageFragment@13['io']
-    _packageFragments('kotlin.io.A': FqName@14) = null
-    _packageFragments('kotlin.jvm': FqName@15) = LazyJavaPackageFragment@16['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@17) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('A': FqName@3) = null
+    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
+    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
+    packageFragments('java.lang.A': FqName@8) = null
+    packageFragments('kotlin': FqName@9) = LazyJavaPackageFragment@10['kotlin']
+    packageFragments('kotlin.A': FqName@11) = null
+    packageFragments('kotlin.io': FqName@12) = LazyJavaPackageFragment@13['io']
+    packageFragments('kotlin.io.A': FqName@14) = null
+    packageFragments('kotlin.jvm': FqName@15) = LazyJavaPackageFragment@16['jvm']
+    packageFragments('kotlin.jvm.A': FqName@17) = null
 }
 
 LazyJavaPackageFragment@5['java'] {
-    _functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
 LazyJavaPackageFragment@10['kotlin'] {
-    _functions('io': Name@24) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    _functions('jvm': Name@26) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('io': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('jvm': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = DeserializedPackageMemberScope@29 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('io': Name@24) = EmptyList@19[empty] // through DeserializedPackageMemberScope@29
-    functions('jvm': Name@26) = EmptyList@19[empty] // through DeserializedPackageMemberScope@29
+    classes('io': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('jvm': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = DeserializedPackageMemberScope@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('io': Name@28) = EmptyList@22[empty] // through DeserializedPackageMemberScope@27
+    functions('io': Name@28) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('jvm': Name@29) = EmptyList@22[empty] // through DeserializedPackageMemberScope@27
+    functions('jvm': Name@29) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@25
-    membersProtos = HashMap@31 // through DeserializedPackageMemberScope@29
-    properties('io': Name@24) = EmptyList@19[empty] // through DeserializedPackageMemberScope@29
-    properties('jvm': Name@26) = EmptyList@19[empty] // through DeserializedPackageMemberScope@29
+    membersProtos = HashMap@31 // through DeserializedPackageMemberScope@27
+    properties('io': Name@28) = EmptyList@22[empty] // through DeserializedPackageMemberScope@27
+    properties('jvm': Name@29) = EmptyList@22[empty] // through DeserializedPackageMemberScope@27
 }

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

@@ -58,12 +58,12 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@34['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@34['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -73,12 +73,12 @@ DeserializedType@22['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -104,177 +104,177 @@ DeserializedType@42['kotlin.ExtensionFunction1'] {
 }
 
 LazyJavaPackageFragmentProvider@44 {
-    _packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
-    _packageFragments('A': FqName@47) = null
-    _packageFragments('Int': FqName@48) = null
-    _packageFragments('KExtensionFunction0': FqName@49) = null
-    _packageFragments('KExtensionFunction1': FqName@50) = null
-    _packageFragments('String': FqName@51) = null
-    _packageFragments('Unit': FqName@52) = null
-    _packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    _packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    _packageFragments('java.lang.A': FqName@57) = null
-    _packageFragments('java.lang.Int': FqName@58) = null
-    _packageFragments('java.lang.KExtensionFunction0': FqName@59) = null
-    _packageFragments('java.lang.KExtensionFunction1': FqName@60) = null
-    _packageFragments('java.lang.String': FqName@61) = null
-    _packageFragments('java.lang.Unit': FqName@62) = null
-    _packageFragments('kotlin': FqName@63) = LazyJavaPackageFragment@13['kotlin']
-    _packageFragments('kotlin.A': FqName@64) = null
-    _packageFragments('kotlin.Int': FqName@65) = null
-    _packageFragments('kotlin.KExtensionFunction0': FqName@66) = null
-    _packageFragments('kotlin.KExtensionFunction1': FqName@67) = null
-    _packageFragments('kotlin.String': FqName@68) = null
-    _packageFragments('kotlin.Unit': FqName@69) = null
-    _packageFragments('kotlin.io': FqName@70) = LazyJavaPackageFragment@71['io']
-    _packageFragments('kotlin.io.A': FqName@72) = null
-    _packageFragments('kotlin.io.Int': FqName@73) = null
-    _packageFragments('kotlin.io.KExtensionFunction0': FqName@74) = null
-    _packageFragments('kotlin.io.KExtensionFunction1': FqName@75) = null
-    _packageFragments('kotlin.io.String': FqName@76) = null
-    _packageFragments('kotlin.io.Unit': FqName@77) = null
-    _packageFragments('kotlin.jvm': FqName@78) = LazyJavaPackageFragment@79['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@80) = null
-    _packageFragments('kotlin.jvm.Int': FqName@81) = null
-    _packageFragments('kotlin.jvm.KExtensionFunction0': FqName@82) = null
-    _packageFragments('kotlin.jvm.KExtensionFunction1': FqName@83) = null
-    _packageFragments('kotlin.jvm.String': FqName@84) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@85) = null
-    _packageFragments('kotlin.reflect': FqName@86) = LazyJavaPackageFragment@14['reflect']
-    _packageFragments('kotlin.reflect.A': FqName@87) = null
-    _packageFragments('kotlin.reflect.Int': FqName@88) = null
-    _packageFragments('kotlin.reflect.KExtensionFunction0': FqName@89) = null
-    _packageFragments('kotlin.reflect.KExtensionFunction1': FqName@90) = null
-    _packageFragments('kotlin.reflect.String': FqName@91) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@92) = null
+    packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
+    packageFragments('A': FqName@47) = null
+    packageFragments('Int': FqName@48) = null
+    packageFragments('KExtensionFunction0': FqName@49) = null
+    packageFragments('KExtensionFunction1': FqName@50) = null
+    packageFragments('String': FqName@51) = null
+    packageFragments('Unit': FqName@52) = null
+    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
+    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
+    packageFragments('java.lang.A': FqName@57) = null
+    packageFragments('java.lang.Int': FqName@58) = null
+    packageFragments('java.lang.KExtensionFunction0': FqName@59) = null
+    packageFragments('java.lang.KExtensionFunction1': FqName@60) = null
+    packageFragments('java.lang.String': FqName@61) = null
+    packageFragments('java.lang.Unit': FqName@62) = null
+    packageFragments('kotlin': FqName@63) = LazyJavaPackageFragment@13['kotlin']
+    packageFragments('kotlin.A': FqName@64) = null
+    packageFragments('kotlin.Int': FqName@65) = null
+    packageFragments('kotlin.KExtensionFunction0': FqName@66) = null
+    packageFragments('kotlin.KExtensionFunction1': FqName@67) = null
+    packageFragments('kotlin.String': FqName@68) = null
+    packageFragments('kotlin.Unit': FqName@69) = null
+    packageFragments('kotlin.io': FqName@70) = LazyJavaPackageFragment@71['io']
+    packageFragments('kotlin.io.A': FqName@72) = null
+    packageFragments('kotlin.io.Int': FqName@73) = null
+    packageFragments('kotlin.io.KExtensionFunction0': FqName@74) = null
+    packageFragments('kotlin.io.KExtensionFunction1': FqName@75) = null
+    packageFragments('kotlin.io.String': FqName@76) = null
+    packageFragments('kotlin.io.Unit': FqName@77) = null
+    packageFragments('kotlin.jvm': FqName@78) = LazyJavaPackageFragment@79['jvm']
+    packageFragments('kotlin.jvm.A': FqName@80) = null
+    packageFragments('kotlin.jvm.Int': FqName@81) = null
+    packageFragments('kotlin.jvm.KExtensionFunction0': FqName@82) = null
+    packageFragments('kotlin.jvm.KExtensionFunction1': FqName@83) = null
+    packageFragments('kotlin.jvm.String': FqName@84) = null
+    packageFragments('kotlin.jvm.Unit': FqName@85) = null
+    packageFragments('kotlin.reflect': FqName@86) = LazyJavaPackageFragment@14['reflect']
+    packageFragments('kotlin.reflect.A': FqName@87) = null
+    packageFragments('kotlin.reflect.Int': FqName@88) = null
+    packageFragments('kotlin.reflect.KExtensionFunction0': FqName@89) = null
+    packageFragments('kotlin.reflect.KExtensionFunction1': FqName@90) = null
+    packageFragments('kotlin.reflect.String': FqName@91) = null
+    packageFragments('kotlin.reflect.Unit': FqName@92) = null
 }
 
 LazyJavaPackageFragment@46['<root>'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('kotlin': Name@98) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('KExtensionFunction0': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('KExtensionFunction1': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('kotlin': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('KExtensionFunction0': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('KExtensionFunction1': 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
 }
 
 LazyJavaPackageFragment@71['io'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    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@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    functions('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    functions('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
+    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 = HashMap@110 // through DeserializedPackageMemberScope@108
-    properties('bar': Name@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('x': Name@111) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('y': Name@112) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('z': Name@113) = EmptyList@94[empty] // 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
+    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'] {
-    _functions('lang': Name@114) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('lang': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@115
+    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
 }
 
 LazyJavaPackageFragment@79['jvm'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@118
+    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
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('io': Name@121) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('jvm': Name@122) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('reflect': Name@123) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('Any': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('ExtensionFunction0': Name@125) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('ExtensionFunction1': Name@126) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('Unit': Name@103) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('io': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('jvm': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('reflect': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    deserializedPackageScope = DeserializedPackageMemberScope@130 // through LazyPackageFragmentScopeForJavaPackage@120
-    functions('bar': Name@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    functions('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    functions('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    functions('io': Name@121) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    functions('jvm': Name@122) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    functions('reflect': Name@123) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@120
-    membersProtos = HashMap@132 // through DeserializedPackageMemberScope@130
-    properties('bar': Name@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('io': Name@121) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('jvm': Name@122) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('reflect': Name@123) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('x': Name@111) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('y': Name@112) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('z': Name@113) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
+    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 = HashMap@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
 }
 
 LazyJavaPackageFragment@56['lang'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@133
+    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
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@135
+    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@102) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    deserializedPackageScope = Empty@105 // 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
 }
 

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

@@ -58,6 +58,11 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
+DeserializedType@26['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
 DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
@@ -78,11 +83,6 @@ DeserializedType@30['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
 DeserializedType@37['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
 }
@@ -104,177 +104,177 @@ DeserializedType@42['kotlin.ExtensionFunction1'] {
 }
 
 LazyJavaPackageFragmentProvider@44 {
-    _packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
-    _packageFragments('A': FqName@47) = null
-    _packageFragments('Int': FqName@48) = null
-    _packageFragments('KExtensionFunction0': FqName@49) = null
-    _packageFragments('KExtensionFunction1': FqName@50) = null
-    _packageFragments('String': FqName@51) = null
-    _packageFragments('Unit': FqName@52) = null
-    _packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    _packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    _packageFragments('java.lang.A': FqName@57) = null
-    _packageFragments('java.lang.Int': FqName@58) = null
-    _packageFragments('java.lang.KExtensionFunction0': FqName@59) = null
-    _packageFragments('java.lang.KExtensionFunction1': FqName@60) = null
-    _packageFragments('java.lang.String': FqName@61) = null
-    _packageFragments('java.lang.Unit': FqName@62) = null
-    _packageFragments('kotlin': FqName@63) = LazyJavaPackageFragment@13['kotlin']
-    _packageFragments('kotlin.A': FqName@64) = null
-    _packageFragments('kotlin.Int': FqName@65) = null
-    _packageFragments('kotlin.KExtensionFunction0': FqName@66) = null
-    _packageFragments('kotlin.KExtensionFunction1': FqName@67) = null
-    _packageFragments('kotlin.String': FqName@68) = null
-    _packageFragments('kotlin.Unit': FqName@69) = null
-    _packageFragments('kotlin.io': FqName@70) = LazyJavaPackageFragment@71['io']
-    _packageFragments('kotlin.io.A': FqName@72) = null
-    _packageFragments('kotlin.io.Int': FqName@73) = null
-    _packageFragments('kotlin.io.KExtensionFunction0': FqName@74) = null
-    _packageFragments('kotlin.io.KExtensionFunction1': FqName@75) = null
-    _packageFragments('kotlin.io.String': FqName@76) = null
-    _packageFragments('kotlin.io.Unit': FqName@77) = null
-    _packageFragments('kotlin.jvm': FqName@78) = LazyJavaPackageFragment@79['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@80) = null
-    _packageFragments('kotlin.jvm.Int': FqName@81) = null
-    _packageFragments('kotlin.jvm.KExtensionFunction0': FqName@82) = null
-    _packageFragments('kotlin.jvm.KExtensionFunction1': FqName@83) = null
-    _packageFragments('kotlin.jvm.String': FqName@84) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@85) = null
-    _packageFragments('kotlin.reflect': FqName@86) = LazyJavaPackageFragment@14['reflect']
-    _packageFragments('kotlin.reflect.A': FqName@87) = null
-    _packageFragments('kotlin.reflect.Int': FqName@88) = null
-    _packageFragments('kotlin.reflect.KExtensionFunction0': FqName@89) = null
-    _packageFragments('kotlin.reflect.KExtensionFunction1': FqName@90) = null
-    _packageFragments('kotlin.reflect.String': FqName@91) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@92) = null
+    packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
+    packageFragments('A': FqName@47) = null
+    packageFragments('Int': FqName@48) = null
+    packageFragments('KExtensionFunction0': FqName@49) = null
+    packageFragments('KExtensionFunction1': FqName@50) = null
+    packageFragments('String': FqName@51) = null
+    packageFragments('Unit': FqName@52) = null
+    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
+    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
+    packageFragments('java.lang.A': FqName@57) = null
+    packageFragments('java.lang.Int': FqName@58) = null
+    packageFragments('java.lang.KExtensionFunction0': FqName@59) = null
+    packageFragments('java.lang.KExtensionFunction1': FqName@60) = null
+    packageFragments('java.lang.String': FqName@61) = null
+    packageFragments('java.lang.Unit': FqName@62) = null
+    packageFragments('kotlin': FqName@63) = LazyJavaPackageFragment@13['kotlin']
+    packageFragments('kotlin.A': FqName@64) = null
+    packageFragments('kotlin.Int': FqName@65) = null
+    packageFragments('kotlin.KExtensionFunction0': FqName@66) = null
+    packageFragments('kotlin.KExtensionFunction1': FqName@67) = null
+    packageFragments('kotlin.String': FqName@68) = null
+    packageFragments('kotlin.Unit': FqName@69) = null
+    packageFragments('kotlin.io': FqName@70) = LazyJavaPackageFragment@71['io']
+    packageFragments('kotlin.io.A': FqName@72) = null
+    packageFragments('kotlin.io.Int': FqName@73) = null
+    packageFragments('kotlin.io.KExtensionFunction0': FqName@74) = null
+    packageFragments('kotlin.io.KExtensionFunction1': FqName@75) = null
+    packageFragments('kotlin.io.String': FqName@76) = null
+    packageFragments('kotlin.io.Unit': FqName@77) = null
+    packageFragments('kotlin.jvm': FqName@78) = LazyJavaPackageFragment@79['jvm']
+    packageFragments('kotlin.jvm.A': FqName@80) = null
+    packageFragments('kotlin.jvm.Int': FqName@81) = null
+    packageFragments('kotlin.jvm.KExtensionFunction0': FqName@82) = null
+    packageFragments('kotlin.jvm.KExtensionFunction1': FqName@83) = null
+    packageFragments('kotlin.jvm.String': FqName@84) = null
+    packageFragments('kotlin.jvm.Unit': FqName@85) = null
+    packageFragments('kotlin.reflect': FqName@86) = LazyJavaPackageFragment@14['reflect']
+    packageFragments('kotlin.reflect.A': FqName@87) = null
+    packageFragments('kotlin.reflect.Int': FqName@88) = null
+    packageFragments('kotlin.reflect.KExtensionFunction0': FqName@89) = null
+    packageFragments('kotlin.reflect.KExtensionFunction1': FqName@90) = null
+    packageFragments('kotlin.reflect.String': FqName@91) = null
+    packageFragments('kotlin.reflect.Unit': FqName@92) = null
 }
 
 LazyJavaPackageFragment@46['<root>'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('kotlin': Name@98) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('KExtensionFunction0': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('KExtensionFunction1': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('kotlin': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('KExtensionFunction0': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('KExtensionFunction1': 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
 }
 
 LazyJavaPackageFragment@71['io'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    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@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    functions('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    functions('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
+    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 = HashMap@110 // through DeserializedPackageMemberScope@108
-    properties('bar': Name@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('x': Name@111) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('y': Name@112) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('z': Name@113) = EmptyList@94[empty] // 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
+    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'] {
-    _functions('lang': Name@114) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('lang': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@115
+    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
 }
 
 LazyJavaPackageFragment@79['jvm'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@118
+    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
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('io': Name@121) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('jvm': Name@122) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('reflect': Name@123) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('Any': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('ExtensionFunction0': Name@125) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('ExtensionFunction1': Name@126) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('Unit': Name@103) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('io': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('jvm': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('reflect': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    deserializedPackageScope = DeserializedPackageMemberScope@130 // through LazyPackageFragmentScopeForJavaPackage@120
-    functions('bar': Name@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    functions('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    functions('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    functions('io': Name@121) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    functions('jvm': Name@122) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    functions('reflect': Name@123) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@120
-    membersProtos = HashMap@132 // through DeserializedPackageMemberScope@130
-    properties('bar': Name@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('io': Name@121) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('jvm': Name@122) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('reflect': Name@123) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('x': Name@111) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('y': Name@112) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('z': Name@113) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
+    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 = HashMap@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
 }
 
 LazyJavaPackageFragment@56['lang'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@133
+    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
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@135
+    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@102) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    deserializedPackageScope = Empty@105 // 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
 }
 

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

@@ -58,6 +58,11 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
+DeserializedType@22['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
 DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
@@ -68,11 +73,6 @@ DeserializedType@18['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
 DeserializedType@34['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
@@ -104,183 +104,183 @@ DeserializedType@42['kotlin.ExtensionFunction1'] {
 }
 
 LazyJavaPackageFragmentProvider@44 {
-    _packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
-    _packageFragments('A': FqName@47) = null
-    _packageFragments('B': FqName@48) = null
-    _packageFragments('Int': FqName@49) = null
-    _packageFragments('KExtensionFunction0': FqName@50) = null
-    _packageFragments('KExtensionFunction1': FqName@51) = null
-    _packageFragments('String': FqName@52) = null
-    _packageFragments('Unit': FqName@53) = null
-    _packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
-    _packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
-    _packageFragments('java.lang.A': FqName@58) = null
-    _packageFragments('java.lang.B': FqName@59) = null
-    _packageFragments('java.lang.Int': FqName@60) = null
-    _packageFragments('java.lang.KExtensionFunction0': FqName@61) = null
-    _packageFragments('java.lang.KExtensionFunction1': FqName@62) = null
-    _packageFragments('java.lang.String': FqName@63) = null
-    _packageFragments('java.lang.Unit': FqName@64) = null
-    _packageFragments('kotlin': FqName@65) = LazyJavaPackageFragment@13['kotlin']
-    _packageFragments('kotlin.A': FqName@66) = null
-    _packageFragments('kotlin.B': FqName@67) = null
-    _packageFragments('kotlin.Int': FqName@68) = null
-    _packageFragments('kotlin.KExtensionFunction0': FqName@69) = null
-    _packageFragments('kotlin.KExtensionFunction1': FqName@70) = null
-    _packageFragments('kotlin.String': FqName@71) = null
-    _packageFragments('kotlin.Unit': FqName@72) = null
-    _packageFragments('kotlin.io': FqName@73) = LazyJavaPackageFragment@74['io']
-    _packageFragments('kotlin.io.A': FqName@75) = null
-    _packageFragments('kotlin.io.B': FqName@76) = null
-    _packageFragments('kotlin.io.Int': FqName@77) = null
-    _packageFragments('kotlin.io.KExtensionFunction0': FqName@78) = null
-    _packageFragments('kotlin.io.KExtensionFunction1': FqName@79) = null
-    _packageFragments('kotlin.io.String': FqName@80) = null
-    _packageFragments('kotlin.io.Unit': FqName@81) = null
-    _packageFragments('kotlin.jvm': FqName@82) = LazyJavaPackageFragment@83['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@84) = null
-    _packageFragments('kotlin.jvm.B': FqName@85) = null
-    _packageFragments('kotlin.jvm.Int': FqName@86) = null
-    _packageFragments('kotlin.jvm.KExtensionFunction0': FqName@87) = null
-    _packageFragments('kotlin.jvm.KExtensionFunction1': FqName@88) = null
-    _packageFragments('kotlin.jvm.String': FqName@89) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@90) = null
-    _packageFragments('kotlin.reflect': FqName@91) = LazyJavaPackageFragment@14['reflect']
-    _packageFragments('kotlin.reflect.A': FqName@92) = null
-    _packageFragments('kotlin.reflect.B': FqName@93) = null
-    _packageFragments('kotlin.reflect.Int': FqName@94) = null
-    _packageFragments('kotlin.reflect.KExtensionFunction0': FqName@95) = null
-    _packageFragments('kotlin.reflect.KExtensionFunction1': FqName@96) = null
-    _packageFragments('kotlin.reflect.String': FqName@97) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@98) = null
+    packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
+    packageFragments('A': FqName@47) = null
+    packageFragments('B': FqName@48) = null
+    packageFragments('Int': FqName@49) = null
+    packageFragments('KExtensionFunction0': FqName@50) = null
+    packageFragments('KExtensionFunction1': FqName@51) = null
+    packageFragments('String': FqName@52) = null
+    packageFragments('Unit': FqName@53) = null
+    packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
+    packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
+    packageFragments('java.lang.A': FqName@58) = null
+    packageFragments('java.lang.B': FqName@59) = null
+    packageFragments('java.lang.Int': FqName@60) = null
+    packageFragments('java.lang.KExtensionFunction0': FqName@61) = null
+    packageFragments('java.lang.KExtensionFunction1': FqName@62) = null
+    packageFragments('java.lang.String': FqName@63) = null
+    packageFragments('java.lang.Unit': FqName@64) = null
+    packageFragments('kotlin': FqName@65) = LazyJavaPackageFragment@13['kotlin']
+    packageFragments('kotlin.A': FqName@66) = null
+    packageFragments('kotlin.B': FqName@67) = null
+    packageFragments('kotlin.Int': FqName@68) = null
+    packageFragments('kotlin.KExtensionFunction0': FqName@69) = null
+    packageFragments('kotlin.KExtensionFunction1': FqName@70) = null
+    packageFragments('kotlin.String': FqName@71) = null
+    packageFragments('kotlin.Unit': FqName@72) = null
+    packageFragments('kotlin.io': FqName@73) = LazyJavaPackageFragment@74['io']
+    packageFragments('kotlin.io.A': FqName@75) = null
+    packageFragments('kotlin.io.B': FqName@76) = null
+    packageFragments('kotlin.io.Int': FqName@77) = null
+    packageFragments('kotlin.io.KExtensionFunction0': FqName@78) = null
+    packageFragments('kotlin.io.KExtensionFunction1': FqName@79) = null
+    packageFragments('kotlin.io.String': FqName@80) = null
+    packageFragments('kotlin.io.Unit': FqName@81) = null
+    packageFragments('kotlin.jvm': FqName@82) = LazyJavaPackageFragment@83['jvm']
+    packageFragments('kotlin.jvm.A': FqName@84) = null
+    packageFragments('kotlin.jvm.B': FqName@85) = null
+    packageFragments('kotlin.jvm.Int': FqName@86) = null
+    packageFragments('kotlin.jvm.KExtensionFunction0': FqName@87) = null
+    packageFragments('kotlin.jvm.KExtensionFunction1': FqName@88) = null
+    packageFragments('kotlin.jvm.String': FqName@89) = null
+    packageFragments('kotlin.jvm.Unit': FqName@90) = null
+    packageFragments('kotlin.reflect': FqName@91) = LazyJavaPackageFragment@14['reflect']
+    packageFragments('kotlin.reflect.A': FqName@92) = null
+    packageFragments('kotlin.reflect.B': FqName@93) = null
+    packageFragments('kotlin.reflect.Int': FqName@94) = null
+    packageFragments('kotlin.reflect.KExtensionFunction0': FqName@95) = null
+    packageFragments('kotlin.reflect.KExtensionFunction1': FqName@96) = null
+    packageFragments('kotlin.reflect.String': FqName@97) = null
+    packageFragments('kotlin.reflect.Unit': FqName@98) = null
 }
 
 LazyJavaPackageFragment@46['<root>'] {
-    _functions('bar': Name@99) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    _functions('baz': Name@102) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    _functions('foo': Name@103) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    _functions('kotlin': Name@104) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('Int': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('KExtensionFunction0': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('KExtensionFunction1': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('String': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('Unit': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('baz': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('foo': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('kotlin': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    deserializedPackageScope = Empty@111 // through LazyPackageFragmentScopeForJavaPackage@101
-    memberIndex = computeMemberIndex$1@112 // through LazyPackageFragmentScopeForJavaPackage@101
+    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('KExtensionFunction0': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('KExtensionFunction1': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('Unit': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('kotlin': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('kotlin': Name@111) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    memberIndex = computeMemberIndex$1@112 // through LazyPackageFragmentScopeForJavaPackage@100
 }
 
 LazyJavaPackageFragment@74['io'] {
-    _functions('bar': Name@99) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    _functions('baz': Name@102) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    _functions('foo': Name@103) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Int': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('String': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Unit': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('baz': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('foo': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('Unit': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@113
     deserializedPackageScope = DeserializedPackageMemberScope@114 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('bar': Name@99) = EmptyList@100[empty] // through DeserializedPackageMemberScope@114
-    functions('baz': Name@102) = EmptyList@100[empty] // through DeserializedPackageMemberScope@114
-    functions('foo': Name@103) = EmptyList@100[empty] // through DeserializedPackageMemberScope@114
+    functions('bar': Name@105) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
+    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('baz': Name@106) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
+    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('foo': Name@107) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
+    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@113
     memberIndex = computeMemberIndex$1@115 // through LazyPackageFragmentScopeForJavaPackage@113
     membersProtos = HashMap@116 // through DeserializedPackageMemberScope@114
-    properties('bar': Name@99) = EmptyList@100[empty] // through DeserializedPackageMemberScope@114
-    properties('baz': Name@102) = EmptyList@100[empty] // through DeserializedPackageMemberScope@114
-    properties('foo': Name@103) = EmptyList@100[empty] // through DeserializedPackageMemberScope@114
-    properties('x': Name@117) = EmptyList@100[empty] // through DeserializedPackageMemberScope@114
-    properties('y': Name@118) = EmptyList@100[empty] // through DeserializedPackageMemberScope@114
-    properties('z': Name@119) = EmptyList@100[empty] // through DeserializedPackageMemberScope@114
+    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'] {
-    _functions('lang': Name@120) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('lang': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = Empty@111 // through LazyPackageFragmentScopeForJavaPackage@121
+    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
 }
 
 LazyJavaPackageFragment@83['jvm'] {
-    _functions('bar': Name@99) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    _functions('baz': Name@102) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    _functions('foo': Name@103) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('Int': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('String': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('Unit': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('baz': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('foo': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    deserializedPackageScope = Empty@111 // through LazyPackageFragmentScopeForJavaPackage@124
+    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
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    _functions('bar': Name@99) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    _functions('baz': Name@102) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    _functions('foo': Name@103) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    _functions('io': Name@127) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    _functions('jvm': Name@128) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    _functions('reflect': Name@129) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('Any': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('ExtensionFunction0': Name@131) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('ExtensionFunction1': Name@132) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('Int': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('String': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('Unit': Name@109) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('baz': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('foo': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('io': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('jvm': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('reflect': Name@135) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    deserializedPackageScope = DeserializedPackageMemberScope@136 // through LazyPackageFragmentScopeForJavaPackage@126
-    functions('bar': Name@99) = EmptyList@100[empty] // through DeserializedPackageMemberScope@136
-    functions('baz': Name@102) = EmptyList@100[empty] // through DeserializedPackageMemberScope@136
-    functions('foo': Name@103) = EmptyList@100[empty] // through DeserializedPackageMemberScope@136
-    functions('io': Name@127) = EmptyList@100[empty] // through DeserializedPackageMemberScope@136
-    functions('jvm': Name@128) = EmptyList@100[empty] // through DeserializedPackageMemberScope@136
-    functions('reflect': Name@129) = EmptyList@100[empty] // through DeserializedPackageMemberScope@136
-    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@126
-    membersProtos = HashMap@138 // through DeserializedPackageMemberScope@136
-    properties('bar': Name@99) = EmptyList@100[empty] // through DeserializedPackageMemberScope@136
-    properties('baz': Name@102) = EmptyList@100[empty] // through DeserializedPackageMemberScope@136
-    properties('foo': Name@103) = EmptyList@100[empty] // through DeserializedPackageMemberScope@136
-    properties('io': Name@127) = EmptyList@100[empty] // through DeserializedPackageMemberScope@136
-    properties('jvm': Name@128) = EmptyList@100[empty] // through DeserializedPackageMemberScope@136
-    properties('reflect': Name@129) = EmptyList@100[empty] // through DeserializedPackageMemberScope@136
-    properties('x': Name@117) = EmptyList@100[empty] // through DeserializedPackageMemberScope@136
-    properties('y': Name@118) = EmptyList@100[empty] // through DeserializedPackageMemberScope@136
-    properties('z': Name@119) = EmptyList@100[empty] // through DeserializedPackageMemberScope@136
+    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 = HashMap@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
 }
 
 LazyJavaPackageFragment@57['lang'] {
-    _functions('bar': Name@99) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    _functions('baz': Name@102) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    _functions('foo': Name@103) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('baz': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('foo': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    deserializedPackageScope = Empty@111 // through LazyPackageFragmentScopeForJavaPackage@139
+    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
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    _functions('bar': Name@99) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@141
-    _functions('baz': Name@102) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@141
-    _functions('foo': Name@103) = EmptyList@100[empty] // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('Int': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@141
+    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@108) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('Unit': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('baz': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('foo': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    deserializedPackageScope = Empty@111 // 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
 }
 

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

@@ -58,7 +58,7 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -68,7 +68,12 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,11 +83,6 @@ DeserializedType@30['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
 DeserializedType@37['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
 }
@@ -104,171 +104,171 @@ DeserializedType@42['kotlin.ExtensionFunction1'] {
 }
 
 LazyJavaPackageFragmentProvider@44 {
-    _packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
-    _packageFragments('A': FqName@47) = null
-    _packageFragments('Int': FqName@48) = null
-    _packageFragments('KExtensionFunction0': FqName@49) = null
-    _packageFragments('KExtensionFunction1': FqName@50) = null
-    _packageFragments('String': FqName@51) = null
-    _packageFragments('Unit': FqName@52) = null
-    _packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    _packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    _packageFragments('java.lang.A': FqName@57) = null
-    _packageFragments('java.lang.Int': FqName@58) = null
-    _packageFragments('java.lang.KExtensionFunction0': FqName@59) = null
-    _packageFragments('java.lang.KExtensionFunction1': FqName@60) = null
-    _packageFragments('java.lang.String': FqName@61) = null
-    _packageFragments('java.lang.Unit': FqName@62) = null
-    _packageFragments('kotlin': FqName@63) = LazyJavaPackageFragment@13['kotlin']
-    _packageFragments('kotlin.A': FqName@64) = null
-    _packageFragments('kotlin.Int': FqName@65) = null
-    _packageFragments('kotlin.KExtensionFunction0': FqName@66) = null
-    _packageFragments('kotlin.KExtensionFunction1': FqName@67) = null
-    _packageFragments('kotlin.String': FqName@68) = null
-    _packageFragments('kotlin.Unit': FqName@69) = null
-    _packageFragments('kotlin.io': FqName@70) = LazyJavaPackageFragment@71['io']
-    _packageFragments('kotlin.io.A': FqName@72) = null
-    _packageFragments('kotlin.io.Int': FqName@73) = null
-    _packageFragments('kotlin.io.KExtensionFunction0': FqName@74) = null
-    _packageFragments('kotlin.io.KExtensionFunction1': FqName@75) = null
-    _packageFragments('kotlin.io.String': FqName@76) = null
-    _packageFragments('kotlin.io.Unit': FqName@77) = null
-    _packageFragments('kotlin.jvm': FqName@78) = LazyJavaPackageFragment@79['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@80) = null
-    _packageFragments('kotlin.jvm.Int': FqName@81) = null
-    _packageFragments('kotlin.jvm.KExtensionFunction0': FqName@82) = null
-    _packageFragments('kotlin.jvm.KExtensionFunction1': FqName@83) = null
-    _packageFragments('kotlin.jvm.String': FqName@84) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@85) = null
-    _packageFragments('kotlin.reflect': FqName@86) = LazyJavaPackageFragment@14['reflect']
-    _packageFragments('kotlin.reflect.A': FqName@87) = null
-    _packageFragments('kotlin.reflect.Int': FqName@88) = null
-    _packageFragments('kotlin.reflect.KExtensionFunction0': FqName@89) = null
-    _packageFragments('kotlin.reflect.KExtensionFunction1': FqName@90) = null
-    _packageFragments('kotlin.reflect.String': FqName@91) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@92) = null
+    packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
+    packageFragments('A': FqName@47) = null
+    packageFragments('Int': FqName@48) = null
+    packageFragments('KExtensionFunction0': FqName@49) = null
+    packageFragments('KExtensionFunction1': FqName@50) = null
+    packageFragments('String': FqName@51) = null
+    packageFragments('Unit': FqName@52) = null
+    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
+    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
+    packageFragments('java.lang.A': FqName@57) = null
+    packageFragments('java.lang.Int': FqName@58) = null
+    packageFragments('java.lang.KExtensionFunction0': FqName@59) = null
+    packageFragments('java.lang.KExtensionFunction1': FqName@60) = null
+    packageFragments('java.lang.String': FqName@61) = null
+    packageFragments('java.lang.Unit': FqName@62) = null
+    packageFragments('kotlin': FqName@63) = LazyJavaPackageFragment@13['kotlin']
+    packageFragments('kotlin.A': FqName@64) = null
+    packageFragments('kotlin.Int': FqName@65) = null
+    packageFragments('kotlin.KExtensionFunction0': FqName@66) = null
+    packageFragments('kotlin.KExtensionFunction1': FqName@67) = null
+    packageFragments('kotlin.String': FqName@68) = null
+    packageFragments('kotlin.Unit': FqName@69) = null
+    packageFragments('kotlin.io': FqName@70) = LazyJavaPackageFragment@71['io']
+    packageFragments('kotlin.io.A': FqName@72) = null
+    packageFragments('kotlin.io.Int': FqName@73) = null
+    packageFragments('kotlin.io.KExtensionFunction0': FqName@74) = null
+    packageFragments('kotlin.io.KExtensionFunction1': FqName@75) = null
+    packageFragments('kotlin.io.String': FqName@76) = null
+    packageFragments('kotlin.io.Unit': FqName@77) = null
+    packageFragments('kotlin.jvm': FqName@78) = LazyJavaPackageFragment@79['jvm']
+    packageFragments('kotlin.jvm.A': FqName@80) = null
+    packageFragments('kotlin.jvm.Int': FqName@81) = null
+    packageFragments('kotlin.jvm.KExtensionFunction0': FqName@82) = null
+    packageFragments('kotlin.jvm.KExtensionFunction1': FqName@83) = null
+    packageFragments('kotlin.jvm.String': FqName@84) = null
+    packageFragments('kotlin.jvm.Unit': FqName@85) = null
+    packageFragments('kotlin.reflect': FqName@86) = LazyJavaPackageFragment@14['reflect']
+    packageFragments('kotlin.reflect.A': FqName@87) = null
+    packageFragments('kotlin.reflect.Int': FqName@88) = null
+    packageFragments('kotlin.reflect.KExtensionFunction0': FqName@89) = null
+    packageFragments('kotlin.reflect.KExtensionFunction1': FqName@90) = null
+    packageFragments('kotlin.reflect.String': FqName@91) = null
+    packageFragments('kotlin.reflect.Unit': FqName@92) = null
 }
 
 LazyJavaPackageFragment@46['<root>'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('kotlin': Name@98) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('KExtensionFunction0': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('KExtensionFunction1': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('kotlin': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('KExtensionFunction0': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('KExtensionFunction1': 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
 }
 
 LazyJavaPackageFragment@71['io'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    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@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    functions('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    functions('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
+    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 = HashMap@110 // through DeserializedPackageMemberScope@108
-    properties('bar': Name@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('foo': Name@97) = EmptyList@94[empty] // 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'] {
-    _functions('lang': Name@111) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('lang': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@112
+    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'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@115
+    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'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    _functions('io': Name@118) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    _functions('jvm': Name@119) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    _functions('reflect': Name@120) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('Any': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('ExtensionFunction0': Name@122) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('ExtensionFunction1': Name@123) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('Unit': Name@103) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('io': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('jvm': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('reflect': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    deserializedPackageScope = DeserializedPackageMemberScope@127 // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('bar': Name@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    functions('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    functions('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    functions('io': Name@118) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    functions('jvm': Name@119) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    functions('reflect': Name@120) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@117
-    membersProtos = HashMap@129 // through DeserializedPackageMemberScope@127
-    properties('bar': Name@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    properties('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    properties('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    properties('io': Name@118) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    properties('jvm': Name@119) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    properties('reflect': Name@120) = EmptyList@94[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 = HashMap@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'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@130
+    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'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    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@102) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    deserializedPackageScope = Empty@105 // 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
 }
 

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

@@ -4,105 +4,105 @@ DescriptorResolver@0 {
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('A': FqName@6) = null
-    _packageFragments('Int': FqName@7) = null
-    _packageFragments('String': FqName@8) = null
-    _packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    _packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    _packageFragments('java.lang.A': FqName@13) = null
-    _packageFragments('java.lang.Int': FqName@14) = null
-    _packageFragments('java.lang.String': FqName@15) = null
-    _packageFragments('kotlin': FqName@16) = LazyJavaPackageFragment@17['kotlin']
-    _packageFragments('kotlin.A': FqName@18) = null
-    _packageFragments('kotlin.Int': FqName@19) = null
-    _packageFragments('kotlin.String': FqName@20) = null
-    _packageFragments('kotlin.io': FqName@21) = LazyJavaPackageFragment@22['io']
-    _packageFragments('kotlin.io.A': FqName@23) = null
-    _packageFragments('kotlin.io.Int': FqName@24) = null
-    _packageFragments('kotlin.io.String': FqName@25) = null
-    _packageFragments('kotlin.jvm': FqName@26) = LazyJavaPackageFragment@27['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@28) = null
-    _packageFragments('kotlin.jvm.Int': FqName@29) = null
-    _packageFragments('kotlin.jvm.String': FqName@30) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('A': FqName@6) = null
+    packageFragments('Int': FqName@7) = null
+    packageFragments('String': FqName@8) = null
+    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
+    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
+    packageFragments('java.lang.A': FqName@13) = null
+    packageFragments('java.lang.Int': FqName@14) = null
+    packageFragments('java.lang.String': FqName@15) = null
+    packageFragments('kotlin': FqName@16) = LazyJavaPackageFragment@17['kotlin']
+    packageFragments('kotlin.A': FqName@18) = null
+    packageFragments('kotlin.Int': FqName@19) = null
+    packageFragments('kotlin.String': FqName@20) = null
+    packageFragments('kotlin.io': FqName@21) = LazyJavaPackageFragment@22['io']
+    packageFragments('kotlin.io.A': FqName@23) = null
+    packageFragments('kotlin.io.Int': FqName@24) = null
+    packageFragments('kotlin.io.String': FqName@25) = null
+    packageFragments('kotlin.jvm': FqName@26) = LazyJavaPackageFragment@27['jvm']
+    packageFragments('kotlin.jvm.A': FqName@28) = null
+    packageFragments('kotlin.jvm.Int': FqName@29) = null
+    packageFragments('kotlin.jvm.String': FqName@30) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('extA': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    _functions('extInt': Name@34) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('Int': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('String': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('extA': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('extInt': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('String': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('extA': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('extInt': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('extA': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('extInt': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@32
 }
 
 LazyJavaPackageFragment@22['io'] {
-    _functions('extA': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('extInt': Name@34) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Int': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('String': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('extA': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('extInt': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('String': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('extA': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('extInt': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@39
     deserializedPackageScope = DeserializedPackageMemberScope@40 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('extA': Name@31) = EmptyList@32[empty] // through DeserializedPackageMemberScope@40
-    functions('extInt': Name@34) = EmptyList@32[empty] // through DeserializedPackageMemberScope@40
+    functions('extA': Name@34) = EmptyList@37[empty] // through DeserializedPackageMemberScope@40
+    functions('extA': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('extInt': Name@35) = EmptyList@37[empty] // through DeserializedPackageMemberScope@40
+    functions('extInt': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@39
     memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
     membersProtos = HashMap@42 // through DeserializedPackageMemberScope@40
-    properties('extA': Name@31) = EmptyList@32[empty] // through DeserializedPackageMemberScope@40
-    properties('extInt': Name@34) = EmptyList@32[empty] // through DeserializedPackageMemberScope@40
-    properties('x': Name@43) = EmptyList@32[empty] // 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'] {
-    _functions('lang': Name@44) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('lang': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@45
+    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
 }
 
 LazyJavaPackageFragment@27['jvm'] {
-    _functions('extA': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    _functions('extInt': Name@34) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('Int': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('String': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('extA': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('extInt': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@48
+    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
 }
 
 LazyJavaPackageFragment@17['kotlin'] {
-    _functions('extA': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    _functions('extInt': Name@34) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    _functions('io': Name@51) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    _functions('jvm': Name@52) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('Int': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('String': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('extA': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('extInt': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('io': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('jvm': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = DeserializedPackageMemberScope@55 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('extA': Name@31) = EmptyList@32[empty] // through DeserializedPackageMemberScope@55
-    functions('extInt': Name@34) = EmptyList@32[empty] // through DeserializedPackageMemberScope@55
-    functions('io': Name@51) = EmptyList@32[empty] // through DeserializedPackageMemberScope@55
-    functions('jvm': Name@52) = EmptyList@32[empty] // through DeserializedPackageMemberScope@55
+    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 = HashMap@57 // through DeserializedPackageMemberScope@55
-    properties('extA': Name@31) = EmptyList@32[empty] // through DeserializedPackageMemberScope@55
-    properties('extInt': Name@34) = EmptyList@32[empty] // through DeserializedPackageMemberScope@55
-    properties('io': Name@51) = EmptyList@32[empty] // through DeserializedPackageMemberScope@55
-    properties('jvm': Name@52) = EmptyList@32[empty] // through DeserializedPackageMemberScope@55
-    properties('x': Name@43) = EmptyList@32[empty] // through DeserializedPackageMemberScope@55
+    membersProtos = HashMap@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
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    _functions('extA': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('extInt': Name@34) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('extA': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('extInt': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@58
+    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
 }

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

@@ -48,7 +48,7 @@ DeserializedTypeParameterDescriptor@26['T'] {
     upperBoundsAsType = DeserializedType@29['kotlin.Any']
 }
 
-DeserializedType@17['kotlin.Any'] {
+DeserializedType@21['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@30
     memberScope = DeserializedClassMemberScope@31
 }
@@ -58,7 +58,7 @@ DeserializedType@29['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@31
 }
 
-DeserializedType@21['kotlin.Any'] {
+DeserializedType@17['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@30
     memberScope = DeserializedClassMemberScope@31
 }
@@ -85,118 +85,118 @@ DeserializedType@36['kotlin.ExtensionFunction0'] {
 }
 
 LazyJavaPackageFragmentProvider@37 {
-    _packageFragments('<root>': FqName@38) = LazyJavaPackageFragment@39['<root>']
-    _packageFragments('A': FqName@40) = null
-    _packageFragments('KExtensionFunction0': FqName@41) = null
-    _packageFragments('KMemberFunction0': FqName@42) = null
-    _packageFragments('Unit': FqName@43) = null
-    _packageFragments('f': FqName@44) = null
-    _packageFragments('g': FqName@45) = null
-    _packageFragments('java': FqName@46) = LazyJavaPackageFragment@47['java']
-    _packageFragments('java.lang': FqName@48) = LazyJavaPackageFragment@49['lang']
-    _packageFragments('java.lang.A': FqName@50) = null
-    _packageFragments('java.lang.KExtensionFunction0': FqName@51) = null
-    _packageFragments('java.lang.KMemberFunction0': FqName@52) = null
-    _packageFragments('java.lang.Unit': FqName@53) = null
-    _packageFragments('kotlin': FqName@54) = LazyJavaPackageFragment@12['kotlin']
-    _packageFragments('kotlin.A': FqName@55) = null
-    _packageFragments('kotlin.KExtensionFunction0': FqName@56) = null
-    _packageFragments('kotlin.KMemberFunction0': FqName@57) = null
-    _packageFragments('kotlin.Unit': FqName@58) = null
-    _packageFragments('kotlin.io': FqName@59) = LazyJavaPackageFragment@60['io']
-    _packageFragments('kotlin.io.A': FqName@61) = null
-    _packageFragments('kotlin.io.KExtensionFunction0': FqName@62) = null
-    _packageFragments('kotlin.io.KMemberFunction0': FqName@63) = null
-    _packageFragments('kotlin.io.Unit': FqName@64) = null
-    _packageFragments('kotlin.jvm': FqName@65) = LazyJavaPackageFragment@66['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@67) = null
-    _packageFragments('kotlin.jvm.KExtensionFunction0': FqName@68) = null
-    _packageFragments('kotlin.jvm.KMemberFunction0': FqName@69) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@70) = null
-    _packageFragments('kotlin.reflect': FqName@71) = LazyJavaPackageFragment@13['reflect']
-    _packageFragments('kotlin.reflect.A': FqName@72) = null
-    _packageFragments('kotlin.reflect.KExtensionFunction0': FqName@73) = null
-    _packageFragments('kotlin.reflect.KMemberFunction0': FqName@74) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@75) = null
+    packageFragments('<root>': FqName@38) = LazyJavaPackageFragment@39['<root>']
+    packageFragments('A': FqName@40) = null
+    packageFragments('KExtensionFunction0': FqName@41) = null
+    packageFragments('KMemberFunction0': FqName@42) = null
+    packageFragments('Unit': FqName@43) = null
+    packageFragments('f': FqName@44) = null
+    packageFragments('g': FqName@45) = null
+    packageFragments('java': FqName@46) = LazyJavaPackageFragment@47['java']
+    packageFragments('java.lang': FqName@48) = LazyJavaPackageFragment@49['lang']
+    packageFragments('java.lang.A': FqName@50) = null
+    packageFragments('java.lang.KExtensionFunction0': FqName@51) = null
+    packageFragments('java.lang.KMemberFunction0': FqName@52) = null
+    packageFragments('java.lang.Unit': FqName@53) = null
+    packageFragments('kotlin': FqName@54) = LazyJavaPackageFragment@12['kotlin']
+    packageFragments('kotlin.A': FqName@55) = null
+    packageFragments('kotlin.KExtensionFunction0': FqName@56) = null
+    packageFragments('kotlin.KMemberFunction0': FqName@57) = null
+    packageFragments('kotlin.Unit': FqName@58) = null
+    packageFragments('kotlin.io': FqName@59) = LazyJavaPackageFragment@60['io']
+    packageFragments('kotlin.io.A': FqName@61) = null
+    packageFragments('kotlin.io.KExtensionFunction0': FqName@62) = null
+    packageFragments('kotlin.io.KMemberFunction0': FqName@63) = null
+    packageFragments('kotlin.io.Unit': FqName@64) = null
+    packageFragments('kotlin.jvm': FqName@65) = LazyJavaPackageFragment@66['jvm']
+    packageFragments('kotlin.jvm.A': FqName@67) = null
+    packageFragments('kotlin.jvm.KExtensionFunction0': FqName@68) = null
+    packageFragments('kotlin.jvm.KMemberFunction0': FqName@69) = null
+    packageFragments('kotlin.jvm.Unit': FqName@70) = null
+    packageFragments('kotlin.reflect': FqName@71) = LazyJavaPackageFragment@13['reflect']
+    packageFragments('kotlin.reflect.A': FqName@72) = null
+    packageFragments('kotlin.reflect.KExtensionFunction0': FqName@73) = null
+    packageFragments('kotlin.reflect.KMemberFunction0': FqName@74) = null
+    packageFragments('kotlin.reflect.Unit': FqName@75) = null
 }
 
 LazyJavaPackageFragment@39['<root>'] {
-    _functions('foo': Name@76) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    _functions('kotlin': Name@79) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('KExtensionFunction0': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('KMemberFunction0': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('Unit': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('kotlin': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('KExtensionFunction0': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('KMemberFunction0': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('Unit': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('kotlin': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('kotlin': Name@84) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@77
 }
 
 LazyJavaPackageFragment@60['io'] {
-    _functions('foo': Name@76) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('Unit': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('Unit': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@86
     deserializedPackageScope = DeserializedPackageMemberScope@87 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('foo': Name@76) = EmptyList@77[empty] // through DeserializedPackageMemberScope@87
+    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 = HashMap@89 // through DeserializedPackageMemberScope@87
-    properties('foo': Name@76) = EmptyList@77[empty] // through DeserializedPackageMemberScope@87
+    properties('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@87
 }
 
 LazyJavaPackageFragment@47['java'] {
-    _functions('lang': Name@90) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@91
+    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
 }
 
 LazyJavaPackageFragment@66['jvm'] {
-    _functions('foo': Name@76) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('Unit': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('Unit': 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
 }
 
 LazyJavaPackageFragment@12['kotlin'] {
-    _functions('foo': Name@76) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    _functions('io': Name@97) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    _functions('jvm': Name@98) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    _functions('reflect': Name@99) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('Any': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('ExtensionFunction0': Name@101) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('Unit': Name@82) = DeserializedClassDescriptor@8['Unit'] // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('io': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('jvm': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('reflect': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = DeserializedPackageMemberScope@105 // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('foo': Name@76) = EmptyList@77[empty] // through DeserializedPackageMemberScope@105
-    functions('io': Name@97) = EmptyList@77[empty] // through DeserializedPackageMemberScope@105
-    functions('jvm': Name@98) = EmptyList@77[empty] // through DeserializedPackageMemberScope@105
-    functions('reflect': Name@99) = EmptyList@77[empty] // through DeserializedPackageMemberScope@105
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@96
-    membersProtos = HashMap@107 // through DeserializedPackageMemberScope@105
-    properties('foo': Name@76) = EmptyList@77[empty] // through DeserializedPackageMemberScope@105
-    properties('io': Name@97) = EmptyList@77[empty] // through DeserializedPackageMemberScope@105
-    properties('jvm': Name@98) = EmptyList@77[empty] // through DeserializedPackageMemberScope@105
-    properties('reflect': Name@99) = EmptyList@77[empty] // through DeserializedPackageMemberScope@105
+    classes('Any': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('ExtensionFunction0': Name@98) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('Unit': Name@79) = DeserializedClassDescriptor@8['Unit'] // 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 = HashMap@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
 }
 
 LazyJavaPackageFragment@49['lang'] {
-    _functions('foo': Name@76) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = Empty@84 // 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
 }
 
 LazyJavaPackageFragment@13['reflect'] {
-    _functions('foo': Name@76) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('KExtensionFunction0': Name@80) = DeserializedClassDescriptor@4['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('KMemberFunction0': Name@81) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Unit': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('KExtensionFunction0': Name@76) = DeserializedClassDescriptor@4['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('KMemberFunction0': Name@78) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Unit': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@110
     memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@110
 }
 

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

@@ -41,116 +41,116 @@ DeserializedType@18['kotlin.ExtensionFunction0'] {
 }
 
 LazyJavaPackageFragmentProvider@20 {
-    _packageFragments('<root>': FqName@21) = LazyJavaPackageFragment@22['<root>']
-    _packageFragments('A': FqName@23) = null
-    _packageFragments('KMemberFunction0': FqName@24) = null
-    _packageFragments('String': FqName@25) = null
-    _packageFragments('T': FqName@26) = null
-    _packageFragments('java': FqName@27) = LazyJavaPackageFragment@28['java']
-    _packageFragments('java.lang': FqName@29) = LazyJavaPackageFragment@30['lang']
-    _packageFragments('java.lang.A': FqName@31) = null
-    _packageFragments('java.lang.KMemberFunction0': FqName@32) = null
-    _packageFragments('java.lang.String': FqName@33) = null
-    _packageFragments('java.lang.T': FqName@34) = null
-    _packageFragments('kotlin': FqName@35) = LazyJavaPackageFragment@5['kotlin']
-    _packageFragments('kotlin.A': FqName@36) = null
-    _packageFragments('kotlin.KMemberFunction0': FqName@37) = null
-    _packageFragments('kotlin.String': FqName@38) = null
-    _packageFragments('kotlin.T': FqName@39) = null
-    _packageFragments('kotlin.io': FqName@40) = LazyJavaPackageFragment@41['io']
-    _packageFragments('kotlin.io.A': FqName@42) = null
-    _packageFragments('kotlin.io.KMemberFunction0': FqName@43) = null
-    _packageFragments('kotlin.io.String': FqName@44) = null
-    _packageFragments('kotlin.io.T': FqName@45) = null
-    _packageFragments('kotlin.jvm': FqName@46) = LazyJavaPackageFragment@47['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@48) = null
-    _packageFragments('kotlin.jvm.KMemberFunction0': FqName@49) = null
-    _packageFragments('kotlin.jvm.String': FqName@50) = null
-    _packageFragments('kotlin.jvm.T': FqName@51) = null
-    _packageFragments('kotlin.reflect': FqName@52) = LazyJavaPackageFragment@6['reflect']
-    _packageFragments('kotlin.reflect.KMemberFunction0': FqName@53) = null
+    packageFragments('<root>': FqName@21) = LazyJavaPackageFragment@22['<root>']
+    packageFragments('A': FqName@23) = null
+    packageFragments('KMemberFunction0': FqName@24) = null
+    packageFragments('String': FqName@25) = null
+    packageFragments('T': FqName@26) = null
+    packageFragments('java': FqName@27) = LazyJavaPackageFragment@28['java']
+    packageFragments('java.lang': FqName@29) = LazyJavaPackageFragment@30['lang']
+    packageFragments('java.lang.A': FqName@31) = null
+    packageFragments('java.lang.KMemberFunction0': FqName@32) = null
+    packageFragments('java.lang.String': FqName@33) = null
+    packageFragments('java.lang.T': FqName@34) = null
+    packageFragments('kotlin': FqName@35) = LazyJavaPackageFragment@5['kotlin']
+    packageFragments('kotlin.A': FqName@36) = null
+    packageFragments('kotlin.KMemberFunction0': FqName@37) = null
+    packageFragments('kotlin.String': FqName@38) = null
+    packageFragments('kotlin.T': FqName@39) = null
+    packageFragments('kotlin.io': FqName@40) = LazyJavaPackageFragment@41['io']
+    packageFragments('kotlin.io.A': FqName@42) = null
+    packageFragments('kotlin.io.KMemberFunction0': FqName@43) = null
+    packageFragments('kotlin.io.String': FqName@44) = null
+    packageFragments('kotlin.io.T': FqName@45) = null
+    packageFragments('kotlin.jvm': FqName@46) = LazyJavaPackageFragment@47['jvm']
+    packageFragments('kotlin.jvm.A': FqName@48) = null
+    packageFragments('kotlin.jvm.KMemberFunction0': FqName@49) = null
+    packageFragments('kotlin.jvm.String': FqName@50) = null
+    packageFragments('kotlin.jvm.T': FqName@51) = null
+    packageFragments('kotlin.reflect': FqName@52) = LazyJavaPackageFragment@6['reflect']
+    packageFragments('kotlin.reflect.KMemberFunction0': FqName@53) = null
 }
 
 LazyJavaPackageFragment@22['<root>'] {
-    _functions('foo': Name@54) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    _functions('kotlin': Name@57) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('KMemberFunction0': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('String': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('kotlin': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('t': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@56
+    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
 }
 
 LazyJavaPackageFragment@41['io'] {
-    _functions('foo': Name@54) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('String': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('t': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    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@54) = EmptyList@55[empty] // through DeserializedPackageMemberScope@65
+    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 = HashMap@67 // through DeserializedPackageMemberScope@65
-    properties('foo': Name@54) = EmptyList@55[empty] // through DeserializedPackageMemberScope@65
-    properties('t': Name@61) = EmptyList@55[empty] // through DeserializedPackageMemberScope@65
+    properties('foo': Name@57) = EmptyList@61[empty] // through DeserializedPackageMemberScope@65
+    properties('t': Name@59) = EmptyList@61[empty] // through DeserializedPackageMemberScope@65
 }
 
 LazyJavaPackageFragment@28['java'] {
-    _functions('lang': Name@68) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@69
+    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
 }
 
 LazyJavaPackageFragment@47['jvm'] {
-    _functions('foo': Name@54) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('String': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('t': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@72
+    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
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    _functions('foo': Name@54) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    _functions('io': Name@75) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    _functions('jvm': Name@76) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    _functions('reflect': Name@77) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('Any': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('ExtensionFunction0': Name@79) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('String': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('io': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('jvm': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('reflect': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('t': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = DeserializedPackageMemberScope@83 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('foo': Name@54) = EmptyList@55[empty] // through DeserializedPackageMemberScope@83
-    functions('io': Name@75) = EmptyList@55[empty] // through DeserializedPackageMemberScope@83
-    functions('jvm': Name@76) = EmptyList@55[empty] // through DeserializedPackageMemberScope@83
-    functions('reflect': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@83
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@74
-    membersProtos = HashMap@85 // through DeserializedPackageMemberScope@83
-    properties('foo': Name@54) = EmptyList@55[empty] // through DeserializedPackageMemberScope@83
-    properties('io': Name@75) = EmptyList@55[empty] // through DeserializedPackageMemberScope@83
-    properties('jvm': Name@76) = EmptyList@55[empty] // through DeserializedPackageMemberScope@83
-    properties('reflect': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@83
-    properties('t': Name@61) = EmptyList@55[empty] // through DeserializedPackageMemberScope@83
+    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 = HashMap@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
 }
 
 LazyJavaPackageFragment@30['lang'] {
-    _functions('foo': Name@54) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('t': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@86
+    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
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    _functions('KMemberFunction0': Name@88) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('KMemberFunction0': Name@90) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@89
+    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
 }
 

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

@@ -1,67 +1,67 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('A': FqName@3) = null
-    _packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    _packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    _packageFragments('kotlin': FqName@8) = LazyJavaPackageFragment@9['kotlin']
-    _packageFragments('kotlin.io': FqName@10) = LazyJavaPackageFragment@11['io']
-    _packageFragments('kotlin.jvm': FqName@12) = LazyJavaPackageFragment@13['jvm']
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('A': FqName@3) = null
+    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
+    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
+    packageFragments('kotlin': FqName@8) = LazyJavaPackageFragment@9['kotlin']
+    packageFragments('kotlin.io': FqName@10) = LazyJavaPackageFragment@11['io']
+    packageFragments('kotlin.jvm': FqName@12) = LazyJavaPackageFragment@13['jvm']
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    _functions('A': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    _functions('Inner': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('A': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('Inner': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
+    classes('A': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
+    classes('Inner': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@15
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@15
+    functions('A': Name@14) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
+    functions('Inner': Name@19) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@15
 }
 
 LazyJavaPackageFragment@11['io'] {
-    _functions('Inner': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('Inner': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('Inner': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@21
     deserializedPackageScope = DeserializedPackageMemberScope@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('Inner': Name@17) = EmptyList@15[empty] // through DeserializedPackageMemberScope@22
+    functions('Inner': Name@19) = EmptyList@18[empty] // through DeserializedPackageMemberScope@22
+    functions('Inner': Name@19) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
     memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
     membersProtos = HashMap@24 // through DeserializedPackageMemberScope@22
-    properties('Inner': Name@17) = EmptyList@15[empty] // through DeserializedPackageMemberScope@22
+    properties('Inner': Name@19) = EmptyList@18[empty] // through DeserializedPackageMemberScope@22
 }
 
 LazyJavaPackageFragment@5['java'] {
-    _functions('lang': Name@25) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@13['jvm'] {
-    _functions('Inner': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('Inner': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('Inner': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('Inner': Name@19) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@29
     memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
 }
 
 LazyJavaPackageFragment@9['kotlin'] {
-    _functions('Inner': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    _functions('io': Name@32) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    _functions('jvm': Name@33) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('Inner': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('io': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('jvm': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = DeserializedPackageMemberScope@36 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('Inner': Name@17) = EmptyList@15[empty] // through DeserializedPackageMemberScope@36
-    functions('io': Name@32) = EmptyList@15[empty] // through DeserializedPackageMemberScope@36
-    functions('jvm': Name@33) = EmptyList@15[empty] // through DeserializedPackageMemberScope@36
+    classes('Inner': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('io': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('jvm': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = DeserializedPackageMemberScope@34 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('Inner': Name@19) = EmptyList@18[empty] // through DeserializedPackageMemberScope@34
+    functions('Inner': Name@19) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('io': Name@35) = EmptyList@18[empty] // through DeserializedPackageMemberScope@34
+    functions('io': Name@35) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('jvm': Name@36) = EmptyList@18[empty] // through DeserializedPackageMemberScope@34
+    functions('jvm': Name@36) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@31
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@31
-    membersProtos = HashMap@38 // through DeserializedPackageMemberScope@36
-    properties('Inner': Name@17) = EmptyList@15[empty] // through DeserializedPackageMemberScope@36
-    properties('io': Name@32) = EmptyList@15[empty] // through DeserializedPackageMemberScope@36
-    properties('jvm': Name@33) = EmptyList@15[empty] // through DeserializedPackageMemberScope@36
+    membersProtos = HashMap@38 // through DeserializedPackageMemberScope@34
+    properties('Inner': Name@19) = EmptyList@18[empty] // through DeserializedPackageMemberScope@34
+    properties('io': Name@35) = EmptyList@18[empty] // through DeserializedPackageMemberScope@34
+    properties('jvm': Name@36) = EmptyList@18[empty] // through DeserializedPackageMemberScope@34
 }
 
 LazyJavaPackageFragment@7['lang'] {
-    _functions('Inner': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Inner': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('Inner': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('Inner': Name@19) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@39
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
 }

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
 }
@@ -41,105 +41,105 @@ DeserializedType@18['kotlin.ExtensionFunction0'] {
 }
 
 LazyJavaPackageFragmentProvider@20 {
-    _packageFragments('<root>': FqName@21) = LazyJavaPackageFragment@22['<root>']
-    _packageFragments('A': FqName@23) = null
-    _packageFragments('B': FqName@24) = null
-    _packageFragments('Inner': FqName@25) = null
-    _packageFragments('KMemberFunction0': FqName@26) = null
-    _packageFragments('java': FqName@27) = LazyJavaPackageFragment@28['java']
-    _packageFragments('java.lang': FqName@29) = LazyJavaPackageFragment@30['lang']
-    _packageFragments('java.lang.A': FqName@31) = null
-    _packageFragments('java.lang.Inner': FqName@32) = null
-    _packageFragments('java.lang.KMemberFunction0': FqName@33) = null
-    _packageFragments('kotlin': FqName@34) = LazyJavaPackageFragment@5['kotlin']
-    _packageFragments('kotlin.A': FqName@35) = null
-    _packageFragments('kotlin.Inner': FqName@36) = null
-    _packageFragments('kotlin.KMemberFunction0': FqName@37) = null
-    _packageFragments('kotlin.io': FqName@38) = LazyJavaPackageFragment@39['io']
-    _packageFragments('kotlin.io.A': FqName@40) = null
-    _packageFragments('kotlin.io.Inner': FqName@41) = null
-    _packageFragments('kotlin.io.KMemberFunction0': FqName@42) = null
-    _packageFragments('kotlin.jvm': FqName@43) = LazyJavaPackageFragment@44['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@45) = null
-    _packageFragments('kotlin.jvm.Inner': FqName@46) = null
-    _packageFragments('kotlin.jvm.KMemberFunction0': FqName@47) = null
-    _packageFragments('kotlin.reflect': FqName@48) = LazyJavaPackageFragment@6['reflect']
-    _packageFragments('kotlin.reflect.KMemberFunction0': FqName@49) = null
+    packageFragments('<root>': FqName@21) = LazyJavaPackageFragment@22['<root>']
+    packageFragments('A': FqName@23) = null
+    packageFragments('B': FqName@24) = null
+    packageFragments('Inner': FqName@25) = null
+    packageFragments('KMemberFunction0': FqName@26) = null
+    packageFragments('java': FqName@27) = LazyJavaPackageFragment@28['java']
+    packageFragments('java.lang': FqName@29) = LazyJavaPackageFragment@30['lang']
+    packageFragments('java.lang.A': FqName@31) = null
+    packageFragments('java.lang.Inner': FqName@32) = null
+    packageFragments('java.lang.KMemberFunction0': FqName@33) = null
+    packageFragments('kotlin': FqName@34) = LazyJavaPackageFragment@5['kotlin']
+    packageFragments('kotlin.A': FqName@35) = null
+    packageFragments('kotlin.Inner': FqName@36) = null
+    packageFragments('kotlin.KMemberFunction0': FqName@37) = null
+    packageFragments('kotlin.io': FqName@38) = LazyJavaPackageFragment@39['io']
+    packageFragments('kotlin.io.A': FqName@40) = null
+    packageFragments('kotlin.io.Inner': FqName@41) = null
+    packageFragments('kotlin.io.KMemberFunction0': FqName@42) = null
+    packageFragments('kotlin.jvm': FqName@43) = LazyJavaPackageFragment@44['jvm']
+    packageFragments('kotlin.jvm.A': FqName@45) = null
+    packageFragments('kotlin.jvm.Inner': FqName@46) = null
+    packageFragments('kotlin.jvm.KMemberFunction0': FqName@47) = null
+    packageFragments('kotlin.reflect': FqName@48) = LazyJavaPackageFragment@6['reflect']
+    packageFragments('kotlin.reflect.KMemberFunction0': FqName@49) = null
 }
 
 LazyJavaPackageFragment@22['<root>'] {
-    _functions('Inner': Name@50) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    _functions('kotlin': Name@53) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('KMemberFunction0': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('kotlin': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('KMemberFunction0': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('kotlin': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('Inner': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('kotlin': Name@56) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@51
 }
 
 LazyJavaPackageFragment@39['io'] {
-    _functions('Inner': Name@50) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@58
     classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@58
     deserializedPackageScope = DeserializedPackageMemberScope@59 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('Inner': Name@50) = EmptyList@51[empty] // through DeserializedPackageMemberScope@59
+    functions('Inner': Name@50) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
+    functions('Inner': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@58
     memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@58
     membersProtos = HashMap@61 // through DeserializedPackageMemberScope@59
-    properties('Inner': Name@50) = EmptyList@51[empty] // through DeserializedPackageMemberScope@59
-    properties('x': Name@62) = EmptyList@51[empty] // through DeserializedPackageMemberScope@59
-    properties('y': Name@63) = EmptyList@51[empty] // 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'] {
-    _functions('lang': Name@64) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@65
+    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
 }
 
 LazyJavaPackageFragment@44['jvm'] {
-    _functions('Inner': Name@50) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@68
     classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@56 // 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
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    _functions('Inner': Name@50) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    _functions('io': Name@71) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    _functions('jvm': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    _functions('reflect': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('Any': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('ExtensionFunction0': Name@75) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('io': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('jvm': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('reflect': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = DeserializedPackageMemberScope@79 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('Inner': Name@50) = EmptyList@51[empty] // through DeserializedPackageMemberScope@79
-    functions('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@79
-    functions('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@79
-    functions('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@79
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@70
-    membersProtos = HashMap@81 // through DeserializedPackageMemberScope@79
-    properties('Inner': Name@50) = EmptyList@51[empty] // through DeserializedPackageMemberScope@79
-    properties('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@79
-    properties('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@79
-    properties('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@79
-    properties('x': Name@62) = EmptyList@51[empty] // through DeserializedPackageMemberScope@79
-    properties('y': Name@63) = EmptyList@51[empty] // through DeserializedPackageMemberScope@79
+    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 = HashMap@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
 }
 
 LazyJavaPackageFragment@30['lang'] {
-    _functions('Inner': Name@50) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@82
     classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@56 // 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
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    _functions('KMemberFunction0': Name@84) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('KMemberFunction0': Name@86) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@85
+    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
 }
 

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

@@ -41,108 +41,108 @@ DeserializedType@18['kotlin.ExtensionFunction0'] {
 }
 
 LazyJavaPackageFragmentProvider@20 {
-    _packageFragments('<root>': FqName@21) = LazyJavaPackageFragment@22['<root>']
-    _packageFragments('A': FqName@23) = null
-    _packageFragments('Int': FqName@24) = null
-    _packageFragments('KMemberFunction0': FqName@25) = null
-    _packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
-    _packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
-    _packageFragments('java.lang.A': FqName@30) = null
-    _packageFragments('java.lang.Int': FqName@31) = null
-    _packageFragments('java.lang.KMemberFunction0': FqName@32) = null
-    _packageFragments('kotlin': FqName@33) = LazyJavaPackageFragment@5['kotlin']
-    _packageFragments('kotlin.A': FqName@34) = null
-    _packageFragments('kotlin.Int': FqName@35) = null
-    _packageFragments('kotlin.KMemberFunction0': FqName@36) = null
-    _packageFragments('kotlin.io': FqName@37) = LazyJavaPackageFragment@38['io']
-    _packageFragments('kotlin.io.A': FqName@39) = null
-    _packageFragments('kotlin.io.Int': FqName@40) = null
-    _packageFragments('kotlin.io.KMemberFunction0': FqName@41) = null
-    _packageFragments('kotlin.jvm': FqName@42) = LazyJavaPackageFragment@43['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@44) = null
-    _packageFragments('kotlin.jvm.Int': FqName@45) = null
-    _packageFragments('kotlin.jvm.KMemberFunction0': FqName@46) = null
-    _packageFragments('kotlin.reflect': FqName@47) = LazyJavaPackageFragment@6['reflect']
-    _packageFragments('kotlin.reflect.KMemberFunction0': FqName@48) = null
+    packageFragments('<root>': FqName@21) = LazyJavaPackageFragment@22['<root>']
+    packageFragments('A': FqName@23) = null
+    packageFragments('Int': FqName@24) = null
+    packageFragments('KMemberFunction0': FqName@25) = null
+    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
+    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
+    packageFragments('java.lang.A': FqName@30) = null
+    packageFragments('java.lang.Int': FqName@31) = null
+    packageFragments('java.lang.KMemberFunction0': FqName@32) = null
+    packageFragments('kotlin': FqName@33) = LazyJavaPackageFragment@5['kotlin']
+    packageFragments('kotlin.A': FqName@34) = null
+    packageFragments('kotlin.Int': FqName@35) = null
+    packageFragments('kotlin.KMemberFunction0': FqName@36) = null
+    packageFragments('kotlin.io': FqName@37) = LazyJavaPackageFragment@38['io']
+    packageFragments('kotlin.io.A': FqName@39) = null
+    packageFragments('kotlin.io.Int': FqName@40) = null
+    packageFragments('kotlin.io.KMemberFunction0': FqName@41) = null
+    packageFragments('kotlin.jvm': FqName@42) = LazyJavaPackageFragment@43['jvm']
+    packageFragments('kotlin.jvm.A': FqName@44) = null
+    packageFragments('kotlin.jvm.Int': FqName@45) = null
+    packageFragments('kotlin.jvm.KMemberFunction0': FqName@46) = null
+    packageFragments('kotlin.reflect': FqName@47) = LazyJavaPackageFragment@6['reflect']
+    packageFragments('kotlin.reflect.KMemberFunction0': FqName@48) = null
 }
 
 LazyJavaPackageFragment@22['<root>'] {
-    _functions('Inner': Name@49) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    _functions('kotlin': Name@52) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('Int': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('KMemberFunction0': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('kotlin': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('KMemberFunction0': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('kotlin': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('Inner': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('kotlin': Name@56) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@50
 }
 
 LazyJavaPackageFragment@38['io'] {
-    _functions('Inner': Name@49) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@58
     classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('Int': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@58
     deserializedPackageScope = DeserializedPackageMemberScope@59 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('Inner': Name@49) = EmptyList@50[empty] // through DeserializedPackageMemberScope@59
+    functions('Inner': Name@49) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
+    functions('Inner': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@58
     memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@58
     membersProtos = HashMap@61 // through DeserializedPackageMemberScope@59
-    properties('Inner': Name@49) = EmptyList@50[empty] // through DeserializedPackageMemberScope@59
-    properties('x': Name@62) = EmptyList@50[empty] // through DeserializedPackageMemberScope@59
-    properties('y': Name@63) = EmptyList@50[empty] // 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'] {
-    _functions('lang': Name@64) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@65
+    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
 }
 
 LazyJavaPackageFragment@43['jvm'] {
-    _functions('Inner': Name@49) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@68
     classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('Int': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@56 // 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
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    _functions('Inner': Name@49) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    _functions('io': Name@71) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    _functions('jvm': Name@72) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    _functions('reflect': Name@73) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('Any': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('ExtensionFunction0': Name@75) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('Int': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('io': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('jvm': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('reflect': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = DeserializedPackageMemberScope@79 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('Inner': Name@49) = EmptyList@50[empty] // through DeserializedPackageMemberScope@79
-    functions('io': Name@71) = EmptyList@50[empty] // through DeserializedPackageMemberScope@79
-    functions('jvm': Name@72) = EmptyList@50[empty] // through DeserializedPackageMemberScope@79
-    functions('reflect': Name@73) = EmptyList@50[empty] // through DeserializedPackageMemberScope@79
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@70
-    membersProtos = HashMap@81 // through DeserializedPackageMemberScope@79
-    properties('Inner': Name@49) = EmptyList@50[empty] // through DeserializedPackageMemberScope@79
-    properties('io': Name@71) = EmptyList@50[empty] // through DeserializedPackageMemberScope@79
-    properties('jvm': Name@72) = EmptyList@50[empty] // through DeserializedPackageMemberScope@79
-    properties('reflect': Name@73) = EmptyList@50[empty] // through DeserializedPackageMemberScope@79
-    properties('x': Name@62) = EmptyList@50[empty] // through DeserializedPackageMemberScope@79
-    properties('y': Name@63) = EmptyList@50[empty] // through DeserializedPackageMemberScope@79
+    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 = HashMap@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
 }
 
 LazyJavaPackageFragment@29['lang'] {
-    _functions('Inner': Name@49) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@82
     classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@56 // 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
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    _functions('KMemberFunction0': Name@84) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('KMemberFunction0': Name@86) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@85
+    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
 }
 

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.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
 }
@@ -41,95 +41,95 @@ DeserializedType@18['kotlin.ExtensionFunction0'] {
 }
 
 LazyJavaPackageFragmentProvider@20 {
-    _packageFragments('<root>': FqName@21) = LazyJavaPackageFragment@22['<root>']
-    _packageFragments('A': FqName@23) = null
-    _packageFragments('KMemberFunction0': FqName@24) = null
-    _packageFragments('java': FqName@25) = LazyJavaPackageFragment@26['java']
-    _packageFragments('java.lang': FqName@27) = LazyJavaPackageFragment@28['lang']
-    _packageFragments('java.lang.A': FqName@29) = null
-    _packageFragments('java.lang.KMemberFunction0': FqName@30) = null
-    _packageFragments('kotlin': FqName@31) = LazyJavaPackageFragment@5['kotlin']
-    _packageFragments('kotlin.A': FqName@32) = null
-    _packageFragments('kotlin.KMemberFunction0': FqName@33) = null
-    _packageFragments('kotlin.io': FqName@34) = LazyJavaPackageFragment@35['io']
-    _packageFragments('kotlin.io.A': FqName@36) = null
-    _packageFragments('kotlin.io.KMemberFunction0': FqName@37) = null
-    _packageFragments('kotlin.jvm': FqName@38) = LazyJavaPackageFragment@39['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@40) = null
-    _packageFragments('kotlin.jvm.KMemberFunction0': FqName@41) = null
-    _packageFragments('kotlin.reflect': FqName@42) = LazyJavaPackageFragment@6['reflect']
-    _packageFragments('kotlin.reflect.KMemberFunction0': FqName@43) = null
+    packageFragments('<root>': FqName@21) = LazyJavaPackageFragment@22['<root>']
+    packageFragments('A': FqName@23) = null
+    packageFragments('KMemberFunction0': FqName@24) = null
+    packageFragments('java': FqName@25) = LazyJavaPackageFragment@26['java']
+    packageFragments('java.lang': FqName@27) = LazyJavaPackageFragment@28['lang']
+    packageFragments('java.lang.A': FqName@29) = null
+    packageFragments('java.lang.KMemberFunction0': FqName@30) = null
+    packageFragments('kotlin': FqName@31) = LazyJavaPackageFragment@5['kotlin']
+    packageFragments('kotlin.A': FqName@32) = null
+    packageFragments('kotlin.KMemberFunction0': FqName@33) = null
+    packageFragments('kotlin.io': FqName@34) = LazyJavaPackageFragment@35['io']
+    packageFragments('kotlin.io.A': FqName@36) = null
+    packageFragments('kotlin.io.KMemberFunction0': FqName@37) = null
+    packageFragments('kotlin.jvm': FqName@38) = LazyJavaPackageFragment@39['jvm']
+    packageFragments('kotlin.jvm.A': FqName@40) = null
+    packageFragments('kotlin.jvm.KMemberFunction0': FqName@41) = null
+    packageFragments('kotlin.reflect': FqName@42) = LazyJavaPackageFragment@6['reflect']
+    packageFragments('kotlin.reflect.KMemberFunction0': FqName@43) = null
 }
 
 LazyJavaPackageFragment@22['<root>'] {
-    _functions('Inner': Name@44) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    _functions('kotlin': Name@47) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('Inner': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('KMemberFunction0': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('kotlin': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('Inner': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('KMemberFunction0': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('kotlin': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('Inner': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('kotlin': Name@50) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@45
 }
 
 LazyJavaPackageFragment@35['io'] {
-    _functions('Inner': Name@44) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@52
     classes('Inner': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@52
     deserializedPackageScope = DeserializedPackageMemberScope@53 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('Inner': Name@44) = EmptyList@45[empty] // through DeserializedPackageMemberScope@53
+    functions('Inner': Name@44) = EmptyList@49[empty] // through DeserializedPackageMemberScope@53
+    functions('Inner': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@52
     memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@52
     membersProtos = HashMap@55 // through DeserializedPackageMemberScope@53
-    properties('Inner': Name@44) = EmptyList@45[empty] // through DeserializedPackageMemberScope@53
+    properties('Inner': Name@44) = EmptyList@49[empty] // through DeserializedPackageMemberScope@53
 }
 
 LazyJavaPackageFragment@26['java'] {
-    _functions('lang': Name@56) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@57
+    classes('lang': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@57
+    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@57
+    functions('lang': Name@58) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@57
     memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@57
 }
 
 LazyJavaPackageFragment@39['jvm'] {
-    _functions('Inner': Name@44) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@60
     classes('Inner': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@60
+    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@60
+    functions('Inner': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@60
     memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@60
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    _functions('Inner': Name@44) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    _functions('io': Name@63) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    _functions('jvm': Name@64) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    _functions('reflect': Name@65) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('Any': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('ExtensionFunction0': Name@67) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('Inner': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('io': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('jvm': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('reflect': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = DeserializedPackageMemberScope@71 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('Inner': Name@44) = EmptyList@45[empty] // through DeserializedPackageMemberScope@71
-    functions('io': Name@63) = EmptyList@45[empty] // through DeserializedPackageMemberScope@71
-    functions('jvm': Name@64) = EmptyList@45[empty] // through DeserializedPackageMemberScope@71
-    functions('reflect': Name@65) = EmptyList@45[empty] // through DeserializedPackageMemberScope@71
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@62
-    membersProtos = HashMap@73 // through DeserializedPackageMemberScope@71
-    properties('Inner': Name@44) = EmptyList@45[empty] // through DeserializedPackageMemberScope@71
-    properties('io': Name@63) = EmptyList@45[empty] // through DeserializedPackageMemberScope@71
-    properties('jvm': Name@64) = EmptyList@45[empty] // through DeserializedPackageMemberScope@71
-    properties('reflect': Name@65) = EmptyList@45[empty] // through DeserializedPackageMemberScope@71
+    classes('Any': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('ExtensionFunction0': Name@64) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('Inner': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('io': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('jvm': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('reflect': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    deserializedPackageScope = DeserializedPackageMemberScope@68 // through LazyPackageFragmentScopeForJavaPackage@63
+    functions('Inner': Name@44) = EmptyList@49[empty] // through DeserializedPackageMemberScope@68
+    functions('Inner': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@63
+    functions('io': Name@69) = EmptyList@49[empty] // through DeserializedPackageMemberScope@68
+    functions('io': Name@69) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@63
+    functions('jvm': Name@70) = EmptyList@49[empty] // through DeserializedPackageMemberScope@68
+    functions('jvm': Name@70) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@63
+    functions('reflect': Name@71) = EmptyList@49[empty] // through DeserializedPackageMemberScope@68
+    functions('reflect': Name@71) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@63
+    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@63
+    membersProtos = HashMap@73 // through DeserializedPackageMemberScope@68
+    properties('Inner': Name@44) = EmptyList@49[empty] // through DeserializedPackageMemberScope@68
+    properties('io': Name@69) = EmptyList@49[empty] // through DeserializedPackageMemberScope@68
+    properties('jvm': Name@70) = EmptyList@49[empty] // through DeserializedPackageMemberScope@68
+    properties('reflect': Name@71) = EmptyList@49[empty] // through DeserializedPackageMemberScope@68
 }
 
 LazyJavaPackageFragment@28['lang'] {
-    _functions('Inner': Name@44) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@74
     classes('Inner': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@74
+    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('Inner': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@74
     memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@74
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    _functions('KMemberFunction0': Name@76) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('KMemberFunction0': Name@78) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('KMemberFunction0': Name@76) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('KMemberFunction0': Name@78) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@77
     memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
 }
 

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

@@ -61,12 +61,12 @@ DeserializedType@39['R in kotlin.reflect.KFunction1'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@33
 }
 
-DeserializedType@35['kotlin.Any'] {
+DeserializedType@28['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@40
     memberScope = DeserializedClassMemberScope@41
 }
 
-DeserializedType@28['kotlin.Any'] {
+DeserializedType@35['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@40
     memberScope = DeserializedClassMemberScope@41
 }
@@ -90,184 +90,184 @@ DeserializedType@44['kotlin.Function1'] {
 }
 
 LazyJavaClassDescriptor@47['A'] {
-    _functionTypeForSamInterface = null
-    _functions('main': Name@48) = ArrayList@49[1] { JavaMethodDescriptor@50['main'] } // through LazyJavaStaticClassScope@51
-    _properties('main': Name@48) = EmptyList@52[empty] // through LazyJavaStaticClassScope@51
-    _typeConstructor = LazyJavaClassTypeConstructor@53['A']
-    enumEntryIndex = LinkedHashMap@54 // through LazyJavaClassMemberScope@55
-    memberIndex = computeMemberIndex$1@56 // through LazyJavaStaticClassScope@51
-    nestedClassIndex = LinkedHashMap@57 // through LazyJavaClassMemberScope@55
-    nestedClasses('main': Name@48) = null // through LazyJavaClassMemberScope@55
+    enumEntryIndex = LinkedHashMap@48 // through LazyJavaClassMemberScope@49
+    functionTypeForSamInterface = null
+    functions('main': Name@50) = ArrayList@51[1] { JavaMethodDescriptor@52['main'] } // through LazyJavaStaticClassScope@53
+    memberIndex = computeMemberIndex$1@54 // through LazyJavaStaticClassScope@53
+    nestedClassIndex = LinkedHashMap@55 // through LazyJavaClassMemberScope@49
+    nestedClasses('main': Name@50) = null // through LazyJavaClassMemberScope@49
+    properties('main': Name@50) = EmptyList@56[empty] // through LazyJavaStaticClassScope@53
+    typeConstructor = LazyJavaClassTypeConstructor@57['A']
 }
 
-LazyJavaClassTypeConstructor@53['A'] {
-    _parameters = ArrayList@58[empty]
+LazyJavaClassTypeConstructor@57['A'] {
+    parameters = ArrayList@58[empty]
 }
 
 LazyJavaClassifierType@59['String'] {
-    _arguments = ArrayList@60[empty]
-    _nullable = 'false': Boolean@61
-    _typeConstructor = DeserializedClassTypeConstructor@62
-    classifier = JavaClassImpl@63['String']
+    arguments = ArrayList@60[empty]
+    classifier = JavaClassImpl@61['String']
+    nullable = 'false': Boolean@62
+    typeConstructor = DeserializedClassTypeConstructor@63
 }
 
 LazyJavaClassifierType@64['String'] {
-    _arguments = ArrayList@65[empty]
-    _nullable = 'true': Boolean@66
-    _typeConstructor = DeserializedClassTypeConstructor@62
-    classifier = JavaClassImpl@63['String']
+    arguments = ArrayList@65[empty]
+    classifier = JavaClassImpl@61['String']
+    nullable = 'true': Boolean@66
+    typeConstructor = DeserializedClassTypeConstructor@63
 }
 
 LazyJavaPackageFragmentProvider@67 {
-    _packageFragments('<root>': FqName@68) = LazyJavaPackageFragment@69['<root>']
-    _packageFragments('A': FqName@70) = null
-    _packageFragments('Array': FqName@71) = null
-    _packageFragments('KFunction1': FqName@72) = null
-    _packageFragments('String': FqName@73) = null
-    _packageFragments('Unit': FqName@74) = null
-    _packageFragments('java': FqName@75) = LazyJavaPackageFragment@76['java']
-    _packageFragments('java.lang': FqName@77) = LazyJavaPackageFragment@78['lang']
-    _packageFragments('java.lang.A': FqName@79) = null
-    _packageFragments('java.lang.Array': FqName@80) = null
-    _packageFragments('java.lang.KFunction1': FqName@81) = null
-    _packageFragments('java.lang.String': FqName@82) = null
-    _packageFragments('java.lang.Unit': FqName@83) = null
-    _packageFragments('kotlin': FqName@84) = LazyJavaPackageFragment@7['kotlin']
-    _packageFragments('kotlin.A': FqName@85) = null
-    _packageFragments('kotlin.Array': FqName@86) = null
-    _packageFragments('kotlin.KFunction1': FqName@87) = null
-    _packageFragments('kotlin.String': FqName@88) = null
-    _packageFragments('kotlin.Unit': FqName@89) = null
-    _packageFragments('kotlin.io': FqName@90) = LazyJavaPackageFragment@91['io']
-    _packageFragments('kotlin.io.A': FqName@92) = null
-    _packageFragments('kotlin.io.Array': FqName@93) = null
-    _packageFragments('kotlin.io.KFunction1': FqName@94) = null
-    _packageFragments('kotlin.io.String': FqName@95) = null
-    _packageFragments('kotlin.io.Unit': FqName@96) = null
-    _packageFragments('kotlin.jvm': FqName@97) = LazyJavaPackageFragment@98['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@99) = null
-    _packageFragments('kotlin.jvm.Array': FqName@100) = null
-    _packageFragments('kotlin.jvm.KFunction1': FqName@101) = null
-    _packageFragments('kotlin.jvm.String': FqName@102) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@103) = null
-    _packageFragments('kotlin.reflect': FqName@104) = LazyJavaPackageFragment@15['reflect']
-    _packageFragments('kotlin.reflect.A': FqName@105) = null
-    _packageFragments('kotlin.reflect.Array': FqName@106) = null
-    _packageFragments('kotlin.reflect.KFunction1': FqName@107) = null
-    _packageFragments('kotlin.reflect.String': FqName@108) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@109) = null
-    _packageFragments('test': FqName@110) = LazyJavaPackageFragment@111['test']
-    _packageFragments('test.A': FqName@112) = null
+    packageFragments('<root>': FqName@68) = LazyJavaPackageFragment@69['<root>']
+    packageFragments('A': FqName@70) = null
+    packageFragments('Array': FqName@71) = null
+    packageFragments('KFunction1': FqName@72) = null
+    packageFragments('String': FqName@73) = null
+    packageFragments('Unit': FqName@74) = null
+    packageFragments('java': FqName@75) = LazyJavaPackageFragment@76['java']
+    packageFragments('java.lang': FqName@77) = LazyJavaPackageFragment@78['lang']
+    packageFragments('java.lang.A': FqName@79) = null
+    packageFragments('java.lang.Array': FqName@80) = null
+    packageFragments('java.lang.KFunction1': FqName@81) = null
+    packageFragments('java.lang.String': FqName@82) = null
+    packageFragments('java.lang.Unit': FqName@83) = null
+    packageFragments('kotlin': FqName@84) = LazyJavaPackageFragment@7['kotlin']
+    packageFragments('kotlin.A': FqName@85) = null
+    packageFragments('kotlin.Array': FqName@86) = null
+    packageFragments('kotlin.KFunction1': FqName@87) = null
+    packageFragments('kotlin.String': FqName@88) = null
+    packageFragments('kotlin.Unit': FqName@89) = null
+    packageFragments('kotlin.io': FqName@90) = LazyJavaPackageFragment@91['io']
+    packageFragments('kotlin.io.A': FqName@92) = null
+    packageFragments('kotlin.io.Array': FqName@93) = null
+    packageFragments('kotlin.io.KFunction1': FqName@94) = null
+    packageFragments('kotlin.io.String': FqName@95) = null
+    packageFragments('kotlin.io.Unit': FqName@96) = null
+    packageFragments('kotlin.jvm': FqName@97) = LazyJavaPackageFragment@98['jvm']
+    packageFragments('kotlin.jvm.A': FqName@99) = null
+    packageFragments('kotlin.jvm.Array': FqName@100) = null
+    packageFragments('kotlin.jvm.KFunction1': FqName@101) = null
+    packageFragments('kotlin.jvm.String': FqName@102) = null
+    packageFragments('kotlin.jvm.Unit': FqName@103) = null
+    packageFragments('kotlin.reflect': FqName@104) = LazyJavaPackageFragment@15['reflect']
+    packageFragments('kotlin.reflect.A': FqName@105) = null
+    packageFragments('kotlin.reflect.Array': FqName@106) = null
+    packageFragments('kotlin.reflect.KFunction1': FqName@107) = null
+    packageFragments('kotlin.reflect.String': FqName@108) = null
+    packageFragments('kotlin.reflect.Unit': FqName@109) = null
+    packageFragments('test': FqName@110) = LazyJavaPackageFragment@111['test']
+    packageFragments('test.A': FqName@112) = null
     topLevelClasses(JavaClassImpl@113['A']) = LazyJavaClassDescriptor@47['A']
 }
 
 LazyJavaPackageFragment@69['<root>'] {
-    _functions('invoke': Name@9) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    _functions('kotlin': Name@115) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    _functions('main2': Name@116) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    _functions('test': Name@117) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('A': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('Array': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('KFunction1': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('String': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('Unit': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('kotlin': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('main2': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('test': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@114
-    memberIndex = computeMemberIndex$1@126 // through LazyPackageFragmentScopeForJavaPackage@114
+    classes('A': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('Array': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('KFunction1': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('String': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('Unit': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('kotlin': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('main2': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('test': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('invoke': Name@9) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('kotlin': Name@124) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('main2': Name@121) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('test': Name@125) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    memberIndex = computeMemberIndex$1@126 // through LazyPackageFragmentScopeForJavaPackage@115
 }
 
 LazyJavaPackageFragment@91['io'] {
-    _functions('invoke': Name@9) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    _functions('main2': Name@116) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Array': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('String': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Unit': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('Array': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('String': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('Unit': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@127
     classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('main2': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('main2': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@127
     deserializedPackageScope = DeserializedPackageMemberScope@128 // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('invoke': Name@9) = EmptyList@52[empty] // through DeserializedPackageMemberScope@128
-    functions('main2': Name@116) = EmptyList@52[empty] // through DeserializedPackageMemberScope@128
+    functions('invoke': Name@9) = EmptyList@56[empty] // through DeserializedPackageMemberScope@128
+    functions('invoke': Name@9) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@127
+    functions('main2': Name@121) = EmptyList@56[empty] // through DeserializedPackageMemberScope@128
+    functions('main2': Name@121) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@127
     memberIndex = computeMemberIndex$1@129 // through LazyPackageFragmentScopeForJavaPackage@127
     membersProtos = HashMap@130 // through DeserializedPackageMemberScope@128
 }
 
 LazyJavaPackageFragment@76['java'] {
-    _functions('lang': Name@131) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('lang': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('lang': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('lang': Name@133) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@132
     memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@132
 }
 
 LazyJavaPackageFragment@98['jvm'] {
-    _functions('invoke': Name@9) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    _functions('main2': Name@116) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Array': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('String': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Unit': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('Array': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('String': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('Unit': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@135
     classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('main2': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('main2': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@135
+    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@135
+    functions('invoke': Name@9) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@135
+    functions('main2': Name@121) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@135
     memberIndex = computeMemberIndex$1@136 // through LazyPackageFragmentScopeForJavaPackage@135
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    _functions('invoke': Name@9) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@137
-    _functions('io': Name@138) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@137
-    _functions('jvm': Name@139) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@137
-    _functions('main2': Name@116) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@137
-    _functions('reflect': Name@140) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('Any': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('Array': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('Function1': Name@142) = DeserializedClassDescriptor@2['Function1'] // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('String': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('Unit': Name@122) = DeserializedClassDescriptor@6['Unit'] // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('io': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('jvm': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('main2': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('reflect': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    deserializedPackageScope = DeserializedPackageMemberScope@146 // through LazyPackageFragmentScopeForJavaPackage@137
-    functions('invoke': Name@9) = EmptyList@52[empty] // through DeserializedPackageMemberScope@146
-    functions('io': Name@138) = EmptyList@52[empty] // through DeserializedPackageMemberScope@146
-    functions('jvm': Name@139) = EmptyList@52[empty] // through DeserializedPackageMemberScope@146
-    functions('main2': Name@116) = EmptyList@52[empty] // through DeserializedPackageMemberScope@146
-    functions('reflect': Name@140) = EmptyList@52[empty] // through DeserializedPackageMemberScope@146
-    memberIndex = computeMemberIndex$1@147 // through LazyPackageFragmentScopeForJavaPackage@137
-    membersProtos = HashMap@148 // through DeserializedPackageMemberScope@146
-    properties('io': Name@138) = EmptyList@52[empty] // through DeserializedPackageMemberScope@146
-    properties('jvm': Name@139) = EmptyList@52[empty] // through DeserializedPackageMemberScope@146
-    properties('reflect': Name@140) = EmptyList@52[empty] // through DeserializedPackageMemberScope@146
+    classes('Any': Name@137) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('Array': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('Function1': Name@139) = DeserializedClassDescriptor@2['Function1'] // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('String': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('Unit': Name@119) = DeserializedClassDescriptor@6['Unit'] // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('io': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('jvm': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('main2': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('reflect': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    deserializedPackageScope = DeserializedPackageMemberScope@143 // through LazyPackageFragmentScopeForJavaPackage@138
+    functions('invoke': Name@9) = EmptyList@56[empty] // through DeserializedPackageMemberScope@143
+    functions('invoke': Name@9) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@138
+    functions('io': Name@144) = EmptyList@56[empty] // through DeserializedPackageMemberScope@143
+    functions('io': Name@144) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@138
+    functions('jvm': Name@145) = EmptyList@56[empty] // through DeserializedPackageMemberScope@143
+    functions('jvm': Name@145) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@138
+    functions('main2': Name@121) = EmptyList@56[empty] // through DeserializedPackageMemberScope@143
+    functions('main2': Name@121) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@138
+    functions('reflect': Name@146) = EmptyList@56[empty] // through DeserializedPackageMemberScope@143
+    functions('reflect': Name@146) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@138
+    memberIndex = computeMemberIndex$1@147 // through LazyPackageFragmentScopeForJavaPackage@138
+    membersProtos = HashMap@148 // through DeserializedPackageMemberScope@143
+    properties('io': Name@144) = EmptyList@56[empty] // through DeserializedPackageMemberScope@143
+    properties('jvm': Name@145) = EmptyList@56[empty] // through DeserializedPackageMemberScope@143
+    properties('reflect': Name@146) = EmptyList@56[empty] // through DeserializedPackageMemberScope@143
 }
 
 LazyJavaPackageFragment@78['lang'] {
-    _functions('invoke': Name@9) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    _functions('main2': Name@116) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@149
     classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('main2': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('main2': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('invoke': Name@9) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('main2': Name@121) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@149
     memberIndex = computeMemberIndex$1@150 // through LazyPackageFragmentScopeForJavaPackage@149
 }
 
 LazyJavaPackageFragment@15['reflect'] {
-    _functions('invoke': Name@9) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    _functions('main2': Name@116) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('Array': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@151
+    classes('Array': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@151
     classes('KFunction1': Name@152) = DeserializedClassDescriptor@4['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('String': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('Unit': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@151
+    classes('String': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@151
+    classes('Unit': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@151
     classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('main2': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@151
+    classes('main2': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@151
+    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@151
+    functions('invoke': Name@9) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@151
+    functions('main2': Name@121) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@151
     memberIndex = computeMemberIndex$1@153 // through LazyPackageFragmentScopeForJavaPackage@151
 }
 
 LazyJavaPackageFragment@111['test'] {
-    _functions('A': Name@154) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@155
-    classes('A': Name@156) = LazyJavaClassDescriptor@47['A'] // through LazyPackageFragmentScopeForJavaPackage@155
-    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@155
+    classes('A': Name@154) = LazyJavaClassDescriptor@47['A'] // through LazyPackageFragmentScopeForJavaPackage@155
+    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@155
+    functions('A': Name@156) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@155
     memberIndex = computeMemberIndex$1@157 // through LazyPackageFragmentScopeForJavaPackage@155
 }
 

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

@@ -6,28 +6,28 @@ DescriptorResolver@0 {
 }
 
 LazyJavaPackageFragmentProvider@5 {
-    _packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    _packageFragments('A': FqName@8) = null
-    _packageFragments('Any': FqName@9) = null
-    _packageFragments('T': FqName@10) = null
-    _packageFragments('U': FqName@11) = null
-    _packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    _packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    _packageFragments('java.lang.Any': FqName@16) = null
-    _packageFragments('java.lang.T': FqName@17) = null
-    _packageFragments('java.lang.U': FqName@18) = null
-    _packageFragments('kotlin': FqName@19) = LazyJavaPackageFragment@20['kotlin']
-    _packageFragments('kotlin.Any': FqName@21) = null
-    _packageFragments('kotlin.T': FqName@22) = null
-    _packageFragments('kotlin.U': FqName@23) = null
-    _packageFragments('kotlin.io': FqName@24) = LazyJavaPackageFragment@25['io']
-    _packageFragments('kotlin.io.Any': FqName@26) = null
-    _packageFragments('kotlin.io.T': FqName@27) = null
-    _packageFragments('kotlin.io.U': FqName@28) = null
-    _packageFragments('kotlin.jvm': FqName@29) = LazyJavaPackageFragment@30['jvm']
-    _packageFragments('kotlin.jvm.Any': FqName@31) = null
-    _packageFragments('kotlin.jvm.T': FqName@32) = null
-    _packageFragments('kotlin.jvm.U': FqName@33) = null
+    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
+    packageFragments('A': FqName@8) = null
+    packageFragments('Any': FqName@9) = null
+    packageFragments('T': FqName@10) = null
+    packageFragments('U': FqName@11) = null
+    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
+    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
+    packageFragments('java.lang.Any': FqName@16) = null
+    packageFragments('java.lang.T': FqName@17) = null
+    packageFragments('java.lang.U': FqName@18) = null
+    packageFragments('kotlin': FqName@19) = LazyJavaPackageFragment@20['kotlin']
+    packageFragments('kotlin.Any': FqName@21) = null
+    packageFragments('kotlin.T': FqName@22) = null
+    packageFragments('kotlin.U': FqName@23) = null
+    packageFragments('kotlin.io': FqName@24) = LazyJavaPackageFragment@25['io']
+    packageFragments('kotlin.io.Any': FqName@26) = null
+    packageFragments('kotlin.io.T': FqName@27) = null
+    packageFragments('kotlin.io.U': FqName@28) = null
+    packageFragments('kotlin.jvm': FqName@29) = LazyJavaPackageFragment@30['jvm']
+    packageFragments('kotlin.jvm.Any': FqName@31) = null
+    packageFragments('kotlin.jvm.T': FqName@32) = null
+    packageFragments('kotlin.jvm.U': FqName@33) = null
 }
 
 LazyJavaPackageFragment@7['<root>'] {
@@ -39,10 +39,10 @@ LazyJavaPackageFragment@25['io'] {
 }
 
 LazyJavaPackageFragment@13['java'] {
-    _functions('lang': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('lang': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
 }
 
 LazyJavaPackageFragment@30['jvm'] {
@@ -50,16 +50,16 @@ LazyJavaPackageFragment@30['jvm'] {
 }
 
 LazyJavaPackageFragment@20['kotlin'] {
-    _functions('io': Name@44) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    _functions('jvm': Name@46) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('Any': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('io': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('jvm': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = DeserializedPackageMemberScope@49 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('io': Name@44) = EmptyList@38[empty] // through DeserializedPackageMemberScope@49
-    functions('jvm': Name@46) = EmptyList@38[empty] // through DeserializedPackageMemberScope@49
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@45
-    membersProtos = HashMap@51 // through DeserializedPackageMemberScope@49
-    properties('io': Name@44) = EmptyList@38[empty] // through DeserializedPackageMemberScope@49
-    properties('jvm': Name@46) = EmptyList@38[empty] // through DeserializedPackageMemberScope@49
+    classes('Any': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('io': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('jvm': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = DeserializedPackageMemberScope@47 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('io': Name@48) = EmptyList@41[empty] // through DeserializedPackageMemberScope@47
+    functions('io': Name@48) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('jvm': Name@49) = EmptyList@41[empty] // through DeserializedPackageMemberScope@47
+    functions('jvm': Name@49) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@44
+    membersProtos = HashMap@51 // through DeserializedPackageMemberScope@47
+    properties('io': Name@48) = EmptyList@41[empty] // through DeserializedPackageMemberScope@47
+    properties('jvm': Name@49) = EmptyList@41[empty] // through DeserializedPackageMemberScope@47
 }

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

@@ -30,95 +30,95 @@ DeserializedType@14['kotlin.Function0'] {
 }
 
 LazyJavaPackageFragmentProvider@16 {
-    _packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    _packageFragments('A': FqName@19) = null
-    _packageFragments('KFunction0': FqName@20) = null
-    _packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
-    _packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
-    _packageFragments('java.lang.A': FqName@25) = null
-    _packageFragments('java.lang.KFunction0': FqName@26) = null
-    _packageFragments('kotlin': FqName@27) = LazyJavaPackageFragment@5['kotlin']
-    _packageFragments('kotlin.A': FqName@28) = null
-    _packageFragments('kotlin.KFunction0': FqName@29) = null
-    _packageFragments('kotlin.io': FqName@30) = LazyJavaPackageFragment@31['io']
-    _packageFragments('kotlin.io.A': FqName@32) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@33) = null
-    _packageFragments('kotlin.jvm': FqName@34) = LazyJavaPackageFragment@35['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@36) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@37) = null
-    _packageFragments('kotlin.reflect': FqName@38) = LazyJavaPackageFragment@6['reflect']
-    _packageFragments('kotlin.reflect.KFunction0': FqName@39) = null
+    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
+    packageFragments('A': FqName@19) = null
+    packageFragments('KFunction0': FqName@20) = null
+    packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
+    packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
+    packageFragments('java.lang.A': FqName@25) = null
+    packageFragments('java.lang.KFunction0': FqName@26) = null
+    packageFragments('kotlin': FqName@27) = LazyJavaPackageFragment@5['kotlin']
+    packageFragments('kotlin.A': FqName@28) = null
+    packageFragments('kotlin.KFunction0': FqName@29) = null
+    packageFragments('kotlin.io': FqName@30) = LazyJavaPackageFragment@31['io']
+    packageFragments('kotlin.io.A': FqName@32) = null
+    packageFragments('kotlin.io.KFunction0': FqName@33) = null
+    packageFragments('kotlin.jvm': FqName@34) = LazyJavaPackageFragment@35['jvm']
+    packageFragments('kotlin.jvm.A': FqName@36) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@37) = null
+    packageFragments('kotlin.reflect': FqName@38) = LazyJavaPackageFragment@6['reflect']
+    packageFragments('kotlin.reflect.KFunction0': FqName@39) = null
 }
 
 LazyJavaPackageFragment@18['<root>'] {
-    _functions('A': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    _functions('kotlin': Name@43) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('KFunction0': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('kotlin': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('KFunction0': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('kotlin': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('kotlin': Name@46) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@41
 }
 
 LazyJavaPackageFragment@31['io'] {
-    _functions('A': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
     classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@48
     deserializedPackageScope = DeserializedPackageMemberScope@49 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('A': Name@40) = EmptyList@41[empty] // through DeserializedPackageMemberScope@49
+    functions('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@49
+    functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
     memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
     membersProtos = HashMap@51 // through DeserializedPackageMemberScope@49
-    properties('A': Name@40) = EmptyList@41[empty] // through DeserializedPackageMemberScope@49
+    properties('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@49
 }
 
 LazyJavaPackageFragment@22['java'] {
-    _functions('lang': Name@52) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('lang': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@53
+    classes('lang': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
+    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@53
+    functions('lang': Name@54) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@53
     memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@53
 }
 
 LazyJavaPackageFragment@35['jvm'] {
-    _functions('A': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@56
     classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@56
+    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@56
     memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    _functions('A': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('io': Name@59) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('jvm': Name@60) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('reflect': Name@61) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@58
     classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('Any': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('Function0': Name@63) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('io': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('jvm': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('reflect': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = DeserializedPackageMemberScope@67 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('A': Name@40) = EmptyList@41[empty] // through DeserializedPackageMemberScope@67
-    functions('io': Name@59) = EmptyList@41[empty] // through DeserializedPackageMemberScope@67
-    functions('jvm': Name@60) = EmptyList@41[empty] // through DeserializedPackageMemberScope@67
-    functions('reflect': Name@61) = EmptyList@41[empty] // through DeserializedPackageMemberScope@67
+    classes('Any': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('Function0': Name@60) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('io': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('jvm': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('reflect': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    deserializedPackageScope = DeserializedPackageMemberScope@64 // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
+    functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('io': Name@65) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
+    functions('io': Name@65) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('jvm': Name@66) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
+    functions('jvm': Name@66) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('reflect': Name@67) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
+    functions('reflect': Name@67) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@58
     memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@58
-    membersProtos = HashMap@69 // through DeserializedPackageMemberScope@67
-    properties('A': Name@40) = EmptyList@41[empty] // through DeserializedPackageMemberScope@67
-    properties('io': Name@59) = EmptyList@41[empty] // through DeserializedPackageMemberScope@67
-    properties('jvm': Name@60) = EmptyList@41[empty] // through DeserializedPackageMemberScope@67
-    properties('reflect': Name@61) = EmptyList@41[empty] // through DeserializedPackageMemberScope@67
+    membersProtos = HashMap@69 // through DeserializedPackageMemberScope@64
+    properties('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
+    properties('io': Name@65) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
+    properties('jvm': Name@66) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
+    properties('reflect': Name@67) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
 }
 
 LazyJavaPackageFragment@24['lang'] {
-    _functions('A': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@70
     classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@70
+    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@70
     memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    _functions('KFunction0': Name@72) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('KFunction0': Name@74) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('KFunction0': Name@72) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@73
+    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('KFunction0': Name@74) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@73
     memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 

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

@@ -30,106 +30,106 @@ DeserializedType@14['kotlin.Function0'] {
 }
 
 LazyJavaPackageFragmentProvider@16 {
-    _packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    _packageFragments('A': FqName@19) = null
-    _packageFragments('Int': FqName@20) = null
-    _packageFragments('KFunction0': FqName@21) = null
-    _packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    _packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    _packageFragments('java.lang.A': FqName@26) = null
-    _packageFragments('java.lang.Int': FqName@27) = null
-    _packageFragments('java.lang.KFunction0': FqName@28) = null
-    _packageFragments('kotlin': FqName@29) = LazyJavaPackageFragment@5['kotlin']
-    _packageFragments('kotlin.A': FqName@30) = null
-    _packageFragments('kotlin.Int': FqName@31) = null
-    _packageFragments('kotlin.KFunction0': FqName@32) = null
-    _packageFragments('kotlin.io': FqName@33) = LazyJavaPackageFragment@34['io']
-    _packageFragments('kotlin.io.A': FqName@35) = null
-    _packageFragments('kotlin.io.Int': FqName@36) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@37) = null
-    _packageFragments('kotlin.jvm': FqName@38) = LazyJavaPackageFragment@39['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@40) = null
-    _packageFragments('kotlin.jvm.Int': FqName@41) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@42) = null
-    _packageFragments('kotlin.reflect': FqName@43) = LazyJavaPackageFragment@6['reflect']
-    _packageFragments('kotlin.reflect.KFunction0': FqName@44) = null
+    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
+    packageFragments('A': FqName@19) = null
+    packageFragments('Int': FqName@20) = null
+    packageFragments('KFunction0': FqName@21) = null
+    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
+    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
+    packageFragments('java.lang.A': FqName@26) = null
+    packageFragments('java.lang.Int': FqName@27) = null
+    packageFragments('java.lang.KFunction0': FqName@28) = null
+    packageFragments('kotlin': FqName@29) = LazyJavaPackageFragment@5['kotlin']
+    packageFragments('kotlin.A': FqName@30) = null
+    packageFragments('kotlin.Int': FqName@31) = null
+    packageFragments('kotlin.KFunction0': FqName@32) = null
+    packageFragments('kotlin.io': FqName@33) = LazyJavaPackageFragment@34['io']
+    packageFragments('kotlin.io.A': FqName@35) = null
+    packageFragments('kotlin.io.Int': FqName@36) = null
+    packageFragments('kotlin.io.KFunction0': FqName@37) = null
+    packageFragments('kotlin.jvm': FqName@38) = LazyJavaPackageFragment@39['jvm']
+    packageFragments('kotlin.jvm.A': FqName@40) = null
+    packageFragments('kotlin.jvm.Int': FqName@41) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@42) = null
+    packageFragments('kotlin.reflect': FqName@43) = LazyJavaPackageFragment@6['reflect']
+    packageFragments('kotlin.reflect.KFunction0': FqName@44) = null
 }
 
 LazyJavaPackageFragment@18['<root>'] {
-    _functions('A': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    _functions('kotlin': Name@48) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('Int': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('KFunction0': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('kotlin': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('KFunction0': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('kotlin': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('kotlin': Name@52) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@46
 }
 
 LazyJavaPackageFragment@34['io'] {
-    _functions('A': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@54
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('Int': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@54
     deserializedPackageScope = DeserializedPackageMemberScope@55 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('A': Name@45) = EmptyList@46[empty] // through DeserializedPackageMemberScope@55
+    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
     memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
     membersProtos = HashMap@57 // through DeserializedPackageMemberScope@55
-    properties('A': Name@45) = EmptyList@46[empty] // through DeserializedPackageMemberScope@55
-    properties('x': Name@58) = EmptyList@46[empty] // 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'] {
-    _functions('lang': Name@59) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('lang': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@60
+    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
 }
 
 LazyJavaPackageFragment@39['jvm'] {
-    _functions('A': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@63
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('Int': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@52 // 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
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    _functions('A': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    _functions('io': Name@66) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    _functions('jvm': Name@67) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    _functions('reflect': Name@68) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@65
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Any': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Function0': Name@70) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Int': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('io': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('jvm': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('reflect': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = DeserializedPackageMemberScope@74 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('A': Name@45) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    functions('io': Name@66) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    functions('jvm': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    functions('reflect': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
+    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 = HashMap@76 // through DeserializedPackageMemberScope@74
-    properties('A': Name@45) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    properties('io': Name@66) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    properties('jvm': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    properties('reflect': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    properties('x': Name@58) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
+    membersProtos = HashMap@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
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    _functions('A': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@77
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@52 // 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
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    _functions('KFunction0': Name@79) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('KFunction0': Name@81) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@80
+    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
 }
 

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

@@ -34,102 +34,102 @@ DeserializedType@16['kotlin.Function0'] {
 }
 
 LazyJavaPackageFragmentProvider@18 {
-    _packageFragments('<root>': FqName@19) = LazyJavaPackageFragment@20['<root>']
-    _packageFragments('A': FqName@21) = null
-    _packageFragments('KFunction0': FqName@22) = null
-    _packageFragments('java': FqName@23) = LazyJavaPackageFragment@24['java']
-    _packageFragments('java.lang': FqName@25) = LazyJavaPackageFragment@26['lang']
-    _packageFragments('java.lang.A': FqName@27) = null
-    _packageFragments('java.lang.KFunction0': FqName@28) = null
-    _packageFragments('kotlin': FqName@29) = LazyJavaPackageFragment@7['kotlin']
-    _packageFragments('kotlin.A': FqName@30) = null
-    _packageFragments('kotlin.KFunction0': FqName@31) = null
-    _packageFragments('kotlin.io': FqName@32) = LazyJavaPackageFragment@33['io']
-    _packageFragments('kotlin.io.A': FqName@34) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@35) = null
-    _packageFragments('kotlin.jvm': FqName@36) = LazyJavaPackageFragment@37['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@38) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@39) = null
-    _packageFragments('kotlin.reflect': FqName@40) = LazyJavaPackageFragment@8['reflect']
-    _packageFragments('kotlin.reflect.KFunction0': FqName@41) = null
+    packageFragments('<root>': FqName@19) = LazyJavaPackageFragment@20['<root>']
+    packageFragments('A': FqName@21) = null
+    packageFragments('KFunction0': FqName@22) = null
+    packageFragments('java': FqName@23) = LazyJavaPackageFragment@24['java']
+    packageFragments('java.lang': FqName@25) = LazyJavaPackageFragment@26['lang']
+    packageFragments('java.lang.A': FqName@27) = null
+    packageFragments('java.lang.KFunction0': FqName@28) = null
+    packageFragments('kotlin': FqName@29) = LazyJavaPackageFragment@7['kotlin']
+    packageFragments('kotlin.A': FqName@30) = null
+    packageFragments('kotlin.KFunction0': FqName@31) = null
+    packageFragments('kotlin.io': FqName@32) = LazyJavaPackageFragment@33['io']
+    packageFragments('kotlin.io.A': FqName@34) = null
+    packageFragments('kotlin.io.KFunction0': FqName@35) = null
+    packageFragments('kotlin.jvm': FqName@36) = LazyJavaPackageFragment@37['jvm']
+    packageFragments('kotlin.jvm.A': FqName@38) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@39) = null
+    packageFragments('kotlin.reflect': FqName@40) = LazyJavaPackageFragment@8['reflect']
+    packageFragments('kotlin.reflect.KFunction0': FqName@41) = null
 }
 
 LazyJavaPackageFragment@20['<root>'] {
-    _functions('A': Name@42) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    _functions('kotlin': Name@45) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('A': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('KFunction0': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('kotlin': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('x': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@49 // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('A': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('KFunction0': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('kotlin': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('x': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('A': Name@42) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('kotlin': Name@49) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@43
 }
 
 LazyJavaPackageFragment@33['io'] {
-    _functions('A': Name@42) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@51
     classes('A': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('x': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('x': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@51
     deserializedPackageScope = DeserializedPackageMemberScope@52 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('A': Name@42) = EmptyList@43[empty] // through DeserializedPackageMemberScope@52
+    functions('A': Name@42) = EmptyList@48[empty] // through DeserializedPackageMemberScope@52
+    functions('A': Name@42) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
     memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@51
     membersProtos = HashMap@54 // through DeserializedPackageMemberScope@52
-    properties('A': Name@42) = EmptyList@43[empty] // through DeserializedPackageMemberScope@52
-    properties('x': Name@48) = EmptyList@43[empty] // through DeserializedPackageMemberScope@52
+    properties('A': Name@42) = EmptyList@48[empty] // through DeserializedPackageMemberScope@52
+    properties('x': Name@46) = EmptyList@48[empty] // through DeserializedPackageMemberScope@52
 }
 
 LazyJavaPackageFragment@24['java'] {
-    _functions('lang': Name@55) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('lang': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@49 // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('lang': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('lang': Name@57) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@56
     memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@56
 }
 
 LazyJavaPackageFragment@37['jvm'] {
-    _functions('A': Name@42) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@59
     classes('A': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('x': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@49 // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('x': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('A': Name@42) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@59
     memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    _functions('A': Name@42) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    _functions('io': Name@62) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    _functions('jvm': Name@63) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    _functions('reflect': Name@64) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@61
     classes('A': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('Function0': Name@66) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('io': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('reflect': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('x': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('A': Name@42) = EmptyList@43[empty] // through DeserializedPackageMemberScope@70
-    functions('io': Name@62) = EmptyList@43[empty] // through DeserializedPackageMemberScope@70
-    functions('jvm': Name@63) = EmptyList@43[empty] // through DeserializedPackageMemberScope@70
-    functions('reflect': Name@64) = EmptyList@43[empty] // through DeserializedPackageMemberScope@70
+    classes('Any': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('Function0': Name@63) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('io': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('jvm': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('reflect': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('x': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    deserializedPackageScope = DeserializedPackageMemberScope@67 // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('A': Name@42) = EmptyList@48[empty] // through DeserializedPackageMemberScope@67
+    functions('A': Name@42) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('io': Name@68) = EmptyList@48[empty] // through DeserializedPackageMemberScope@67
+    functions('io': Name@68) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('jvm': Name@69) = EmptyList@48[empty] // through DeserializedPackageMemberScope@67
+    functions('jvm': Name@69) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('reflect': Name@70) = EmptyList@48[empty] // through DeserializedPackageMemberScope@67
+    functions('reflect': Name@70) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@61
     memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@61
-    membersProtos = HashMap@72 // through DeserializedPackageMemberScope@70
-    properties('A': Name@42) = EmptyList@43[empty] // through DeserializedPackageMemberScope@70
-    properties('io': Name@62) = EmptyList@43[empty] // through DeserializedPackageMemberScope@70
-    properties('jvm': Name@63) = EmptyList@43[empty] // through DeserializedPackageMemberScope@70
-    properties('reflect': Name@64) = EmptyList@43[empty] // through DeserializedPackageMemberScope@70
-    properties('x': Name@48) = EmptyList@43[empty] // through DeserializedPackageMemberScope@70
+    membersProtos = HashMap@72 // through DeserializedPackageMemberScope@67
+    properties('A': Name@42) = EmptyList@48[empty] // through DeserializedPackageMemberScope@67
+    properties('io': Name@68) = EmptyList@48[empty] // through DeserializedPackageMemberScope@67
+    properties('jvm': Name@69) = EmptyList@48[empty] // through DeserializedPackageMemberScope@67
+    properties('reflect': Name@70) = EmptyList@48[empty] // through DeserializedPackageMemberScope@67
+    properties('x': Name@46) = EmptyList@48[empty] // through DeserializedPackageMemberScope@67
 }
 
 LazyJavaPackageFragment@26['lang'] {
-    _functions('A': Name@42) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@73
     classes('A': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('x': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@49 // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('x': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('A': Name@42) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@73
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
 LazyJavaPackageFragment@8['reflect'] {
-    _functions('KFunction0': Name@75) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('KFunction0': Name@77) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@49 // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('KFunction0': Name@75) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('KFunction0': Name@77) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@76
     memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 

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

@@ -30,106 +30,106 @@ DeserializedType@14['kotlin.Function0'] {
 }
 
 LazyJavaPackageFragmentProvider@16 {
-    _packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    _packageFragments('A': FqName@19) = null
-    _packageFragments('Int': FqName@20) = null
-    _packageFragments('KFunction0': FqName@21) = null
-    _packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    _packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    _packageFragments('java.lang.A': FqName@26) = null
-    _packageFragments('java.lang.Int': FqName@27) = null
-    _packageFragments('java.lang.KFunction0': FqName@28) = null
-    _packageFragments('kotlin': FqName@29) = LazyJavaPackageFragment@5['kotlin']
-    _packageFragments('kotlin.A': FqName@30) = null
-    _packageFragments('kotlin.Int': FqName@31) = null
-    _packageFragments('kotlin.KFunction0': FqName@32) = null
-    _packageFragments('kotlin.io': FqName@33) = LazyJavaPackageFragment@34['io']
-    _packageFragments('kotlin.io.A': FqName@35) = null
-    _packageFragments('kotlin.io.Int': FqName@36) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@37) = null
-    _packageFragments('kotlin.jvm': FqName@38) = LazyJavaPackageFragment@39['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@40) = null
-    _packageFragments('kotlin.jvm.Int': FqName@41) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@42) = null
-    _packageFragments('kotlin.reflect': FqName@43) = LazyJavaPackageFragment@6['reflect']
-    _packageFragments('kotlin.reflect.KFunction0': FqName@44) = null
+    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
+    packageFragments('A': FqName@19) = null
+    packageFragments('Int': FqName@20) = null
+    packageFragments('KFunction0': FqName@21) = null
+    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
+    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
+    packageFragments('java.lang.A': FqName@26) = null
+    packageFragments('java.lang.Int': FqName@27) = null
+    packageFragments('java.lang.KFunction0': FqName@28) = null
+    packageFragments('kotlin': FqName@29) = LazyJavaPackageFragment@5['kotlin']
+    packageFragments('kotlin.A': FqName@30) = null
+    packageFragments('kotlin.Int': FqName@31) = null
+    packageFragments('kotlin.KFunction0': FqName@32) = null
+    packageFragments('kotlin.io': FqName@33) = LazyJavaPackageFragment@34['io']
+    packageFragments('kotlin.io.A': FqName@35) = null
+    packageFragments('kotlin.io.Int': FqName@36) = null
+    packageFragments('kotlin.io.KFunction0': FqName@37) = null
+    packageFragments('kotlin.jvm': FqName@38) = LazyJavaPackageFragment@39['jvm']
+    packageFragments('kotlin.jvm.A': FqName@40) = null
+    packageFragments('kotlin.jvm.Int': FqName@41) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@42) = null
+    packageFragments('kotlin.reflect': FqName@43) = LazyJavaPackageFragment@6['reflect']
+    packageFragments('kotlin.reflect.KFunction0': FqName@44) = null
 }
 
 LazyJavaPackageFragment@18['<root>'] {
-    _functions('A': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    _functions('kotlin': Name@48) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('Int': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('KFunction0': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('kotlin': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('KFunction0': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('kotlin': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('kotlin': Name@52) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@46
 }
 
 LazyJavaPackageFragment@34['io'] {
-    _functions('A': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@54
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('Int': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@54
     deserializedPackageScope = DeserializedPackageMemberScope@55 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('A': Name@45) = EmptyList@46[empty] // through DeserializedPackageMemberScope@55
+    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
     memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
     membersProtos = HashMap@57 // through DeserializedPackageMemberScope@55
-    properties('A': Name@45) = EmptyList@46[empty] // through DeserializedPackageMemberScope@55
-    properties('x': Name@58) = EmptyList@46[empty] // 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'] {
-    _functions('lang': Name@59) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('lang': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@60
+    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
 }
 
 LazyJavaPackageFragment@39['jvm'] {
-    _functions('A': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@63
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('Int': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@52 // 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
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    _functions('A': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    _functions('io': Name@66) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    _functions('jvm': Name@67) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    _functions('reflect': Name@68) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@65
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Any': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Function0': Name@70) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Int': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('io': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('jvm': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('reflect': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = DeserializedPackageMemberScope@74 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('A': Name@45) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    functions('io': Name@66) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    functions('jvm': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    functions('reflect': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
+    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 = HashMap@76 // through DeserializedPackageMemberScope@74
-    properties('A': Name@45) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    properties('io': Name@66) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    properties('jvm': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    properties('reflect': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    properties('x': Name@58) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
+    membersProtos = HashMap@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
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    _functions('A': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@77
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@52 // 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
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    _functions('KFunction0': Name@79) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('KFunction0': Name@81) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@80
+    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
 }
 

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

@@ -46,6 +46,11 @@ DeserializedTypeParameterDescriptor@23['R'] {
     upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
 }
 
+DeserializedType@18['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@27
+    memberScope = DeserializedClassMemberScope@28
+}
+
 DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
@@ -56,11 +61,6 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
 DeserializedType@29['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
 }
@@ -82,165 +82,165 @@ DeserializedType@34['kotlin.Function1'] {
 }
 
 LazyJavaPackageFragmentProvider@36 {
-    _packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
-    _packageFragments('Int': FqName@39) = null
-    _packageFragments('KFunction0': FqName@40) = null
-    _packageFragments('KFunction1': FqName@41) = null
-    _packageFragments('String': FqName@42) = null
-    _packageFragments('Unit': FqName@43) = null
-    _packageFragments('java': FqName@44) = LazyJavaPackageFragment@45['java']
-    _packageFragments('java.lang': FqName@46) = LazyJavaPackageFragment@47['lang']
-    _packageFragments('java.lang.Int': FqName@48) = null
-    _packageFragments('java.lang.KFunction0': FqName@49) = null
-    _packageFragments('java.lang.KFunction1': FqName@50) = null
-    _packageFragments('java.lang.String': FqName@51) = null
-    _packageFragments('java.lang.Unit': FqName@52) = null
-    _packageFragments('kotlin': FqName@53) = LazyJavaPackageFragment@13['kotlin']
-    _packageFragments('kotlin.Int': FqName@54) = null
-    _packageFragments('kotlin.KFunction0': FqName@55) = null
-    _packageFragments('kotlin.KFunction1': FqName@56) = null
-    _packageFragments('kotlin.String': FqName@57) = null
-    _packageFragments('kotlin.Unit': FqName@58) = null
-    _packageFragments('kotlin.io': FqName@59) = LazyJavaPackageFragment@60['io']
-    _packageFragments('kotlin.io.Int': FqName@61) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@62) = null
-    _packageFragments('kotlin.io.KFunction1': FqName@63) = null
-    _packageFragments('kotlin.io.String': FqName@64) = null
-    _packageFragments('kotlin.io.Unit': FqName@65) = null
-    _packageFragments('kotlin.jvm': FqName@66) = LazyJavaPackageFragment@67['jvm']
-    _packageFragments('kotlin.jvm.Int': FqName@68) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@69) = null
-    _packageFragments('kotlin.jvm.KFunction1': FqName@70) = null
-    _packageFragments('kotlin.jvm.String': FqName@71) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@72) = null
-    _packageFragments('kotlin.reflect': FqName@73) = LazyJavaPackageFragment@14['reflect']
-    _packageFragments('kotlin.reflect.Int': FqName@74) = null
-    _packageFragments('kotlin.reflect.KFunction0': FqName@75) = null
-    _packageFragments('kotlin.reflect.KFunction1': FqName@76) = null
-    _packageFragments('kotlin.reflect.String': FqName@77) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@78) = null
+    packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
+    packageFragments('Int': FqName@39) = null
+    packageFragments('KFunction0': FqName@40) = null
+    packageFragments('KFunction1': FqName@41) = null
+    packageFragments('String': FqName@42) = null
+    packageFragments('Unit': FqName@43) = null
+    packageFragments('java': FqName@44) = LazyJavaPackageFragment@45['java']
+    packageFragments('java.lang': FqName@46) = LazyJavaPackageFragment@47['lang']
+    packageFragments('java.lang.Int': FqName@48) = null
+    packageFragments('java.lang.KFunction0': FqName@49) = null
+    packageFragments('java.lang.KFunction1': FqName@50) = null
+    packageFragments('java.lang.String': FqName@51) = null
+    packageFragments('java.lang.Unit': FqName@52) = null
+    packageFragments('kotlin': FqName@53) = LazyJavaPackageFragment@13['kotlin']
+    packageFragments('kotlin.Int': FqName@54) = null
+    packageFragments('kotlin.KFunction0': FqName@55) = null
+    packageFragments('kotlin.KFunction1': FqName@56) = null
+    packageFragments('kotlin.String': FqName@57) = null
+    packageFragments('kotlin.Unit': FqName@58) = null
+    packageFragments('kotlin.io': FqName@59) = LazyJavaPackageFragment@60['io']
+    packageFragments('kotlin.io.Int': FqName@61) = null
+    packageFragments('kotlin.io.KFunction0': FqName@62) = null
+    packageFragments('kotlin.io.KFunction1': FqName@63) = null
+    packageFragments('kotlin.io.String': FqName@64) = null
+    packageFragments('kotlin.io.Unit': FqName@65) = null
+    packageFragments('kotlin.jvm': FqName@66) = LazyJavaPackageFragment@67['jvm']
+    packageFragments('kotlin.jvm.Int': FqName@68) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@69) = null
+    packageFragments('kotlin.jvm.KFunction1': FqName@70) = null
+    packageFragments('kotlin.jvm.String': FqName@71) = null
+    packageFragments('kotlin.jvm.Unit': FqName@72) = null
+    packageFragments('kotlin.reflect': FqName@73) = LazyJavaPackageFragment@14['reflect']
+    packageFragments('kotlin.reflect.Int': FqName@74) = null
+    packageFragments('kotlin.reflect.KFunction0': FqName@75) = null
+    packageFragments('kotlin.reflect.KFunction1': FqName@76) = null
+    packageFragments('kotlin.reflect.String': FqName@77) = null
+    packageFragments('kotlin.reflect.Unit': FqName@78) = null
 }
 
 LazyJavaPackageFragment@38['<root>'] {
-    _functions('bar': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    _functions('baz': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    _functions('foo': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    _functions('kotlin': Name@84) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('KFunction0': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('KFunction1': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('Unit': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('bar': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('baz': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('kotlin': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('KFunction0': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('KFunction1': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('String': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('Unit': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('kotlin': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('kotlin': Name@91) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@80
 }
 
 LazyJavaPackageFragment@60['io'] {
-    _functions('bar': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    _functions('baz': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    _functions('foo': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('Unit': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('bar': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('baz': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('String': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('Unit': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@93
     deserializedPackageScope = DeserializedPackageMemberScope@94 // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('bar': Name@79) = EmptyList@80[empty] // through DeserializedPackageMemberScope@94
-    functions('baz': Name@82) = EmptyList@80[empty] // through DeserializedPackageMemberScope@94
-    functions('foo': Name@83) = EmptyList@80[empty] // through DeserializedPackageMemberScope@94
+    functions('bar': Name@85) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
+    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@93
+    functions('baz': Name@86) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
+    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@93
+    functions('foo': Name@87) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
+    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@93
     memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
     membersProtos = HashMap@96 // through DeserializedPackageMemberScope@94
-    properties('bar': Name@79) = EmptyList@80[empty] // through DeserializedPackageMemberScope@94
-    properties('baz': Name@82) = EmptyList@80[empty] // through DeserializedPackageMemberScope@94
-    properties('foo': Name@83) = EmptyList@80[empty] // through DeserializedPackageMemberScope@94
+    properties('bar': Name@85) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
+    properties('baz': Name@86) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
+    properties('foo': Name@87) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
 }
 
 LazyJavaPackageFragment@45['java'] {
-    _functions('lang': Name@97) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@98
+    classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
+    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@98
+    functions('lang': Name@99) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@98
     memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@98
 }
 
 LazyJavaPackageFragment@67['jvm'] {
-    _functions('bar': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    _functions('baz': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    _functions('foo': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('Unit': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('bar': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('baz': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@101
+    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@101
+    classes('String': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@101
+    classes('Unit': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@101
+    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@101
+    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@101
+    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@101
+    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@101
+    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@101
+    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@101
+    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@101
     memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@101
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    _functions('bar': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    _functions('baz': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    _functions('foo': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    _functions('io': Name@104) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    _functions('jvm': Name@105) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    _functions('reflect': Name@106) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('Any': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('Function0': Name@108) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('Function1': Name@109) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('Unit': Name@89) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('bar': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('baz': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('io': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('jvm': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('reflect': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    deserializedPackageScope = DeserializedPackageMemberScope@113 // through LazyPackageFragmentScopeForJavaPackage@103
-    functions('bar': Name@79) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    functions('baz': Name@82) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    functions('foo': Name@83) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    functions('io': Name@104) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    functions('jvm': Name@105) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    functions('reflect': Name@106) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@103
-    membersProtos = HashMap@115 // through DeserializedPackageMemberScope@113
-    properties('bar': Name@79) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    properties('baz': Name@82) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    properties('foo': Name@83) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    properties('io': Name@104) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    properties('jvm': Name@105) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    properties('reflect': Name@106) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
+    classes('Any': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('Function0': Name@105) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('Function1': Name@106) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('String': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('Unit': Name@84) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('io': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('jvm': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('reflect': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    deserializedPackageScope = DeserializedPackageMemberScope@110 // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('bar': Name@85) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('baz': Name@86) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('foo': Name@87) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('io': Name@111) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    functions('io': Name@111) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('jvm': Name@112) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    functions('jvm': Name@112) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('reflect': Name@113) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    functions('reflect': Name@113) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@104
+    membersProtos = HashMap@115 // through DeserializedPackageMemberScope@110
+    properties('bar': Name@85) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    properties('baz': Name@86) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    properties('foo': Name@87) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    properties('io': Name@111) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    properties('jvm': Name@112) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    properties('reflect': Name@113) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
 }
 
 LazyJavaPackageFragment@47['lang'] {
-    _functions('bar': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    _functions('baz': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    _functions('foo': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('bar': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('baz': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@116
     memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@116
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    _functions('bar': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    _functions('baz': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    _functions('foo': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@118
     classes('KFunction0': Name@119) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@118
     classes('KFunction1': Name@120) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('String': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Unit': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@118
     memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@118
 }
 

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

@@ -46,7 +46,7 @@ DeserializedTypeParameterDescriptor@23['R'] {
     upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -56,7 +56,7 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -82,177 +82,177 @@ DeserializedType@34['kotlin.Function1'] {
 }
 
 LazyJavaPackageFragmentProvider@36 {
-    _packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
-    _packageFragments('A': FqName@39) = null
-    _packageFragments('Int': FqName@40) = null
-    _packageFragments('KFunction0': FqName@41) = null
-    _packageFragments('KFunction1': FqName@42) = null
-    _packageFragments('String': FqName@43) = null
-    _packageFragments('Unit': FqName@44) = null
-    _packageFragments('java': FqName@45) = LazyJavaPackageFragment@46['java']
-    _packageFragments('java.lang': FqName@47) = LazyJavaPackageFragment@48['lang']
-    _packageFragments('java.lang.A': FqName@49) = null
-    _packageFragments('java.lang.Int': FqName@50) = null
-    _packageFragments('java.lang.KFunction0': FqName@51) = null
-    _packageFragments('java.lang.KFunction1': FqName@52) = null
-    _packageFragments('java.lang.String': FqName@53) = null
-    _packageFragments('java.lang.Unit': FqName@54) = null
-    _packageFragments('kotlin': FqName@55) = LazyJavaPackageFragment@13['kotlin']
-    _packageFragments('kotlin.A': FqName@56) = null
-    _packageFragments('kotlin.Int': FqName@57) = null
-    _packageFragments('kotlin.KFunction0': FqName@58) = null
-    _packageFragments('kotlin.KFunction1': FqName@59) = null
-    _packageFragments('kotlin.String': FqName@60) = null
-    _packageFragments('kotlin.Unit': FqName@61) = null
-    _packageFragments('kotlin.io': FqName@62) = LazyJavaPackageFragment@63['io']
-    _packageFragments('kotlin.io.A': FqName@64) = null
-    _packageFragments('kotlin.io.Int': FqName@65) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@66) = null
-    _packageFragments('kotlin.io.KFunction1': FqName@67) = null
-    _packageFragments('kotlin.io.String': FqName@68) = null
-    _packageFragments('kotlin.io.Unit': FqName@69) = null
-    _packageFragments('kotlin.jvm': FqName@70) = LazyJavaPackageFragment@71['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@72) = null
-    _packageFragments('kotlin.jvm.Int': FqName@73) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@74) = null
-    _packageFragments('kotlin.jvm.KFunction1': FqName@75) = null
-    _packageFragments('kotlin.jvm.String': FqName@76) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@77) = null
-    _packageFragments('kotlin.reflect': FqName@78) = LazyJavaPackageFragment@14['reflect']
-    _packageFragments('kotlin.reflect.A': FqName@79) = null
-    _packageFragments('kotlin.reflect.Int': FqName@80) = null
-    _packageFragments('kotlin.reflect.KFunction0': FqName@81) = null
-    _packageFragments('kotlin.reflect.KFunction1': FqName@82) = null
-    _packageFragments('kotlin.reflect.String': FqName@83) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@84) = null
+    packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
+    packageFragments('A': FqName@39) = null
+    packageFragments('Int': FqName@40) = null
+    packageFragments('KFunction0': FqName@41) = null
+    packageFragments('KFunction1': FqName@42) = null
+    packageFragments('String': FqName@43) = null
+    packageFragments('Unit': FqName@44) = null
+    packageFragments('java': FqName@45) = LazyJavaPackageFragment@46['java']
+    packageFragments('java.lang': FqName@47) = LazyJavaPackageFragment@48['lang']
+    packageFragments('java.lang.A': FqName@49) = null
+    packageFragments('java.lang.Int': FqName@50) = null
+    packageFragments('java.lang.KFunction0': FqName@51) = null
+    packageFragments('java.lang.KFunction1': FqName@52) = null
+    packageFragments('java.lang.String': FqName@53) = null
+    packageFragments('java.lang.Unit': FqName@54) = null
+    packageFragments('kotlin': FqName@55) = LazyJavaPackageFragment@13['kotlin']
+    packageFragments('kotlin.A': FqName@56) = null
+    packageFragments('kotlin.Int': FqName@57) = null
+    packageFragments('kotlin.KFunction0': FqName@58) = null
+    packageFragments('kotlin.KFunction1': FqName@59) = null
+    packageFragments('kotlin.String': FqName@60) = null
+    packageFragments('kotlin.Unit': FqName@61) = null
+    packageFragments('kotlin.io': FqName@62) = LazyJavaPackageFragment@63['io']
+    packageFragments('kotlin.io.A': FqName@64) = null
+    packageFragments('kotlin.io.Int': FqName@65) = null
+    packageFragments('kotlin.io.KFunction0': FqName@66) = null
+    packageFragments('kotlin.io.KFunction1': FqName@67) = null
+    packageFragments('kotlin.io.String': FqName@68) = null
+    packageFragments('kotlin.io.Unit': FqName@69) = null
+    packageFragments('kotlin.jvm': FqName@70) = LazyJavaPackageFragment@71['jvm']
+    packageFragments('kotlin.jvm.A': FqName@72) = null
+    packageFragments('kotlin.jvm.Int': FqName@73) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@74) = null
+    packageFragments('kotlin.jvm.KFunction1': FqName@75) = null
+    packageFragments('kotlin.jvm.String': FqName@76) = null
+    packageFragments('kotlin.jvm.Unit': FqName@77) = null
+    packageFragments('kotlin.reflect': FqName@78) = LazyJavaPackageFragment@14['reflect']
+    packageFragments('kotlin.reflect.A': FqName@79) = null
+    packageFragments('kotlin.reflect.Int': FqName@80) = null
+    packageFragments('kotlin.reflect.KFunction0': FqName@81) = null
+    packageFragments('kotlin.reflect.KFunction1': FqName@82) = null
+    packageFragments('kotlin.reflect.String': FqName@83) = null
+    packageFragments('kotlin.reflect.Unit': FqName@84) = null
 }
 
 LazyJavaPackageFragment@38['<root>'] {
-    _functions('bar': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    _functions('baz': Name@88) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    _functions('foo': Name@89) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    _functions('kotlin': Name@90) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('Int': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('KFunction0': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('KFunction1': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('Unit': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('baz': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('kotlin': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('KFunction0': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('KFunction1': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('kotlin': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('kotlin': Name@97) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@86
 }
 
 LazyJavaPackageFragment@63['io'] {
-    _functions('bar': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    _functions('baz': Name@88) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    _functions('foo': Name@89) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('Int': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('Unit': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('baz': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@99
     deserializedPackageScope = DeserializedPackageMemberScope@100 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('bar': Name@85) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    functions('baz': Name@88) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    functions('foo': Name@89) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
+    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@99
     memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
     membersProtos = HashMap@102 // through DeserializedPackageMemberScope@100
-    properties('bar': Name@85) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    properties('baz': Name@88) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    properties('foo': Name@89) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    properties('x': Name@103) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    properties('y': Name@104) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    properties('z': Name@105) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
+    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'] {
-    _functions('lang': Name@106) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('lang': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@107
+    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
 }
 
 LazyJavaPackageFragment@71['jvm'] {
-    _functions('bar': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    _functions('baz': Name@88) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    _functions('foo': Name@89) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Int': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Unit': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('baz': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@110
+    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
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    _functions('bar': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('baz': Name@88) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('foo': Name@89) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('io': Name@113) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('jvm': Name@114) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('reflect': Name@115) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Any': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Function0': Name@117) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Function1': Name@118) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Int': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Unit': Name@95) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('baz': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('io': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('jvm': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('reflect': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = DeserializedPackageMemberScope@122 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('bar': Name@85) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    functions('baz': Name@88) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    functions('foo': Name@89) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    functions('io': Name@113) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    functions('jvm': Name@114) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    functions('reflect': Name@115) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@112
-    membersProtos = HashMap@124 // through DeserializedPackageMemberScope@122
-    properties('bar': Name@85) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('baz': Name@88) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('foo': Name@89) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('io': Name@113) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('jvm': Name@114) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('reflect': Name@115) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('x': Name@103) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('y': Name@104) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('z': Name@105) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
+    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 = HashMap@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
 }
 
 LazyJavaPackageFragment@48['lang'] {
-    _functions('bar': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    _functions('baz': Name@88) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    _functions('foo': Name@89) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('baz': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@125
+    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
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    _functions('bar': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    _functions('baz': Name@88) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    _functions('foo': Name@89) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Int': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@127
+    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@94) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Unit': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('baz': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    deserializedPackageScope = Empty@97 // 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
 }
 

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

@@ -57,12 +57,12 @@ DeserializedType@22['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@32
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@31
     memberScope = DeserializedClassMemberScope@32
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@31
     memberScope = DeserializedClassMemberScope@32
 }
@@ -88,189 +88,189 @@ DeserializedType@38['kotlin.Function1'] {
 }
 
 LazyJavaPackageFragmentProvider@40 {
-    _packageFragments('<root>': FqName@41) = LazyJavaPackageFragment@42['<root>']
-    _packageFragments('Int': FqName@43) = null
-    _packageFragments('KFunction0': FqName@44) = null
-    _packageFragments('KFunction1': FqName@45) = null
-    _packageFragments('String': FqName@46) = null
-    _packageFragments('Unit': FqName@47) = null
-    _packageFragments('java': FqName@48) = LazyJavaPackageFragment@49['java']
-    _packageFragments('java.lang': FqName@50) = LazyJavaPackageFragment@51['lang']
-    _packageFragments('java.lang.Int': FqName@52) = null
-    _packageFragments('java.lang.KFunction0': FqName@53) = null
-    _packageFragments('java.lang.KFunction1': FqName@54) = null
-    _packageFragments('java.lang.String': FqName@55) = null
-    _packageFragments('java.lang.Unit': FqName@56) = null
-    _packageFragments('kotlin': FqName@57) = LazyJavaPackageFragment@17['kotlin']
-    _packageFragments('kotlin.Int': FqName@58) = null
-    _packageFragments('kotlin.KFunction0': FqName@59) = null
-    _packageFragments('kotlin.KFunction1': FqName@60) = null
-    _packageFragments('kotlin.String': FqName@61) = null
-    _packageFragments('kotlin.Unit': FqName@62) = null
-    _packageFragments('kotlin.io': FqName@63) = LazyJavaPackageFragment@64['io']
-    _packageFragments('kotlin.io.Int': FqName@65) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@66) = null
-    _packageFragments('kotlin.io.KFunction1': FqName@67) = null
-    _packageFragments('kotlin.io.String': FqName@68) = null
-    _packageFragments('kotlin.io.Unit': FqName@69) = null
-    _packageFragments('kotlin.jvm': FqName@70) = LazyJavaPackageFragment@71['jvm']
-    _packageFragments('kotlin.jvm.Int': FqName@72) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@73) = null
-    _packageFragments('kotlin.jvm.KFunction1': FqName@74) = null
-    _packageFragments('kotlin.jvm.String': FqName@75) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@76) = null
-    _packageFragments('kotlin.reflect': FqName@77) = LazyJavaPackageFragment@18['reflect']
-    _packageFragments('kotlin.reflect.Int': FqName@78) = null
-    _packageFragments('kotlin.reflect.KFunction0': FqName@79) = null
-    _packageFragments('kotlin.reflect.KFunction1': FqName@80) = null
-    _packageFragments('kotlin.reflect.String': FqName@81) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@82) = null
+    packageFragments('<root>': FqName@41) = LazyJavaPackageFragment@42['<root>']
+    packageFragments('Int': FqName@43) = null
+    packageFragments('KFunction0': FqName@44) = null
+    packageFragments('KFunction1': FqName@45) = null
+    packageFragments('String': FqName@46) = null
+    packageFragments('Unit': FqName@47) = null
+    packageFragments('java': FqName@48) = LazyJavaPackageFragment@49['java']
+    packageFragments('java.lang': FqName@50) = LazyJavaPackageFragment@51['lang']
+    packageFragments('java.lang.Int': FqName@52) = null
+    packageFragments('java.lang.KFunction0': FqName@53) = null
+    packageFragments('java.lang.KFunction1': FqName@54) = null
+    packageFragments('java.lang.String': FqName@55) = null
+    packageFragments('java.lang.Unit': FqName@56) = null
+    packageFragments('kotlin': FqName@57) = LazyJavaPackageFragment@17['kotlin']
+    packageFragments('kotlin.Int': FqName@58) = null
+    packageFragments('kotlin.KFunction0': FqName@59) = null
+    packageFragments('kotlin.KFunction1': FqName@60) = null
+    packageFragments('kotlin.String': FqName@61) = null
+    packageFragments('kotlin.Unit': FqName@62) = null
+    packageFragments('kotlin.io': FqName@63) = LazyJavaPackageFragment@64['io']
+    packageFragments('kotlin.io.Int': FqName@65) = null
+    packageFragments('kotlin.io.KFunction0': FqName@66) = null
+    packageFragments('kotlin.io.KFunction1': FqName@67) = null
+    packageFragments('kotlin.io.String': FqName@68) = null
+    packageFragments('kotlin.io.Unit': FqName@69) = null
+    packageFragments('kotlin.jvm': FqName@70) = LazyJavaPackageFragment@71['jvm']
+    packageFragments('kotlin.jvm.Int': FqName@72) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@73) = null
+    packageFragments('kotlin.jvm.KFunction1': FqName@74) = null
+    packageFragments('kotlin.jvm.String': FqName@75) = null
+    packageFragments('kotlin.jvm.Unit': FqName@76) = null
+    packageFragments('kotlin.reflect': FqName@77) = LazyJavaPackageFragment@18['reflect']
+    packageFragments('kotlin.reflect.Int': FqName@78) = null
+    packageFragments('kotlin.reflect.KFunction0': FqName@79) = null
+    packageFragments('kotlin.reflect.KFunction1': FqName@80) = null
+    packageFragments('kotlin.reflect.String': FqName@81) = null
+    packageFragments('kotlin.reflect.Unit': FqName@82) = null
 }
 
 LazyJavaPackageFragment@42['<root>'] {
-    _functions('bar': Name@83) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    _functions('baz': Name@86) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    _functions('foo': Name@87) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    _functions('kotlin': Name@88) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('Int': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('KFunction0': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('KFunction1': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('String': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('Unit': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('bar': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('kotlin': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('x': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('y': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('z': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('Int': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('KFunction0': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('KFunction1': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('Unit': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('bar': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('baz': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('kotlin': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('x': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('y': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('z': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('bar': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('baz': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('foo': Name@91) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('kotlin': Name@98) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@84
 }
 
 LazyJavaPackageFragment@64['io'] {
-    _functions('bar': Name@83) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    _functions('baz': Name@86) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    _functions('foo': Name@87) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('Int': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('String': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('Unit': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('bar': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('x': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('y': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('z': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('Int': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('Unit': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('bar': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('baz': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('x': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('y': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('z': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@100
     deserializedPackageScope = DeserializedPackageMemberScope@101 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('bar': Name@83) = EmptyList@84[empty] // through DeserializedPackageMemberScope@101
-    functions('baz': Name@86) = EmptyList@84[empty] // through DeserializedPackageMemberScope@101
-    functions('foo': Name@87) = EmptyList@84[empty] // through DeserializedPackageMemberScope@101
+    functions('bar': Name@89) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
+    functions('bar': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('baz': Name@90) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
+    functions('baz': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('foo': Name@91) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
+    functions('foo': Name@91) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
     memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
     membersProtos = HashMap@103 // through DeserializedPackageMemberScope@101
-    properties('bar': Name@83) = EmptyList@84[empty] // through DeserializedPackageMemberScope@101
-    properties('baz': Name@86) = EmptyList@84[empty] // through DeserializedPackageMemberScope@101
-    properties('foo': Name@87) = EmptyList@84[empty] // through DeserializedPackageMemberScope@101
-    properties('x': Name@95) = EmptyList@84[empty] // through DeserializedPackageMemberScope@101
-    properties('y': Name@96) = EmptyList@84[empty] // through DeserializedPackageMemberScope@101
-    properties('z': Name@97) = EmptyList@84[empty] // through DeserializedPackageMemberScope@101
+    properties('bar': Name@89) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
+    properties('baz': Name@90) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
+    properties('foo': Name@91) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
+    properties('x': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
+    properties('y': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
+    properties('z': Name@95) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
 }
 
 LazyJavaPackageFragment@49['java'] {
-    _functions('lang': Name@104) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('lang': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@105
+    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@71['jvm'] {
-    _functions('bar': Name@83) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    _functions('baz': Name@86) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    _functions('foo': Name@87) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Int': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('String': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Unit': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('bar': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('x': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('y': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('z': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('Int': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('Unit': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('bar': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('baz': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('x': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('y': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('z': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@108
+    functions('bar': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@108
+    functions('baz': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@108
+    functions('foo': Name@91) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@108
     memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@108
 }
 
 LazyJavaPackageFragment@17['kotlin'] {
-    _functions('bar': Name@83) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    _functions('baz': Name@86) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    _functions('foo': Name@87) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    _functions('io': Name@111) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    _functions('jvm': Name@112) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    _functions('reflect': Name@113) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Any': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Function0': Name@115) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Function1': Name@116) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Int': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('String': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Unit': Name@93) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('bar': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('io': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('jvm': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('reflect': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('x': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('y': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('z': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = DeserializedPackageMemberScope@120 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('bar': Name@83) = EmptyList@84[empty] // through DeserializedPackageMemberScope@120
-    functions('baz': Name@86) = EmptyList@84[empty] // through DeserializedPackageMemberScope@120
-    functions('foo': Name@87) = EmptyList@84[empty] // through DeserializedPackageMemberScope@120
-    functions('io': Name@111) = EmptyList@84[empty] // through DeserializedPackageMemberScope@120
-    functions('jvm': Name@112) = EmptyList@84[empty] // through DeserializedPackageMemberScope@120
-    functions('reflect': Name@113) = EmptyList@84[empty] // through DeserializedPackageMemberScope@120
-    memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@110
-    membersProtos = HashMap@122 // through DeserializedPackageMemberScope@120
-    properties('bar': Name@83) = EmptyList@84[empty] // through DeserializedPackageMemberScope@120
-    properties('baz': Name@86) = EmptyList@84[empty] // through DeserializedPackageMemberScope@120
-    properties('foo': Name@87) = EmptyList@84[empty] // through DeserializedPackageMemberScope@120
-    properties('io': Name@111) = EmptyList@84[empty] // through DeserializedPackageMemberScope@120
-    properties('jvm': Name@112) = EmptyList@84[empty] // through DeserializedPackageMemberScope@120
-    properties('reflect': Name@113) = EmptyList@84[empty] // through DeserializedPackageMemberScope@120
-    properties('x': Name@95) = EmptyList@84[empty] // through DeserializedPackageMemberScope@120
-    properties('y': Name@96) = EmptyList@84[empty] // through DeserializedPackageMemberScope@120
-    properties('z': Name@97) = EmptyList@84[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@83) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('Unit': Name@88) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('bar': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('baz': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('foo': Name@91) = 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
+    classes('x': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('y': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('z': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    deserializedPackageScope = DeserializedPackageMemberScope@117 // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('bar': Name@89) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    functions('bar': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('baz': Name@90) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    functions('baz': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('foo': Name@91) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    functions('foo': Name@91) = 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 = HashMap@122 // through DeserializedPackageMemberScope@117
+    properties('bar': Name@89) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    properties('baz': Name@90) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    properties('foo': Name@91) = 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
+    properties('x': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    properties('y': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    properties('z': Name@95) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
 }
 
 LazyJavaPackageFragment@51['lang'] {
-    _functions('bar': Name@83) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@123
-    _functions('baz': Name@86) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@123
-    _functions('foo': Name@87) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('bar': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('x': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('y': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('z': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('bar': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('baz': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('x': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('y': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('z': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@123
+    functions('bar': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@123
+    functions('baz': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@123
+    functions('foo': Name@91) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@123
     memberIndex = computeMemberIndex$1@124 // through LazyPackageFragmentScopeForJavaPackage@123
 }
 
 LazyJavaPackageFragment@18['reflect'] {
-    _functions('bar': Name@83) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    _functions('baz': Name@86) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    _functions('foo': Name@87) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('Int': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('Int': Name@83) = 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@92) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('Unit': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('bar': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('x': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('y': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('z': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('Unit': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('bar': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('baz': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('x': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('y': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('z': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('bar': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('baz': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('foo': Name@91) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@125
     memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@125
 }
 

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

@@ -51,12 +51,12 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -82,177 +82,177 @@ DeserializedType@34['kotlin.Function1'] {
 }
 
 LazyJavaPackageFragmentProvider@36 {
-    _packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
-    _packageFragments('A': FqName@39) = null
-    _packageFragments('Int': FqName@40) = null
-    _packageFragments('KFunction0': FqName@41) = null
-    _packageFragments('KFunction1': FqName@42) = null
-    _packageFragments('String': FqName@43) = null
-    _packageFragments('Unit': FqName@44) = null
-    _packageFragments('java': FqName@45) = LazyJavaPackageFragment@46['java']
-    _packageFragments('java.lang': FqName@47) = LazyJavaPackageFragment@48['lang']
-    _packageFragments('java.lang.A': FqName@49) = null
-    _packageFragments('java.lang.Int': FqName@50) = null
-    _packageFragments('java.lang.KFunction0': FqName@51) = null
-    _packageFragments('java.lang.KFunction1': FqName@52) = null
-    _packageFragments('java.lang.String': FqName@53) = null
-    _packageFragments('java.lang.Unit': FqName@54) = null
-    _packageFragments('kotlin': FqName@55) = LazyJavaPackageFragment@13['kotlin']
-    _packageFragments('kotlin.A': FqName@56) = null
-    _packageFragments('kotlin.Int': FqName@57) = null
-    _packageFragments('kotlin.KFunction0': FqName@58) = null
-    _packageFragments('kotlin.KFunction1': FqName@59) = null
-    _packageFragments('kotlin.String': FqName@60) = null
-    _packageFragments('kotlin.Unit': FqName@61) = null
-    _packageFragments('kotlin.io': FqName@62) = LazyJavaPackageFragment@63['io']
-    _packageFragments('kotlin.io.A': FqName@64) = null
-    _packageFragments('kotlin.io.Int': FqName@65) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@66) = null
-    _packageFragments('kotlin.io.KFunction1': FqName@67) = null
-    _packageFragments('kotlin.io.String': FqName@68) = null
-    _packageFragments('kotlin.io.Unit': FqName@69) = null
-    _packageFragments('kotlin.jvm': FqName@70) = LazyJavaPackageFragment@71['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@72) = null
-    _packageFragments('kotlin.jvm.Int': FqName@73) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@74) = null
-    _packageFragments('kotlin.jvm.KFunction1': FqName@75) = null
-    _packageFragments('kotlin.jvm.String': FqName@76) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@77) = null
-    _packageFragments('kotlin.reflect': FqName@78) = LazyJavaPackageFragment@14['reflect']
-    _packageFragments('kotlin.reflect.A': FqName@79) = null
-    _packageFragments('kotlin.reflect.Int': FqName@80) = null
-    _packageFragments('kotlin.reflect.KFunction0': FqName@81) = null
-    _packageFragments('kotlin.reflect.KFunction1': FqName@82) = null
-    _packageFragments('kotlin.reflect.String': FqName@83) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@84) = null
+    packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
+    packageFragments('A': FqName@39) = null
+    packageFragments('Int': FqName@40) = null
+    packageFragments('KFunction0': FqName@41) = null
+    packageFragments('KFunction1': FqName@42) = null
+    packageFragments('String': FqName@43) = null
+    packageFragments('Unit': FqName@44) = null
+    packageFragments('java': FqName@45) = LazyJavaPackageFragment@46['java']
+    packageFragments('java.lang': FqName@47) = LazyJavaPackageFragment@48['lang']
+    packageFragments('java.lang.A': FqName@49) = null
+    packageFragments('java.lang.Int': FqName@50) = null
+    packageFragments('java.lang.KFunction0': FqName@51) = null
+    packageFragments('java.lang.KFunction1': FqName@52) = null
+    packageFragments('java.lang.String': FqName@53) = null
+    packageFragments('java.lang.Unit': FqName@54) = null
+    packageFragments('kotlin': FqName@55) = LazyJavaPackageFragment@13['kotlin']
+    packageFragments('kotlin.A': FqName@56) = null
+    packageFragments('kotlin.Int': FqName@57) = null
+    packageFragments('kotlin.KFunction0': FqName@58) = null
+    packageFragments('kotlin.KFunction1': FqName@59) = null
+    packageFragments('kotlin.String': FqName@60) = null
+    packageFragments('kotlin.Unit': FqName@61) = null
+    packageFragments('kotlin.io': FqName@62) = LazyJavaPackageFragment@63['io']
+    packageFragments('kotlin.io.A': FqName@64) = null
+    packageFragments('kotlin.io.Int': FqName@65) = null
+    packageFragments('kotlin.io.KFunction0': FqName@66) = null
+    packageFragments('kotlin.io.KFunction1': FqName@67) = null
+    packageFragments('kotlin.io.String': FqName@68) = null
+    packageFragments('kotlin.io.Unit': FqName@69) = null
+    packageFragments('kotlin.jvm': FqName@70) = LazyJavaPackageFragment@71['jvm']
+    packageFragments('kotlin.jvm.A': FqName@72) = null
+    packageFragments('kotlin.jvm.Int': FqName@73) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@74) = null
+    packageFragments('kotlin.jvm.KFunction1': FqName@75) = null
+    packageFragments('kotlin.jvm.String': FqName@76) = null
+    packageFragments('kotlin.jvm.Unit': FqName@77) = null
+    packageFragments('kotlin.reflect': FqName@78) = LazyJavaPackageFragment@14['reflect']
+    packageFragments('kotlin.reflect.A': FqName@79) = null
+    packageFragments('kotlin.reflect.Int': FqName@80) = null
+    packageFragments('kotlin.reflect.KFunction0': FqName@81) = null
+    packageFragments('kotlin.reflect.KFunction1': FqName@82) = null
+    packageFragments('kotlin.reflect.String': FqName@83) = null
+    packageFragments('kotlin.reflect.Unit': FqName@84) = null
 }
 
 LazyJavaPackageFragment@38['<root>'] {
-    _functions('bar': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    _functions('baz': Name@88) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    _functions('foo': Name@89) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    _functions('kotlin': Name@90) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('Int': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('KFunction0': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('KFunction1': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('Unit': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('baz': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('kotlin': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('KFunction0': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('KFunction1': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('kotlin': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('kotlin': Name@97) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@86
 }
 
 LazyJavaPackageFragment@63['io'] {
-    _functions('bar': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    _functions('baz': Name@88) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    _functions('foo': Name@89) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('Int': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('Unit': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('baz': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@99
     deserializedPackageScope = DeserializedPackageMemberScope@100 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('bar': Name@85) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    functions('baz': Name@88) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    functions('foo': Name@89) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
+    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@99
     memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
     membersProtos = HashMap@102 // through DeserializedPackageMemberScope@100
-    properties('bar': Name@85) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    properties('baz': Name@88) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    properties('foo': Name@89) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    properties('x': Name@103) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    properties('y': Name@104) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    properties('z': Name@105) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
+    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'] {
-    _functions('lang': Name@106) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('lang': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@107
+    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
 }
 
 LazyJavaPackageFragment@71['jvm'] {
-    _functions('bar': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    _functions('baz': Name@88) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    _functions('foo': Name@89) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Int': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Unit': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('baz': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@110
+    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
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    _functions('bar': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('baz': Name@88) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('foo': Name@89) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('io': Name@113) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('jvm': Name@114) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('reflect': Name@115) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Any': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Function0': Name@117) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Function1': Name@118) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Int': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Unit': Name@95) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('baz': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('io': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('jvm': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('reflect': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = DeserializedPackageMemberScope@122 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('bar': Name@85) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    functions('baz': Name@88) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    functions('foo': Name@89) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    functions('io': Name@113) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    functions('jvm': Name@114) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    functions('reflect': Name@115) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@112
-    membersProtos = HashMap@124 // through DeserializedPackageMemberScope@122
-    properties('bar': Name@85) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('baz': Name@88) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('foo': Name@89) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('io': Name@113) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('jvm': Name@114) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('reflect': Name@115) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('x': Name@103) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('y': Name@104) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('z': Name@105) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
+    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 = HashMap@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
 }
 
 LazyJavaPackageFragment@48['lang'] {
-    _functions('bar': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    _functions('baz': Name@88) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    _functions('foo': Name@89) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('baz': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@125
+    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
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    _functions('bar': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    _functions('baz': Name@88) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    _functions('foo': Name@89) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Int': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@127
+    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@94) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Unit': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('baz': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    deserializedPackageScope = Empty@97 // 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
 }
 

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

@@ -45,108 +45,108 @@ DeserializedType@20['kotlin.ExtensionFunction0'] {
 }
 
 LazyJavaPackageFragmentProvider@22 {
-    _packageFragments('<root>': FqName@23) = LazyJavaPackageFragment@24['<root>']
-    _packageFragments('Int': FqName@25) = null
-    _packageFragments('KMemberFunction0': FqName@26) = null
-    _packageFragments('a': FqName@27) = null
-    _packageFragments('a.b': FqName@28) = null
-    _packageFragments('a.b.c': FqName@29) = null
-    _packageFragments('a.b.c.D': FqName@30) = null
-    _packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
-    _packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
-    _packageFragments('java.lang.Int': FqName@35) = null
-    _packageFragments('java.lang.KMemberFunction0': FqName@36) = null
-    _packageFragments('kotlin': FqName@37) = LazyJavaPackageFragment@7['kotlin']
-    _packageFragments('kotlin.Int': FqName@38) = null
-    _packageFragments('kotlin.KMemberFunction0': FqName@39) = null
-    _packageFragments('kotlin.io': FqName@40) = LazyJavaPackageFragment@41['io']
-    _packageFragments('kotlin.io.Int': FqName@42) = null
-    _packageFragments('kotlin.io.KMemberFunction0': FqName@43) = null
-    _packageFragments('kotlin.jvm': FqName@44) = LazyJavaPackageFragment@45['jvm']
-    _packageFragments('kotlin.jvm.Int': FqName@46) = null
-    _packageFragments('kotlin.jvm.KMemberFunction0': FqName@47) = null
-    _packageFragments('kotlin.reflect': FqName@48) = LazyJavaPackageFragment@8['reflect']
-    _packageFragments('kotlin.reflect.KMemberFunction0': FqName@49) = null
+    packageFragments('<root>': FqName@23) = LazyJavaPackageFragment@24['<root>']
+    packageFragments('Int': FqName@25) = null
+    packageFragments('KMemberFunction0': FqName@26) = null
+    packageFragments('a': FqName@27) = null
+    packageFragments('a.b': FqName@28) = null
+    packageFragments('a.b.c': FqName@29) = null
+    packageFragments('a.b.c.D': FqName@30) = null
+    packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
+    packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
+    packageFragments('java.lang.Int': FqName@35) = null
+    packageFragments('java.lang.KMemberFunction0': FqName@36) = null
+    packageFragments('kotlin': FqName@37) = LazyJavaPackageFragment@7['kotlin']
+    packageFragments('kotlin.Int': FqName@38) = null
+    packageFragments('kotlin.KMemberFunction0': FqName@39) = null
+    packageFragments('kotlin.io': FqName@40) = LazyJavaPackageFragment@41['io']
+    packageFragments('kotlin.io.Int': FqName@42) = null
+    packageFragments('kotlin.io.KMemberFunction0': FqName@43) = null
+    packageFragments('kotlin.jvm': FqName@44) = LazyJavaPackageFragment@45['jvm']
+    packageFragments('kotlin.jvm.Int': FqName@46) = null
+    packageFragments('kotlin.jvm.KMemberFunction0': FqName@47) = null
+    packageFragments('kotlin.reflect': FqName@48) = LazyJavaPackageFragment@8['reflect']
+    packageFragments('kotlin.reflect.KMemberFunction0': FqName@49) = null
 }
 
 LazyJavaPackageFragment@24['<root>'] {
-    _functions('foo': Name@50) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    _functions('kotlin': Name@53) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('Int': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('KMemberFunction0': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('a': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('kotlin': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@52
+    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
 }
 
 LazyJavaPackageFragment@41['io'] {
-    _functions('foo': Name@50) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('Int': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('a': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@60
+    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@50) = EmptyList@51[empty] // through DeserializedPackageMemberScope@61
+    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 = HashMap@63 // through DeserializedPackageMemberScope@61
-    properties('foo': Name@50) = EmptyList@51[empty] // through DeserializedPackageMemberScope@61
+    properties('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@61
 }
 
 LazyJavaPackageFragment@32['java'] {
-    _functions('lang': Name@64) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@65
+    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
 }
 
 LazyJavaPackageFragment@45['jvm'] {
-    _functions('foo': Name@50) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('Int': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('a': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@68
+    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
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    _functions('foo': Name@50) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    _functions('io': Name@71) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    _functions('jvm': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    _functions('reflect': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('Any': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('ExtensionFunction0': Name@75) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('Int': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('a': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('io': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('jvm': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('reflect': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = DeserializedPackageMemberScope@79 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('foo': Name@50) = EmptyList@51[empty] // through DeserializedPackageMemberScope@79
-    functions('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@79
-    functions('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@79
-    functions('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@79
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@70
-    membersProtos = HashMap@81 // through DeserializedPackageMemberScope@79
-    properties('foo': Name@50) = EmptyList@51[empty] // through DeserializedPackageMemberScope@79
-    properties('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@79
-    properties('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@79
-    properties('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@79
+    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 = HashMap@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@34['lang'] {
-    _functions('foo': Name@50) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('a': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@82
+    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
 }
 
 LazyJavaPackageFragment@8['reflect'] {
-    _functions('KMemberFunction0': Name@84) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('KMemberFunction0': Name@86) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@85
+    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
 }
 

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

@@ -38,12 +38,12 @@ DeserializedTypeParameterDescriptor@21['T'] {
     upperBoundsAsType = DeserializedType@24['kotlin.Any']
 }
 
-DeserializedType@24['kotlin.Any'] {
+DeserializedType@20['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@25
     memberScope = DeserializedClassMemberScope@26
 }
 
-DeserializedType@20['kotlin.Any'] {
+DeserializedType@12['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@25
     memberScope = DeserializedClassMemberScope@26
 }
@@ -53,7 +53,7 @@ DeserializedType@16['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@26
 }
 
-DeserializedType@12['kotlin.Any'] {
+DeserializedType@24['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@25
     memberScope = DeserializedClassMemberScope@26
 }
@@ -67,129 +67,129 @@ DeserializedType@28['kotlin.ExtensionFunction2'] {
 }
 
 LazyJavaPackageFragmentProvider@30 {
-    _packageFragments('<root>': FqName@31) = LazyJavaPackageFragment@32['<root>']
-    _packageFragments('E': FqName@33) = null
-    _packageFragments('F': FqName@34) = null
-    _packageFragments('Int': FqName@35) = null
-    _packageFragments('KMemberFunction2': FqName@36) = null
-    _packageFragments('String': FqName@37) = null
-    _packageFragments('a': FqName@38) = null
-    _packageFragments('a.b': FqName@39) = null
-    _packageFragments('a.b.c': FqName@40) = null
-    _packageFragments('a.b.c.D': FqName@41) = null
-    _packageFragments('a.b.c.E': FqName@42) = null
-    _packageFragments('a.b.c.F': FqName@43) = null
-    _packageFragments('java': FqName@44) = LazyJavaPackageFragment@45['java']
-    _packageFragments('java.lang': FqName@46) = LazyJavaPackageFragment@47['lang']
-    _packageFragments('java.lang.E': FqName@48) = null
-    _packageFragments('java.lang.F': FqName@49) = null
-    _packageFragments('java.lang.Int': FqName@50) = null
-    _packageFragments('java.lang.KMemberFunction2': FqName@51) = null
-    _packageFragments('java.lang.String': FqName@52) = null
-    _packageFragments('kotlin': FqName@53) = LazyJavaPackageFragment@7['kotlin']
-    _packageFragments('kotlin.E': FqName@54) = null
-    _packageFragments('kotlin.F': FqName@55) = null
-    _packageFragments('kotlin.Int': FqName@56) = null
-    _packageFragments('kotlin.KMemberFunction2': FqName@57) = null
-    _packageFragments('kotlin.String': FqName@58) = null
-    _packageFragments('kotlin.io': FqName@59) = LazyJavaPackageFragment@60['io']
-    _packageFragments('kotlin.io.E': FqName@61) = null
-    _packageFragments('kotlin.io.F': FqName@62) = null
-    _packageFragments('kotlin.io.Int': FqName@63) = null
-    _packageFragments('kotlin.io.KMemberFunction2': FqName@64) = null
-    _packageFragments('kotlin.io.String': FqName@65) = null
-    _packageFragments('kotlin.jvm': FqName@66) = LazyJavaPackageFragment@67['jvm']
-    _packageFragments('kotlin.jvm.E': FqName@68) = null
-    _packageFragments('kotlin.jvm.F': FqName@69) = null
-    _packageFragments('kotlin.jvm.Int': FqName@70) = null
-    _packageFragments('kotlin.jvm.KMemberFunction2': FqName@71) = null
-    _packageFragments('kotlin.jvm.String': FqName@72) = null
-    _packageFragments('kotlin.reflect': FqName@73) = LazyJavaPackageFragment@8['reflect']
-    _packageFragments('kotlin.reflect.KMemberFunction2': FqName@74) = null
+    packageFragments('<root>': FqName@31) = LazyJavaPackageFragment@32['<root>']
+    packageFragments('E': FqName@33) = null
+    packageFragments('F': FqName@34) = null
+    packageFragments('Int': FqName@35) = null
+    packageFragments('KMemberFunction2': FqName@36) = null
+    packageFragments('String': FqName@37) = null
+    packageFragments('a': FqName@38) = null
+    packageFragments('a.b': FqName@39) = null
+    packageFragments('a.b.c': FqName@40) = null
+    packageFragments('a.b.c.D': FqName@41) = null
+    packageFragments('a.b.c.E': FqName@42) = null
+    packageFragments('a.b.c.F': FqName@43) = null
+    packageFragments('java': FqName@44) = LazyJavaPackageFragment@45['java']
+    packageFragments('java.lang': FqName@46) = LazyJavaPackageFragment@47['lang']
+    packageFragments('java.lang.E': FqName@48) = null
+    packageFragments('java.lang.F': FqName@49) = null
+    packageFragments('java.lang.Int': FqName@50) = null
+    packageFragments('java.lang.KMemberFunction2': FqName@51) = null
+    packageFragments('java.lang.String': FqName@52) = null
+    packageFragments('kotlin': FqName@53) = LazyJavaPackageFragment@7['kotlin']
+    packageFragments('kotlin.E': FqName@54) = null
+    packageFragments('kotlin.F': FqName@55) = null
+    packageFragments('kotlin.Int': FqName@56) = null
+    packageFragments('kotlin.KMemberFunction2': FqName@57) = null
+    packageFragments('kotlin.String': FqName@58) = null
+    packageFragments('kotlin.io': FqName@59) = LazyJavaPackageFragment@60['io']
+    packageFragments('kotlin.io.E': FqName@61) = null
+    packageFragments('kotlin.io.F': FqName@62) = null
+    packageFragments('kotlin.io.Int': FqName@63) = null
+    packageFragments('kotlin.io.KMemberFunction2': FqName@64) = null
+    packageFragments('kotlin.io.String': FqName@65) = null
+    packageFragments('kotlin.jvm': FqName@66) = LazyJavaPackageFragment@67['jvm']
+    packageFragments('kotlin.jvm.E': FqName@68) = null
+    packageFragments('kotlin.jvm.F': FqName@69) = null
+    packageFragments('kotlin.jvm.Int': FqName@70) = null
+    packageFragments('kotlin.jvm.KMemberFunction2': FqName@71) = null
+    packageFragments('kotlin.jvm.String': FqName@72) = null
+    packageFragments('kotlin.reflect': FqName@73) = LazyJavaPackageFragment@8['reflect']
+    packageFragments('kotlin.reflect.KMemberFunction2': FqName@74) = null
 }
 
 LazyJavaPackageFragment@32['<root>'] {
-    _functions('foo': Name@75) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    _functions('kotlin': Name@78) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('KMemberFunction2': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('a': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('foo': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('kotlin': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    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
 }
 
 LazyJavaPackageFragment@60['io'] {
-    _functions('foo': Name@75) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('a': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('foo': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    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@75) = EmptyList@76[empty] // through DeserializedPackageMemberScope@87
+    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 = HashMap@89 // through DeserializedPackageMemberScope@87
-    properties('foo': Name@75) = EmptyList@76[empty] // through DeserializedPackageMemberScope@87
+    properties('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@87
 }
 
 LazyJavaPackageFragment@45['java'] {
-    _functions('lang': Name@90) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@91
+    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
 }
 
 LazyJavaPackageFragment@67['jvm'] {
-    _functions('foo': Name@75) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('a': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('foo': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@94
+    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
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    _functions('foo': Name@75) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    _functions('io': Name@97) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    _functions('jvm': Name@98) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    _functions('reflect': Name@99) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('Any': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('ExtensionFunction2': Name@101) = DeserializedClassDescriptor@2['ExtensionFunction2'] // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('a': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('foo': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('io': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('jvm': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('reflect': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = DeserializedPackageMemberScope@105 // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('foo': Name@75) = EmptyList@76[empty] // through DeserializedPackageMemberScope@105
-    functions('io': Name@97) = EmptyList@76[empty] // through DeserializedPackageMemberScope@105
-    functions('jvm': Name@98) = EmptyList@76[empty] // through DeserializedPackageMemberScope@105
-    functions('reflect': Name@99) = EmptyList@76[empty] // through DeserializedPackageMemberScope@105
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@96
-    membersProtos = HashMap@107 // through DeserializedPackageMemberScope@105
-    properties('foo': Name@75) = EmptyList@76[empty] // through DeserializedPackageMemberScope@105
-    properties('io': Name@97) = EmptyList@76[empty] // through DeserializedPackageMemberScope@105
-    properties('jvm': Name@98) = EmptyList@76[empty] // through DeserializedPackageMemberScope@105
-    properties('reflect': Name@99) = EmptyList@76[empty] // through DeserializedPackageMemberScope@105
+    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 = HashMap@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
 }
 
 LazyJavaPackageFragment@47['lang'] {
-    _functions('foo': Name@75) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('a': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('foo': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@108
+    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
 }
 
 LazyJavaPackageFragment@8['reflect'] {
-    _functions('KMemberFunction2': Name@110) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('KMemberFunction2': Name@112) = DeserializedClassDescriptor@4['KMemberFunction2'] // through LazyPackageFragmentScopeForJavaPackage@111
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@111
+    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
 }
 

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

@@ -58,12 +58,12 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@34['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@34['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -73,7 +73,7 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -104,177 +104,177 @@ DeserializedType@42['kotlin.ExtensionFunction1'] {
 }
 
 LazyJavaPackageFragmentProvider@44 {
-    _packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
-    _packageFragments('A': FqName@47) = null
-    _packageFragments('Int': FqName@48) = null
-    _packageFragments('KMemberFunction0': FqName@49) = null
-    _packageFragments('KMemberFunction1': FqName@50) = null
-    _packageFragments('String': FqName@51) = null
-    _packageFragments('Unit': FqName@52) = null
-    _packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    _packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    _packageFragments('java.lang.A': FqName@57) = null
-    _packageFragments('java.lang.Int': FqName@58) = null
-    _packageFragments('java.lang.KMemberFunction0': FqName@59) = null
-    _packageFragments('java.lang.KMemberFunction1': FqName@60) = null
-    _packageFragments('java.lang.String': FqName@61) = null
-    _packageFragments('java.lang.Unit': FqName@62) = null
-    _packageFragments('kotlin': FqName@63) = LazyJavaPackageFragment@13['kotlin']
-    _packageFragments('kotlin.A': FqName@64) = null
-    _packageFragments('kotlin.Int': FqName@65) = null
-    _packageFragments('kotlin.KMemberFunction0': FqName@66) = null
-    _packageFragments('kotlin.KMemberFunction1': FqName@67) = null
-    _packageFragments('kotlin.String': FqName@68) = null
-    _packageFragments('kotlin.Unit': FqName@69) = null
-    _packageFragments('kotlin.io': FqName@70) = LazyJavaPackageFragment@71['io']
-    _packageFragments('kotlin.io.A': FqName@72) = null
-    _packageFragments('kotlin.io.Int': FqName@73) = null
-    _packageFragments('kotlin.io.KMemberFunction0': FqName@74) = null
-    _packageFragments('kotlin.io.KMemberFunction1': FqName@75) = null
-    _packageFragments('kotlin.io.String': FqName@76) = null
-    _packageFragments('kotlin.io.Unit': FqName@77) = null
-    _packageFragments('kotlin.jvm': FqName@78) = LazyJavaPackageFragment@79['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@80) = null
-    _packageFragments('kotlin.jvm.Int': FqName@81) = null
-    _packageFragments('kotlin.jvm.KMemberFunction0': FqName@82) = null
-    _packageFragments('kotlin.jvm.KMemberFunction1': FqName@83) = null
-    _packageFragments('kotlin.jvm.String': FqName@84) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@85) = null
-    _packageFragments('kotlin.reflect': FqName@86) = LazyJavaPackageFragment@14['reflect']
-    _packageFragments('kotlin.reflect.A': FqName@87) = null
-    _packageFragments('kotlin.reflect.Int': FqName@88) = null
-    _packageFragments('kotlin.reflect.KMemberFunction0': FqName@89) = null
-    _packageFragments('kotlin.reflect.KMemberFunction1': FqName@90) = null
-    _packageFragments('kotlin.reflect.String': FqName@91) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@92) = null
+    packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
+    packageFragments('A': FqName@47) = null
+    packageFragments('Int': FqName@48) = null
+    packageFragments('KMemberFunction0': FqName@49) = null
+    packageFragments('KMemberFunction1': FqName@50) = null
+    packageFragments('String': FqName@51) = null
+    packageFragments('Unit': FqName@52) = null
+    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
+    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
+    packageFragments('java.lang.A': FqName@57) = null
+    packageFragments('java.lang.Int': FqName@58) = null
+    packageFragments('java.lang.KMemberFunction0': FqName@59) = null
+    packageFragments('java.lang.KMemberFunction1': FqName@60) = null
+    packageFragments('java.lang.String': FqName@61) = null
+    packageFragments('java.lang.Unit': FqName@62) = null
+    packageFragments('kotlin': FqName@63) = LazyJavaPackageFragment@13['kotlin']
+    packageFragments('kotlin.A': FqName@64) = null
+    packageFragments('kotlin.Int': FqName@65) = null
+    packageFragments('kotlin.KMemberFunction0': FqName@66) = null
+    packageFragments('kotlin.KMemberFunction1': FqName@67) = null
+    packageFragments('kotlin.String': FqName@68) = null
+    packageFragments('kotlin.Unit': FqName@69) = null
+    packageFragments('kotlin.io': FqName@70) = LazyJavaPackageFragment@71['io']
+    packageFragments('kotlin.io.A': FqName@72) = null
+    packageFragments('kotlin.io.Int': FqName@73) = null
+    packageFragments('kotlin.io.KMemberFunction0': FqName@74) = null
+    packageFragments('kotlin.io.KMemberFunction1': FqName@75) = null
+    packageFragments('kotlin.io.String': FqName@76) = null
+    packageFragments('kotlin.io.Unit': FqName@77) = null
+    packageFragments('kotlin.jvm': FqName@78) = LazyJavaPackageFragment@79['jvm']
+    packageFragments('kotlin.jvm.A': FqName@80) = null
+    packageFragments('kotlin.jvm.Int': FqName@81) = null
+    packageFragments('kotlin.jvm.KMemberFunction0': FqName@82) = null
+    packageFragments('kotlin.jvm.KMemberFunction1': FqName@83) = null
+    packageFragments('kotlin.jvm.String': FqName@84) = null
+    packageFragments('kotlin.jvm.Unit': FqName@85) = null
+    packageFragments('kotlin.reflect': FqName@86) = LazyJavaPackageFragment@14['reflect']
+    packageFragments('kotlin.reflect.A': FqName@87) = null
+    packageFragments('kotlin.reflect.Int': FqName@88) = null
+    packageFragments('kotlin.reflect.KMemberFunction0': FqName@89) = null
+    packageFragments('kotlin.reflect.KMemberFunction1': FqName@90) = null
+    packageFragments('kotlin.reflect.String': FqName@91) = null
+    packageFragments('kotlin.reflect.Unit': FqName@92) = null
 }
 
 LazyJavaPackageFragment@46['<root>'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('kotlin': Name@98) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('KMemberFunction0': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('KMemberFunction1': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('kotlin': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('KMemberFunction0': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    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
 }
 
 LazyJavaPackageFragment@71['io'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    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@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    functions('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    functions('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
+    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 = HashMap@110 // through DeserializedPackageMemberScope@108
-    properties('bar': Name@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('x': Name@111) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('y': Name@112) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('z': Name@113) = EmptyList@94[empty] // 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
+    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'] {
-    _functions('lang': Name@114) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('lang': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@115
+    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
 }
 
 LazyJavaPackageFragment@79['jvm'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@118
+    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
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('io': Name@121) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('jvm': Name@122) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('reflect': Name@123) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('Any': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('ExtensionFunction0': Name@125) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('ExtensionFunction1': Name@126) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('Unit': Name@103) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('io': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('jvm': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('reflect': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    deserializedPackageScope = DeserializedPackageMemberScope@130 // through LazyPackageFragmentScopeForJavaPackage@120
-    functions('bar': Name@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    functions('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    functions('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    functions('io': Name@121) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    functions('jvm': Name@122) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    functions('reflect': Name@123) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@120
-    membersProtos = HashMap@132 // through DeserializedPackageMemberScope@130
-    properties('bar': Name@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('io': Name@121) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('jvm': Name@122) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('reflect': Name@123) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('x': Name@111) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('y': Name@112) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('z': Name@113) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
+    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 = HashMap@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
 }
 
 LazyJavaPackageFragment@56['lang'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@133
+    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
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@135
+    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@102) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    deserializedPackageScope = Empty@105 // 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
 }
 

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

@@ -58,7 +58,7 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -68,21 +68,21 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
 DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
+DeserializedType@26['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@18['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
 DeserializedType@37['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
 }
@@ -104,177 +104,177 @@ DeserializedType@42['kotlin.ExtensionFunction1'] {
 }
 
 LazyJavaPackageFragmentProvider@44 {
-    _packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
-    _packageFragments('A': FqName@47) = null
-    _packageFragments('Int': FqName@48) = null
-    _packageFragments('KMemberFunction0': FqName@49) = null
-    _packageFragments('KMemberFunction1': FqName@50) = null
-    _packageFragments('String': FqName@51) = null
-    _packageFragments('Unit': FqName@52) = null
-    _packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    _packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    _packageFragments('java.lang.A': FqName@57) = null
-    _packageFragments('java.lang.Int': FqName@58) = null
-    _packageFragments('java.lang.KMemberFunction0': FqName@59) = null
-    _packageFragments('java.lang.KMemberFunction1': FqName@60) = null
-    _packageFragments('java.lang.String': FqName@61) = null
-    _packageFragments('java.lang.Unit': FqName@62) = null
-    _packageFragments('kotlin': FqName@63) = LazyJavaPackageFragment@13['kotlin']
-    _packageFragments('kotlin.A': FqName@64) = null
-    _packageFragments('kotlin.Int': FqName@65) = null
-    _packageFragments('kotlin.KMemberFunction0': FqName@66) = null
-    _packageFragments('kotlin.KMemberFunction1': FqName@67) = null
-    _packageFragments('kotlin.String': FqName@68) = null
-    _packageFragments('kotlin.Unit': FqName@69) = null
-    _packageFragments('kotlin.io': FqName@70) = LazyJavaPackageFragment@71['io']
-    _packageFragments('kotlin.io.A': FqName@72) = null
-    _packageFragments('kotlin.io.Int': FqName@73) = null
-    _packageFragments('kotlin.io.KMemberFunction0': FqName@74) = null
-    _packageFragments('kotlin.io.KMemberFunction1': FqName@75) = null
-    _packageFragments('kotlin.io.String': FqName@76) = null
-    _packageFragments('kotlin.io.Unit': FqName@77) = null
-    _packageFragments('kotlin.jvm': FqName@78) = LazyJavaPackageFragment@79['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@80) = null
-    _packageFragments('kotlin.jvm.Int': FqName@81) = null
-    _packageFragments('kotlin.jvm.KMemberFunction0': FqName@82) = null
-    _packageFragments('kotlin.jvm.KMemberFunction1': FqName@83) = null
-    _packageFragments('kotlin.jvm.String': FqName@84) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@85) = null
-    _packageFragments('kotlin.reflect': FqName@86) = LazyJavaPackageFragment@14['reflect']
-    _packageFragments('kotlin.reflect.A': FqName@87) = null
-    _packageFragments('kotlin.reflect.Int': FqName@88) = null
-    _packageFragments('kotlin.reflect.KMemberFunction0': FqName@89) = null
-    _packageFragments('kotlin.reflect.KMemberFunction1': FqName@90) = null
-    _packageFragments('kotlin.reflect.String': FqName@91) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@92) = null
+    packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
+    packageFragments('A': FqName@47) = null
+    packageFragments('Int': FqName@48) = null
+    packageFragments('KMemberFunction0': FqName@49) = null
+    packageFragments('KMemberFunction1': FqName@50) = null
+    packageFragments('String': FqName@51) = null
+    packageFragments('Unit': FqName@52) = null
+    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
+    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
+    packageFragments('java.lang.A': FqName@57) = null
+    packageFragments('java.lang.Int': FqName@58) = null
+    packageFragments('java.lang.KMemberFunction0': FqName@59) = null
+    packageFragments('java.lang.KMemberFunction1': FqName@60) = null
+    packageFragments('java.lang.String': FqName@61) = null
+    packageFragments('java.lang.Unit': FqName@62) = null
+    packageFragments('kotlin': FqName@63) = LazyJavaPackageFragment@13['kotlin']
+    packageFragments('kotlin.A': FqName@64) = null
+    packageFragments('kotlin.Int': FqName@65) = null
+    packageFragments('kotlin.KMemberFunction0': FqName@66) = null
+    packageFragments('kotlin.KMemberFunction1': FqName@67) = null
+    packageFragments('kotlin.String': FqName@68) = null
+    packageFragments('kotlin.Unit': FqName@69) = null
+    packageFragments('kotlin.io': FqName@70) = LazyJavaPackageFragment@71['io']
+    packageFragments('kotlin.io.A': FqName@72) = null
+    packageFragments('kotlin.io.Int': FqName@73) = null
+    packageFragments('kotlin.io.KMemberFunction0': FqName@74) = null
+    packageFragments('kotlin.io.KMemberFunction1': FqName@75) = null
+    packageFragments('kotlin.io.String': FqName@76) = null
+    packageFragments('kotlin.io.Unit': FqName@77) = null
+    packageFragments('kotlin.jvm': FqName@78) = LazyJavaPackageFragment@79['jvm']
+    packageFragments('kotlin.jvm.A': FqName@80) = null
+    packageFragments('kotlin.jvm.Int': FqName@81) = null
+    packageFragments('kotlin.jvm.KMemberFunction0': FqName@82) = null
+    packageFragments('kotlin.jvm.KMemberFunction1': FqName@83) = null
+    packageFragments('kotlin.jvm.String': FqName@84) = null
+    packageFragments('kotlin.jvm.Unit': FqName@85) = null
+    packageFragments('kotlin.reflect': FqName@86) = LazyJavaPackageFragment@14['reflect']
+    packageFragments('kotlin.reflect.A': FqName@87) = null
+    packageFragments('kotlin.reflect.Int': FqName@88) = null
+    packageFragments('kotlin.reflect.KMemberFunction0': FqName@89) = null
+    packageFragments('kotlin.reflect.KMemberFunction1': FqName@90) = null
+    packageFragments('kotlin.reflect.String': FqName@91) = null
+    packageFragments('kotlin.reflect.Unit': FqName@92) = null
 }
 
 LazyJavaPackageFragment@46['<root>'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('kotlin': Name@98) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('KMemberFunction0': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('KMemberFunction1': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('kotlin': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('KMemberFunction0': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    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
 }
 
 LazyJavaPackageFragment@71['io'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    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@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    functions('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    functions('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
+    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 = HashMap@110 // through DeserializedPackageMemberScope@108
-    properties('bar': Name@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('x': Name@111) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('y': Name@112) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('z': Name@113) = EmptyList@94[empty] // 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
+    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'] {
-    _functions('lang': Name@114) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('lang': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@115
+    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
 }
 
 LazyJavaPackageFragment@79['jvm'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@118
+    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
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('io': Name@121) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('jvm': Name@122) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('reflect': Name@123) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('Any': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('ExtensionFunction0': Name@125) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('ExtensionFunction1': Name@126) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('Unit': Name@103) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('io': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('jvm': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('reflect': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    deserializedPackageScope = DeserializedPackageMemberScope@130 // through LazyPackageFragmentScopeForJavaPackage@120
-    functions('bar': Name@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    functions('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    functions('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    functions('io': Name@121) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    functions('jvm': Name@122) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    functions('reflect': Name@123) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@120
-    membersProtos = HashMap@132 // through DeserializedPackageMemberScope@130
-    properties('bar': Name@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('io': Name@121) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('jvm': Name@122) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('reflect': Name@123) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('x': Name@111) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('y': Name@112) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
-    properties('z': Name@113) = EmptyList@94[empty] // through DeserializedPackageMemberScope@130
+    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 = HashMap@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
 }
 
 LazyJavaPackageFragment@56['lang'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@133
+    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
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@135
+    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@102) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    deserializedPackageScope = Empty@105 // 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
 }
 

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

@@ -63,7 +63,7 @@ DeserializedType@22['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@34['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -73,7 +73,7 @@ DeserializedType@30['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@34['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -104,178 +104,178 @@ DeserializedType@42['kotlin.ExtensionFunction1'] {
 }
 
 LazyJavaPackageFragmentProvider@44 {
-    _packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
-    _packageFragments('A': FqName@47) = null
-    _packageFragments('B': FqName@48) = null
-    _packageFragments('Int': FqName@49) = null
-    _packageFragments('KMemberFunction0': FqName@50) = null
-    _packageFragments('KMemberFunction1': FqName@51) = null
-    _packageFragments('String': FqName@52) = null
-    _packageFragments('Unit': FqName@53) = null
-    _packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
-    _packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
-    _packageFragments('java.lang.A': FqName@58) = null
-    _packageFragments('java.lang.Int': FqName@59) = null
-    _packageFragments('java.lang.KMemberFunction0': FqName@60) = null
-    _packageFragments('java.lang.KMemberFunction1': FqName@61) = null
-    _packageFragments('java.lang.String': FqName@62) = null
-    _packageFragments('java.lang.Unit': FqName@63) = null
-    _packageFragments('kotlin': FqName@64) = LazyJavaPackageFragment@13['kotlin']
-    _packageFragments('kotlin.A': FqName@65) = null
-    _packageFragments('kotlin.Int': FqName@66) = null
-    _packageFragments('kotlin.KMemberFunction0': FqName@67) = null
-    _packageFragments('kotlin.KMemberFunction1': FqName@68) = null
-    _packageFragments('kotlin.String': FqName@69) = null
-    _packageFragments('kotlin.Unit': FqName@70) = null
-    _packageFragments('kotlin.io': FqName@71) = LazyJavaPackageFragment@72['io']
-    _packageFragments('kotlin.io.A': FqName@73) = null
-    _packageFragments('kotlin.io.Int': FqName@74) = null
-    _packageFragments('kotlin.io.KMemberFunction0': FqName@75) = null
-    _packageFragments('kotlin.io.KMemberFunction1': FqName@76) = null
-    _packageFragments('kotlin.io.String': FqName@77) = null
-    _packageFragments('kotlin.io.Unit': FqName@78) = null
-    _packageFragments('kotlin.jvm': FqName@79) = LazyJavaPackageFragment@80['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@81) = null
-    _packageFragments('kotlin.jvm.Int': FqName@82) = null
-    _packageFragments('kotlin.jvm.KMemberFunction0': FqName@83) = null
-    _packageFragments('kotlin.jvm.KMemberFunction1': FqName@84) = null
-    _packageFragments('kotlin.jvm.String': FqName@85) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@86) = null
-    _packageFragments('kotlin.reflect': FqName@87) = LazyJavaPackageFragment@14['reflect']
-    _packageFragments('kotlin.reflect.A': FqName@88) = null
-    _packageFragments('kotlin.reflect.Int': FqName@89) = null
-    _packageFragments('kotlin.reflect.KMemberFunction0': FqName@90) = null
-    _packageFragments('kotlin.reflect.KMemberFunction1': FqName@91) = null
-    _packageFragments('kotlin.reflect.String': FqName@92) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@93) = null
+    packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
+    packageFragments('A': FqName@47) = null
+    packageFragments('B': FqName@48) = null
+    packageFragments('Int': FqName@49) = null
+    packageFragments('KMemberFunction0': FqName@50) = null
+    packageFragments('KMemberFunction1': FqName@51) = null
+    packageFragments('String': FqName@52) = null
+    packageFragments('Unit': FqName@53) = null
+    packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
+    packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
+    packageFragments('java.lang.A': FqName@58) = null
+    packageFragments('java.lang.Int': FqName@59) = null
+    packageFragments('java.lang.KMemberFunction0': FqName@60) = null
+    packageFragments('java.lang.KMemberFunction1': FqName@61) = null
+    packageFragments('java.lang.String': FqName@62) = null
+    packageFragments('java.lang.Unit': FqName@63) = null
+    packageFragments('kotlin': FqName@64) = LazyJavaPackageFragment@13['kotlin']
+    packageFragments('kotlin.A': FqName@65) = null
+    packageFragments('kotlin.Int': FqName@66) = null
+    packageFragments('kotlin.KMemberFunction0': FqName@67) = null
+    packageFragments('kotlin.KMemberFunction1': FqName@68) = null
+    packageFragments('kotlin.String': FqName@69) = null
+    packageFragments('kotlin.Unit': FqName@70) = null
+    packageFragments('kotlin.io': FqName@71) = LazyJavaPackageFragment@72['io']
+    packageFragments('kotlin.io.A': FqName@73) = null
+    packageFragments('kotlin.io.Int': FqName@74) = null
+    packageFragments('kotlin.io.KMemberFunction0': FqName@75) = null
+    packageFragments('kotlin.io.KMemberFunction1': FqName@76) = null
+    packageFragments('kotlin.io.String': FqName@77) = null
+    packageFragments('kotlin.io.Unit': FqName@78) = null
+    packageFragments('kotlin.jvm': FqName@79) = LazyJavaPackageFragment@80['jvm']
+    packageFragments('kotlin.jvm.A': FqName@81) = null
+    packageFragments('kotlin.jvm.Int': FqName@82) = null
+    packageFragments('kotlin.jvm.KMemberFunction0': FqName@83) = null
+    packageFragments('kotlin.jvm.KMemberFunction1': FqName@84) = null
+    packageFragments('kotlin.jvm.String': FqName@85) = null
+    packageFragments('kotlin.jvm.Unit': FqName@86) = null
+    packageFragments('kotlin.reflect': FqName@87) = LazyJavaPackageFragment@14['reflect']
+    packageFragments('kotlin.reflect.A': FqName@88) = null
+    packageFragments('kotlin.reflect.Int': FqName@89) = null
+    packageFragments('kotlin.reflect.KMemberFunction0': FqName@90) = null
+    packageFragments('kotlin.reflect.KMemberFunction1': FqName@91) = null
+    packageFragments('kotlin.reflect.String': FqName@92) = null
+    packageFragments('kotlin.reflect.Unit': FqName@93) = null
 }
 
 LazyJavaPackageFragment@46['<root>'] {
-    _functions('bar': Name@94) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    _functions('baz': Name@97) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    _functions('foo': Name@98) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    _functions('kotlin': Name@99) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('Int': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('KMemberFunction0': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('KMemberFunction1': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('Unit': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('bar': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('baz': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('foo': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('kotlin': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@106 // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('KMemberFunction0': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('KMemberFunction1': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('String': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('Unit': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('kotlin': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('kotlin': Name@106) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@95
 }
 
 LazyJavaPackageFragment@72['io'] {
-    _functions('bar': Name@94) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    _functions('baz': Name@97) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    _functions('foo': Name@98) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Int': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Unit': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('bar': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('baz': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('foo': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('String': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('Unit': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@108
     deserializedPackageScope = DeserializedPackageMemberScope@109 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('bar': Name@94) = EmptyList@95[empty] // through DeserializedPackageMemberScope@109
-    functions('baz': Name@97) = EmptyList@95[empty] // through DeserializedPackageMemberScope@109
-    functions('foo': Name@98) = EmptyList@95[empty] // through DeserializedPackageMemberScope@109
+    functions('bar': Name@100) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
+    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@108
+    functions('baz': Name@101) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
+    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@108
+    functions('foo': Name@102) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
+    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@108
     memberIndex = computeMemberIndex$1@110 // through LazyPackageFragmentScopeForJavaPackage@108
     membersProtos = HashMap@111 // through DeserializedPackageMemberScope@109
-    properties('bar': Name@94) = EmptyList@95[empty] // through DeserializedPackageMemberScope@109
-    properties('baz': Name@97) = EmptyList@95[empty] // through DeserializedPackageMemberScope@109
-    properties('foo': Name@98) = EmptyList@95[empty] // through DeserializedPackageMemberScope@109
-    properties('x': Name@112) = EmptyList@95[empty] // through DeserializedPackageMemberScope@109
-    properties('y': Name@113) = EmptyList@95[empty] // through DeserializedPackageMemberScope@109
-    properties('z': Name@114) = EmptyList@95[empty] // through DeserializedPackageMemberScope@109
+    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'] {
-    _functions('lang': Name@115) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('lang': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    deserializedPackageScope = Empty@106 // through LazyPackageFragmentScopeForJavaPackage@116
+    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
 }
 
 LazyJavaPackageFragment@80['jvm'] {
-    _functions('bar': Name@94) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    _functions('baz': Name@97) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    _functions('foo': Name@98) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('Int': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('Unit': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('bar': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('baz': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('foo': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    deserializedPackageScope = Empty@106 // through LazyPackageFragmentScopeForJavaPackage@119
+    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
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    _functions('bar': Name@94) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    _functions('baz': Name@97) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    _functions('foo': Name@98) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    _functions('io': Name@122) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    _functions('jvm': Name@123) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    _functions('reflect': Name@124) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Any': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('ExtensionFunction0': Name@126) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('ExtensionFunction1': Name@127) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Int': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Unit': Name@104) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('bar': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('baz': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foo': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('io': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('jvm': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('reflect': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = DeserializedPackageMemberScope@131 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('bar': Name@94) = EmptyList@95[empty] // through DeserializedPackageMemberScope@131
-    functions('baz': Name@97) = EmptyList@95[empty] // through DeserializedPackageMemberScope@131
-    functions('foo': Name@98) = EmptyList@95[empty] // through DeserializedPackageMemberScope@131
-    functions('io': Name@122) = EmptyList@95[empty] // through DeserializedPackageMemberScope@131
-    functions('jvm': Name@123) = EmptyList@95[empty] // through DeserializedPackageMemberScope@131
-    functions('reflect': Name@124) = EmptyList@95[empty] // through DeserializedPackageMemberScope@131
-    memberIndex = computeMemberIndex$1@132 // through LazyPackageFragmentScopeForJavaPackage@121
-    membersProtos = HashMap@133 // through DeserializedPackageMemberScope@131
-    properties('bar': Name@94) = EmptyList@95[empty] // through DeserializedPackageMemberScope@131
-    properties('baz': Name@97) = EmptyList@95[empty] // through DeserializedPackageMemberScope@131
-    properties('foo': Name@98) = EmptyList@95[empty] // through DeserializedPackageMemberScope@131
-    properties('io': Name@122) = EmptyList@95[empty] // through DeserializedPackageMemberScope@131
-    properties('jvm': Name@123) = EmptyList@95[empty] // through DeserializedPackageMemberScope@131
-    properties('reflect': Name@124) = EmptyList@95[empty] // through DeserializedPackageMemberScope@131
-    properties('x': Name@112) = EmptyList@95[empty] // through DeserializedPackageMemberScope@131
-    properties('y': Name@113) = EmptyList@95[empty] // through DeserializedPackageMemberScope@131
-    properties('z': Name@114) = EmptyList@95[empty] // through DeserializedPackageMemberScope@131
+    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 = HashMap@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
 }
 
 LazyJavaPackageFragment@57['lang'] {
-    _functions('bar': Name@94) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    _functions('baz': Name@97) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    _functions('foo': Name@98) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('bar': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('baz': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('foo': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    deserializedPackageScope = Empty@106 // through LazyPackageFragmentScopeForJavaPackage@134
+    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
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    _functions('bar': Name@94) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    _functions('baz': Name@97) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    _functions('foo': Name@98) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Int': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    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@103) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Unit': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('bar': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('baz': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('foo': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    deserializedPackageScope = Empty@106 // 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
 }
 

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

@@ -63,12 +63,7 @@ DeserializedType@22['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,7 +73,12 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -104,171 +104,171 @@ DeserializedType@42['kotlin.ExtensionFunction1'] {
 }
 
 LazyJavaPackageFragmentProvider@44 {
-    _packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
-    _packageFragments('A': FqName@47) = null
-    _packageFragments('Int': FqName@48) = null
-    _packageFragments('KMemberFunction0': FqName@49) = null
-    _packageFragments('KMemberFunction1': FqName@50) = null
-    _packageFragments('String': FqName@51) = null
-    _packageFragments('Unit': FqName@52) = null
-    _packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    _packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    _packageFragments('java.lang.A': FqName@57) = null
-    _packageFragments('java.lang.Int': FqName@58) = null
-    _packageFragments('java.lang.KMemberFunction0': FqName@59) = null
-    _packageFragments('java.lang.KMemberFunction1': FqName@60) = null
-    _packageFragments('java.lang.String': FqName@61) = null
-    _packageFragments('java.lang.Unit': FqName@62) = null
-    _packageFragments('kotlin': FqName@63) = LazyJavaPackageFragment@13['kotlin']
-    _packageFragments('kotlin.A': FqName@64) = null
-    _packageFragments('kotlin.Int': FqName@65) = null
-    _packageFragments('kotlin.KMemberFunction0': FqName@66) = null
-    _packageFragments('kotlin.KMemberFunction1': FqName@67) = null
-    _packageFragments('kotlin.String': FqName@68) = null
-    _packageFragments('kotlin.Unit': FqName@69) = null
-    _packageFragments('kotlin.io': FqName@70) = LazyJavaPackageFragment@71['io']
-    _packageFragments('kotlin.io.A': FqName@72) = null
-    _packageFragments('kotlin.io.Int': FqName@73) = null
-    _packageFragments('kotlin.io.KMemberFunction0': FqName@74) = null
-    _packageFragments('kotlin.io.KMemberFunction1': FqName@75) = null
-    _packageFragments('kotlin.io.String': FqName@76) = null
-    _packageFragments('kotlin.io.Unit': FqName@77) = null
-    _packageFragments('kotlin.jvm': FqName@78) = LazyJavaPackageFragment@79['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@80) = null
-    _packageFragments('kotlin.jvm.Int': FqName@81) = null
-    _packageFragments('kotlin.jvm.KMemberFunction0': FqName@82) = null
-    _packageFragments('kotlin.jvm.KMemberFunction1': FqName@83) = null
-    _packageFragments('kotlin.jvm.String': FqName@84) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@85) = null
-    _packageFragments('kotlin.reflect': FqName@86) = LazyJavaPackageFragment@14['reflect']
-    _packageFragments('kotlin.reflect.A': FqName@87) = null
-    _packageFragments('kotlin.reflect.Int': FqName@88) = null
-    _packageFragments('kotlin.reflect.KMemberFunction0': FqName@89) = null
-    _packageFragments('kotlin.reflect.KMemberFunction1': FqName@90) = null
-    _packageFragments('kotlin.reflect.String': FqName@91) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@92) = null
+    packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
+    packageFragments('A': FqName@47) = null
+    packageFragments('Int': FqName@48) = null
+    packageFragments('KMemberFunction0': FqName@49) = null
+    packageFragments('KMemberFunction1': FqName@50) = null
+    packageFragments('String': FqName@51) = null
+    packageFragments('Unit': FqName@52) = null
+    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
+    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
+    packageFragments('java.lang.A': FqName@57) = null
+    packageFragments('java.lang.Int': FqName@58) = null
+    packageFragments('java.lang.KMemberFunction0': FqName@59) = null
+    packageFragments('java.lang.KMemberFunction1': FqName@60) = null
+    packageFragments('java.lang.String': FqName@61) = null
+    packageFragments('java.lang.Unit': FqName@62) = null
+    packageFragments('kotlin': FqName@63) = LazyJavaPackageFragment@13['kotlin']
+    packageFragments('kotlin.A': FqName@64) = null
+    packageFragments('kotlin.Int': FqName@65) = null
+    packageFragments('kotlin.KMemberFunction0': FqName@66) = null
+    packageFragments('kotlin.KMemberFunction1': FqName@67) = null
+    packageFragments('kotlin.String': FqName@68) = null
+    packageFragments('kotlin.Unit': FqName@69) = null
+    packageFragments('kotlin.io': FqName@70) = LazyJavaPackageFragment@71['io']
+    packageFragments('kotlin.io.A': FqName@72) = null
+    packageFragments('kotlin.io.Int': FqName@73) = null
+    packageFragments('kotlin.io.KMemberFunction0': FqName@74) = null
+    packageFragments('kotlin.io.KMemberFunction1': FqName@75) = null
+    packageFragments('kotlin.io.String': FqName@76) = null
+    packageFragments('kotlin.io.Unit': FqName@77) = null
+    packageFragments('kotlin.jvm': FqName@78) = LazyJavaPackageFragment@79['jvm']
+    packageFragments('kotlin.jvm.A': FqName@80) = null
+    packageFragments('kotlin.jvm.Int': FqName@81) = null
+    packageFragments('kotlin.jvm.KMemberFunction0': FqName@82) = null
+    packageFragments('kotlin.jvm.KMemberFunction1': FqName@83) = null
+    packageFragments('kotlin.jvm.String': FqName@84) = null
+    packageFragments('kotlin.jvm.Unit': FqName@85) = null
+    packageFragments('kotlin.reflect': FqName@86) = LazyJavaPackageFragment@14['reflect']
+    packageFragments('kotlin.reflect.A': FqName@87) = null
+    packageFragments('kotlin.reflect.Int': FqName@88) = null
+    packageFragments('kotlin.reflect.KMemberFunction0': FqName@89) = null
+    packageFragments('kotlin.reflect.KMemberFunction1': FqName@90) = null
+    packageFragments('kotlin.reflect.String': FqName@91) = null
+    packageFragments('kotlin.reflect.Unit': FqName@92) = null
 }
 
 LazyJavaPackageFragment@46['<root>'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('kotlin': Name@98) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('KMemberFunction0': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('KMemberFunction1': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('kotlin': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('KMemberFunction0': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    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
 }
 
 LazyJavaPackageFragment@71['io'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    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@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    functions('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    functions('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
+    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 = HashMap@110 // through DeserializedPackageMemberScope@108
-    properties('bar': Name@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@108
-    properties('foo': Name@97) = EmptyList@94[empty] // 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'] {
-    _functions('lang': Name@111) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('lang': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@112
+    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'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@115
+    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'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    _functions('io': Name@118) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    _functions('jvm': Name@119) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    _functions('reflect': Name@120) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('Any': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('ExtensionFunction0': Name@122) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('ExtensionFunction1': Name@123) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('String': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('Unit': Name@103) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('io': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('jvm': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('reflect': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    deserializedPackageScope = DeserializedPackageMemberScope@127 // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('bar': Name@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    functions('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    functions('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    functions('io': Name@118) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    functions('jvm': Name@119) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    functions('reflect': Name@120) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@117
-    membersProtos = HashMap@129 // through DeserializedPackageMemberScope@127
-    properties('bar': Name@93) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    properties('baz': Name@96) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    properties('foo': Name@97) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    properties('io': Name@118) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    properties('jvm': Name@119) = EmptyList@94[empty] // through DeserializedPackageMemberScope@127
-    properties('reflect': Name@120) = EmptyList@94[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 = HashMap@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'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@130
+    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'] {
-    _functions('bar': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    _functions('baz': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    _functions('foo': Name@97) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    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@102) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('baz': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    deserializedPackageScope = Empty@105 // 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
 }
 

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

@@ -30,105 +30,105 @@ DeserializedType@14['kotlin.Function0'] {
 }
 
 LazyJavaPackageFragmentProvider@16 {
-    _packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    _packageFragments('A': FqName@19) = null
-    _packageFragments('B': FqName@20) = null
-    _packageFragments('KFunction0': FqName@21) = null
-    _packageFragments('Nested': FqName@22) = null
-    _packageFragments('java': FqName@23) = LazyJavaPackageFragment@24['java']
-    _packageFragments('java.lang': FqName@25) = LazyJavaPackageFragment@26['lang']
-    _packageFragments('java.lang.A': FqName@27) = null
-    _packageFragments('java.lang.KFunction0': FqName@28) = null
-    _packageFragments('java.lang.Nested': FqName@29) = null
-    _packageFragments('kotlin': FqName@30) = LazyJavaPackageFragment@5['kotlin']
-    _packageFragments('kotlin.A': FqName@31) = null
-    _packageFragments('kotlin.KFunction0': FqName@32) = null
-    _packageFragments('kotlin.Nested': FqName@33) = null
-    _packageFragments('kotlin.io': FqName@34) = LazyJavaPackageFragment@35['io']
-    _packageFragments('kotlin.io.A': FqName@36) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@37) = null
-    _packageFragments('kotlin.io.Nested': FqName@38) = null
-    _packageFragments('kotlin.jvm': FqName@39) = LazyJavaPackageFragment@40['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@41) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@42) = null
-    _packageFragments('kotlin.jvm.Nested': FqName@43) = null
-    _packageFragments('kotlin.reflect': FqName@44) = LazyJavaPackageFragment@6['reflect']
-    _packageFragments('kotlin.reflect.KFunction0': FqName@45) = null
+    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
+    packageFragments('A': FqName@19) = null
+    packageFragments('B': FqName@20) = null
+    packageFragments('KFunction0': FqName@21) = null
+    packageFragments('Nested': FqName@22) = null
+    packageFragments('java': FqName@23) = LazyJavaPackageFragment@24['java']
+    packageFragments('java.lang': FqName@25) = LazyJavaPackageFragment@26['lang']
+    packageFragments('java.lang.A': FqName@27) = null
+    packageFragments('java.lang.KFunction0': FqName@28) = null
+    packageFragments('java.lang.Nested': FqName@29) = null
+    packageFragments('kotlin': FqName@30) = LazyJavaPackageFragment@5['kotlin']
+    packageFragments('kotlin.A': FqName@31) = null
+    packageFragments('kotlin.KFunction0': FqName@32) = null
+    packageFragments('kotlin.Nested': FqName@33) = null
+    packageFragments('kotlin.io': FqName@34) = LazyJavaPackageFragment@35['io']
+    packageFragments('kotlin.io.A': FqName@36) = null
+    packageFragments('kotlin.io.KFunction0': FqName@37) = null
+    packageFragments('kotlin.io.Nested': FqName@38) = null
+    packageFragments('kotlin.jvm': FqName@39) = LazyJavaPackageFragment@40['jvm']
+    packageFragments('kotlin.jvm.A': FqName@41) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@42) = null
+    packageFragments('kotlin.jvm.Nested': FqName@43) = null
+    packageFragments('kotlin.reflect': FqName@44) = LazyJavaPackageFragment@6['reflect']
+    packageFragments('kotlin.reflect.KFunction0': FqName@45) = null
 }
 
 LazyJavaPackageFragment@18['<root>'] {
-    _functions('Nested': Name@46) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    _functions('kotlin': Name@49) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('KFunction0': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('Nested': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('kotlin': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('KFunction0': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('kotlin': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('kotlin': Name@52) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@47
 }
 
 LazyJavaPackageFragment@35['io'] {
-    _functions('Nested': Name@46) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('Nested': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@54
     deserializedPackageScope = DeserializedPackageMemberScope@55 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('Nested': Name@46) = EmptyList@47[empty] // through DeserializedPackageMemberScope@55
+    functions('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
+    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
     memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
     membersProtos = HashMap@57 // through DeserializedPackageMemberScope@55
-    properties('Nested': Name@46) = EmptyList@47[empty] // through DeserializedPackageMemberScope@55
-    properties('x': Name@58) = EmptyList@47[empty] // through DeserializedPackageMemberScope@55
-    properties('y': Name@59) = EmptyList@47[empty] // 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'] {
-    _functions('lang': Name@60) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@61
+    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
 }
 
 LazyJavaPackageFragment@40['jvm'] {
-    _functions('Nested': Name@46) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Nested': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@64
+    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
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    _functions('Nested': Name@46) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('io': Name@67) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('jvm': Name@68) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('reflect': Name@69) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Any': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Function0': Name@71) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Nested': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('io': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('jvm': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('reflect': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = DeserializedPackageMemberScope@75 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('Nested': Name@46) = EmptyList@47[empty] // through DeserializedPackageMemberScope@75
-    functions('io': Name@67) = EmptyList@47[empty] // through DeserializedPackageMemberScope@75
-    functions('jvm': Name@68) = EmptyList@47[empty] // through DeserializedPackageMemberScope@75
-    functions('reflect': Name@69) = EmptyList@47[empty] // through DeserializedPackageMemberScope@75
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@66
-    membersProtos = HashMap@77 // through DeserializedPackageMemberScope@75
-    properties('Nested': Name@46) = EmptyList@47[empty] // through DeserializedPackageMemberScope@75
-    properties('io': Name@67) = EmptyList@47[empty] // through DeserializedPackageMemberScope@75
-    properties('jvm': Name@68) = EmptyList@47[empty] // through DeserializedPackageMemberScope@75
-    properties('reflect': Name@69) = EmptyList@47[empty] // through DeserializedPackageMemberScope@75
-    properties('x': Name@58) = EmptyList@47[empty] // through DeserializedPackageMemberScope@75
-    properties('y': Name@59) = EmptyList@47[empty] // through DeserializedPackageMemberScope@75
+    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 = HashMap@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
 }
 
 LazyJavaPackageFragment@26['lang'] {
-    _functions('Nested': Name@46) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('Nested': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@78
+    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
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    _functions('KFunction0': Name@80) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('KFunction0': Name@82) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@81
+    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
 }
 

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

@@ -30,106 +30,106 @@ DeserializedType@14['kotlin.Function0'] {
 }
 
 LazyJavaPackageFragmentProvider@16 {
-    _packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    _packageFragments('A': FqName@19) = null
-    _packageFragments('Int': FqName@20) = null
-    _packageFragments('KFunction0': FqName@21) = null
-    _packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    _packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    _packageFragments('java.lang.A': FqName@26) = null
-    _packageFragments('java.lang.Int': FqName@27) = null
-    _packageFragments('java.lang.KFunction0': FqName@28) = null
-    _packageFragments('kotlin': FqName@29) = LazyJavaPackageFragment@5['kotlin']
-    _packageFragments('kotlin.A': FqName@30) = null
-    _packageFragments('kotlin.Int': FqName@31) = null
-    _packageFragments('kotlin.KFunction0': FqName@32) = null
-    _packageFragments('kotlin.io': FqName@33) = LazyJavaPackageFragment@34['io']
-    _packageFragments('kotlin.io.A': FqName@35) = null
-    _packageFragments('kotlin.io.Int': FqName@36) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@37) = null
-    _packageFragments('kotlin.jvm': FqName@38) = LazyJavaPackageFragment@39['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@40) = null
-    _packageFragments('kotlin.jvm.Int': FqName@41) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@42) = null
-    _packageFragments('kotlin.reflect': FqName@43) = LazyJavaPackageFragment@6['reflect']
-    _packageFragments('kotlin.reflect.KFunction0': FqName@44) = null
+    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
+    packageFragments('A': FqName@19) = null
+    packageFragments('Int': FqName@20) = null
+    packageFragments('KFunction0': FqName@21) = null
+    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
+    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
+    packageFragments('java.lang.A': FqName@26) = null
+    packageFragments('java.lang.Int': FqName@27) = null
+    packageFragments('java.lang.KFunction0': FqName@28) = null
+    packageFragments('kotlin': FqName@29) = LazyJavaPackageFragment@5['kotlin']
+    packageFragments('kotlin.A': FqName@30) = null
+    packageFragments('kotlin.Int': FqName@31) = null
+    packageFragments('kotlin.KFunction0': FqName@32) = null
+    packageFragments('kotlin.io': FqName@33) = LazyJavaPackageFragment@34['io']
+    packageFragments('kotlin.io.A': FqName@35) = null
+    packageFragments('kotlin.io.Int': FqName@36) = null
+    packageFragments('kotlin.io.KFunction0': FqName@37) = null
+    packageFragments('kotlin.jvm': FqName@38) = LazyJavaPackageFragment@39['jvm']
+    packageFragments('kotlin.jvm.A': FqName@40) = null
+    packageFragments('kotlin.jvm.Int': FqName@41) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@42) = null
+    packageFragments('kotlin.reflect': FqName@43) = LazyJavaPackageFragment@6['reflect']
+    packageFragments('kotlin.reflect.KFunction0': FqName@44) = null
 }
 
 LazyJavaPackageFragment@18['<root>'] {
-    _functions('Nested': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    _functions('kotlin': Name@48) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('Int': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('KFunction0': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('Nested': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('kotlin': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('Int': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('KFunction0': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('kotlin': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('kotlin': Name@52) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@46
 }
 
 LazyJavaPackageFragment@34['io'] {
-    _functions('Nested': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('Int': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('Nested': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('Int': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@54
     deserializedPackageScope = DeserializedPackageMemberScope@55 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('Nested': Name@45) = EmptyList@46[empty] // through DeserializedPackageMemberScope@55
+    functions('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
+    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
     memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
     membersProtos = HashMap@57 // through DeserializedPackageMemberScope@55
-    properties('Nested': Name@45) = EmptyList@46[empty] // through DeserializedPackageMemberScope@55
-    properties('y': Name@58) = EmptyList@46[empty] // 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'] {
-    _functions('lang': Name@59) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('lang': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@60
+    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
 }
 
 LazyJavaPackageFragment@39['jvm'] {
-    _functions('Nested': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('Int': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('Nested': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@63
+    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
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    _functions('Nested': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    _functions('io': Name@66) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    _functions('jvm': Name@67) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    _functions('reflect': Name@68) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Any': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Function0': Name@70) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Int': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Nested': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('io': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('jvm': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('reflect': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = DeserializedPackageMemberScope@74 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('Nested': Name@45) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    functions('io': Name@66) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    functions('jvm': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    functions('reflect': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@65
-    membersProtos = HashMap@76 // through DeserializedPackageMemberScope@74
-    properties('Nested': Name@45) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    properties('io': Name@66) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    properties('jvm': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    properties('reflect': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
-    properties('y': Name@58) = EmptyList@46[empty] // through DeserializedPackageMemberScope@74
+    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 = HashMap@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
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    _functions('Nested': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('Nested': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@77
+    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
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    _functions('KFunction0': Name@79) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('KFunction0': Name@81) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@80
+    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
 }
 

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

@@ -30,65 +30,65 @@ DeserializedType@14['kotlin.Function0'] {
 }
 
 LazyJavaPackageFragmentProvider@16 {
-    _packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    _packageFragments('A': FqName@19) = null
-    _packageFragments('KFunction0': FqName@20) = null
-    _packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
-    _packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
-    _packageFragments('java.lang.A': FqName@25) = null
-    _packageFragments('java.lang.KFunction0': FqName@26) = null
-    _packageFragments('kotlin': FqName@27) = LazyJavaPackageFragment@5['kotlin']
-    _packageFragments('kotlin.A': FqName@28) = null
-    _packageFragments('kotlin.KFunction0': FqName@29) = null
-    _packageFragments('kotlin.io': FqName@30) = LazyJavaPackageFragment@31['io']
-    _packageFragments('kotlin.io.A': FqName@32) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@33) = null
-    _packageFragments('kotlin.jvm': FqName@34) = LazyJavaPackageFragment@35['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@36) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@37) = null
-    _packageFragments('kotlin.reflect': FqName@38) = LazyJavaPackageFragment@6['reflect']
-    _packageFragments('kotlin.reflect.KFunction0': FqName@39) = null
+    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
+    packageFragments('A': FqName@19) = null
+    packageFragments('KFunction0': FqName@20) = null
+    packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
+    packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
+    packageFragments('java.lang.A': FqName@25) = null
+    packageFragments('java.lang.KFunction0': FqName@26) = null
+    packageFragments('kotlin': FqName@27) = LazyJavaPackageFragment@5['kotlin']
+    packageFragments('kotlin.A': FqName@28) = null
+    packageFragments('kotlin.KFunction0': FqName@29) = null
+    packageFragments('kotlin.io': FqName@30) = LazyJavaPackageFragment@31['io']
+    packageFragments('kotlin.io.A': FqName@32) = null
+    packageFragments('kotlin.io.KFunction0': FqName@33) = null
+    packageFragments('kotlin.jvm': FqName@34) = LazyJavaPackageFragment@35['jvm']
+    packageFragments('kotlin.jvm.A': FqName@36) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@37) = null
+    packageFragments('kotlin.reflect': FqName@38) = LazyJavaPackageFragment@6['reflect']
+    packageFragments('kotlin.reflect.KFunction0': FqName@39) = null
 }
 
 LazyJavaPackageFragment@18['<root>'] {
-    _functions('kotlin': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('KFunction0': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('kotlin': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('KFunction0': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('kotlin': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('kotlin': Name@44) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@41
 }
 
 LazyJavaPackageFragment@22['java'] {
-    _functions('lang': Name@47) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('lang': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('lang': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('lang': Name@49) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
     memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    _functions('io': Name@51) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    _functions('jvm': Name@53) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    _functions('reflect': Name@54) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('Any': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('Function0': Name@56) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('io': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('jvm': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('reflect': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = DeserializedPackageMemberScope@60 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('io': Name@51) = EmptyList@41[empty] // through DeserializedPackageMemberScope@60
-    functions('jvm': Name@53) = EmptyList@41[empty] // through DeserializedPackageMemberScope@60
-    functions('reflect': Name@54) = EmptyList@41[empty] // through DeserializedPackageMemberScope@60
+    classes('Any': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('Function0': Name@53) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('io': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('jvm': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('reflect': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    deserializedPackageScope = DeserializedPackageMemberScope@57 // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('io': Name@58) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
+    functions('io': Name@58) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('jvm': Name@59) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
+    functions('jvm': Name@59) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('reflect': Name@60) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
+    functions('reflect': Name@60) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@52
     memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@52
-    membersProtos = HashMap@62 // through DeserializedPackageMemberScope@60
-    properties('io': Name@51) = EmptyList@41[empty] // through DeserializedPackageMemberScope@60
-    properties('jvm': Name@53) = EmptyList@41[empty] // through DeserializedPackageMemberScope@60
-    properties('reflect': Name@54) = EmptyList@41[empty] // through DeserializedPackageMemberScope@60
+    membersProtos = HashMap@62 // through DeserializedPackageMemberScope@57
+    properties('io': Name@58) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
+    properties('jvm': Name@59) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
+    properties('reflect': Name@60) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    _functions('KFunction0': Name@63) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('KFunction0': Name@65) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('KFunction0': Name@63) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('KFunction0': Name@65) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@64
     memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@64
 }
 

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

@@ -29,70 +29,70 @@ DeserializedType@13['kotlin.Function0'] {
 }
 
 LazyJavaPackageFragmentProvider@15 {
-    _packageFragments('<root>': FqName@16) = LazyJavaPackageFragment@17['<root>']
-    _packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    _packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    _packageFragments('kotlin': FqName@22) = LazyJavaPackageFragment@7['kotlin']
-    _packageFragments('kotlin.io': FqName@23) = LazyJavaPackageFragment@24['io']
-    _packageFragments('kotlin.jvm': FqName@25) = LazyJavaPackageFragment@26['jvm']
-    _packageFragments('kotlin.reflect': FqName@27) = LazyJavaPackageFragment@8['reflect']
+    packageFragments('<root>': FqName@16) = LazyJavaPackageFragment@17['<root>']
+    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
+    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
+    packageFragments('kotlin': FqName@22) = LazyJavaPackageFragment@7['kotlin']
+    packageFragments('kotlin.io': FqName@23) = LazyJavaPackageFragment@24['io']
+    packageFragments('kotlin.jvm': FqName@25) = LazyJavaPackageFragment@26['jvm']
+    packageFragments('kotlin.reflect': FqName@27) = LazyJavaPackageFragment@8['reflect']
 }
 
 LazyJavaPackageFragment@17['<root>'] {
-    _functions('bar': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('bar': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('bar': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('bar': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@29
 }
 
 LazyJavaPackageFragment@24['io'] {
-    _functions('bar': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     classes('bar': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@33
     deserializedPackageScope = DeserializedPackageMemberScope@34 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('bar': Name@28) = EmptyList@29[empty] // through DeserializedPackageMemberScope@34
+    functions('bar': Name@28) = EmptyList@31[empty] // through DeserializedPackageMemberScope@34
+    functions('bar': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
     membersProtos = HashMap@36 // through DeserializedPackageMemberScope@34
-    properties('bar': Name@28) = EmptyList@29[empty] // through DeserializedPackageMemberScope@34
+    properties('bar': Name@28) = EmptyList@31[empty] // through DeserializedPackageMemberScope@34
 }
 
 LazyJavaPackageFragment@19['java'] {
-    _functions('lang': Name@37) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('lang': Name@39) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@38
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
 }
 
 LazyJavaPackageFragment@26['jvm'] {
-    _functions('bar': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@41
     classes('bar': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('bar': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@41
     memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    _functions('bar': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    _functions('io': Name@44) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    _functions('jvm': Name@45) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('Any': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('Function0': Name@47) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('bar': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('io': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('jvm': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = DeserializedPackageMemberScope@50 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('bar': Name@28) = EmptyList@29[empty] // through DeserializedPackageMemberScope@50
-    functions('io': Name@44) = EmptyList@29[empty] // through DeserializedPackageMemberScope@50
-    functions('jvm': Name@45) = EmptyList@29[empty] // through DeserializedPackageMemberScope@50
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@43
-    membersProtos = HashMap@52 // through DeserializedPackageMemberScope@50
-    properties('bar': Name@28) = EmptyList@29[empty] // through DeserializedPackageMemberScope@50
-    properties('io': Name@44) = EmptyList@29[empty] // through DeserializedPackageMemberScope@50
-    properties('jvm': Name@45) = EmptyList@29[empty] // through DeserializedPackageMemberScope@50
+    classes('Any': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('Function0': Name@45) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('bar': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('io': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('jvm': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = DeserializedPackageMemberScope@48 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('bar': Name@28) = EmptyList@31[empty] // through DeserializedPackageMemberScope@48
+    functions('bar': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('io': Name@49) = EmptyList@31[empty] // through DeserializedPackageMemberScope@48
+    functions('io': Name@49) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('jvm': Name@50) = EmptyList@31[empty] // through DeserializedPackageMemberScope@48
+    functions('jvm': Name@50) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@44
+    membersProtos = HashMap@52 // through DeserializedPackageMemberScope@48
+    properties('bar': Name@28) = EmptyList@31[empty] // through DeserializedPackageMemberScope@48
+    properties('io': Name@49) = EmptyList@31[empty] // through DeserializedPackageMemberScope@48
+    properties('jvm': Name@50) = EmptyList@31[empty] // through DeserializedPackageMemberScope@48
 }
 
 LazyJavaPackageFragment@21['lang'] {
-    _functions('bar': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@53
     classes('bar': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@53
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@53
+    functions('bar': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@53
     memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@53
 }
 

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

@@ -26,12 +26,12 @@ DeserializedTypeParameterDescriptor@13['T'] {
     upperBoundsAsType = DeserializedType@16['kotlin.Any']
 }
 
-DeserializedType@12['kotlin.Any'] {
+DeserializedType@16['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@17
     memberScope = DeserializedClassMemberScope@18
 }
 
-DeserializedType@16['kotlin.Any'] {
+DeserializedType@12['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@17
     memberScope = DeserializedClassMemberScope@18
 }
@@ -45,104 +45,104 @@ DeserializedType@20['kotlin.ExtensionFunction0'] {
 }
 
 LazyJavaPackageFragmentProvider@22 {
-    _packageFragments('<root>': FqName@23) = LazyJavaPackageFragment@24['<root>']
-    _packageFragments('A': FqName@25) = null
-    _packageFragments('Int': FqName@26) = null
-    _packageFragments('KMemberFunction0': FqName@27) = null
-    _packageFragments('java': FqName@28) = LazyJavaPackageFragment@29['java']
-    _packageFragments('java.lang': FqName@30) = LazyJavaPackageFragment@31['lang']
-    _packageFragments('java.lang.A': FqName@32) = null
-    _packageFragments('java.lang.Int': FqName@33) = null
-    _packageFragments('java.lang.KMemberFunction0': FqName@34) = null
-    _packageFragments('kotlin': FqName@35) = LazyJavaPackageFragment@7['kotlin']
-    _packageFragments('kotlin.A': FqName@36) = null
-    _packageFragments('kotlin.Int': FqName@37) = null
-    _packageFragments('kotlin.KMemberFunction0': FqName@38) = null
-    _packageFragments('kotlin.io': FqName@39) = LazyJavaPackageFragment@40['io']
-    _packageFragments('kotlin.io.A': FqName@41) = null
-    _packageFragments('kotlin.io.Int': FqName@42) = null
-    _packageFragments('kotlin.io.KMemberFunction0': FqName@43) = null
-    _packageFragments('kotlin.jvm': FqName@44) = LazyJavaPackageFragment@45['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@46) = null
-    _packageFragments('kotlin.jvm.Int': FqName@47) = null
-    _packageFragments('kotlin.jvm.KMemberFunction0': FqName@48) = null
-    _packageFragments('kotlin.reflect': FqName@49) = LazyJavaPackageFragment@8['reflect']
-    _packageFragments('kotlin.reflect.KMemberFunction0': FqName@50) = null
+    packageFragments('<root>': FqName@23) = LazyJavaPackageFragment@24['<root>']
+    packageFragments('A': FqName@25) = null
+    packageFragments('Int': FqName@26) = null
+    packageFragments('KMemberFunction0': FqName@27) = null
+    packageFragments('java': FqName@28) = LazyJavaPackageFragment@29['java']
+    packageFragments('java.lang': FqName@30) = LazyJavaPackageFragment@31['lang']
+    packageFragments('java.lang.A': FqName@32) = null
+    packageFragments('java.lang.Int': FqName@33) = null
+    packageFragments('java.lang.KMemberFunction0': FqName@34) = null
+    packageFragments('kotlin': FqName@35) = LazyJavaPackageFragment@7['kotlin']
+    packageFragments('kotlin.A': FqName@36) = null
+    packageFragments('kotlin.Int': FqName@37) = null
+    packageFragments('kotlin.KMemberFunction0': FqName@38) = null
+    packageFragments('kotlin.io': FqName@39) = LazyJavaPackageFragment@40['io']
+    packageFragments('kotlin.io.A': FqName@41) = null
+    packageFragments('kotlin.io.Int': FqName@42) = null
+    packageFragments('kotlin.io.KMemberFunction0': FqName@43) = null
+    packageFragments('kotlin.jvm': FqName@44) = LazyJavaPackageFragment@45['jvm']
+    packageFragments('kotlin.jvm.A': FqName@46) = null
+    packageFragments('kotlin.jvm.Int': FqName@47) = null
+    packageFragments('kotlin.jvm.KMemberFunction0': FqName@48) = null
+    packageFragments('kotlin.reflect': FqName@49) = LazyJavaPackageFragment@8['reflect']
+    packageFragments('kotlin.reflect.KMemberFunction0': FqName@50) = null
 }
 
 LazyJavaPackageFragment@24['<root>'] {
-    _functions('foo': Name@51) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    _functions('kotlin': Name@54) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('Int': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('KMemberFunction0': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('foo': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('kotlin': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@53
+    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
 }
 
 LazyJavaPackageFragment@40['io'] {
-    _functions('foo': Name@51) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('Int': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('foo': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@60
+    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@51) = EmptyList@52[empty] // through DeserializedPackageMemberScope@61
+    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 = HashMap@63 // through DeserializedPackageMemberScope@61
-    properties('foo': Name@51) = EmptyList@52[empty] // through DeserializedPackageMemberScope@61
+    properties('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@61
 }
 
 LazyJavaPackageFragment@29['java'] {
-    _functions('lang': Name@64) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@65
+    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
 }
 
 LazyJavaPackageFragment@45['jvm'] {
-    _functions('foo': Name@51) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('Int': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('foo': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@68
+    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
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    _functions('foo': Name@51) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    _functions('io': Name@71) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    _functions('jvm': Name@72) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    _functions('reflect': Name@73) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('Any': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('ExtensionFunction0': Name@75) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('Int': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('foo': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('io': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('jvm': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('reflect': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = DeserializedPackageMemberScope@79 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('foo': Name@51) = EmptyList@52[empty] // through DeserializedPackageMemberScope@79
-    functions('io': Name@71) = EmptyList@52[empty] // through DeserializedPackageMemberScope@79
-    functions('jvm': Name@72) = EmptyList@52[empty] // through DeserializedPackageMemberScope@79
-    functions('reflect': Name@73) = EmptyList@52[empty] // through DeserializedPackageMemberScope@79
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@70
-    membersProtos = HashMap@81 // through DeserializedPackageMemberScope@79
-    properties('foo': Name@51) = EmptyList@52[empty] // through DeserializedPackageMemberScope@79
-    properties('io': Name@71) = EmptyList@52[empty] // through DeserializedPackageMemberScope@79
-    properties('jvm': Name@72) = EmptyList@52[empty] // through DeserializedPackageMemberScope@79
-    properties('reflect': Name@73) = EmptyList@52[empty] // through DeserializedPackageMemberScope@79
+    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 = HashMap@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'] {
-    _functions('foo': Name@51) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('foo': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@58 // 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
 }
 
 LazyJavaPackageFragment@8['reflect'] {
-    _functions('KMemberFunction0': Name@84) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('KMemberFunction0': Name@86) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@85
+    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
 }
 

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

@@ -27,12 +27,12 @@ DeserializedTypeParameterDescriptor@13['T'] {
     upperBoundsAsType = DeserializedType@16['kotlin.Any']
 }
 
-DeserializedType@12['kotlin.Any'] {
+DeserializedType@16['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@17
     memberScope = DeserializedClassMemberScope@18
 }
 
-DeserializedType@16['kotlin.Any'] {
+DeserializedType@12['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@17
     memberScope = DeserializedClassMemberScope@18
 }
@@ -50,106 +50,106 @@ DeserializedType@21['kotlin.ExtensionFunction0'] {
 }
 
 LazyJavaPackageFragmentProvider@23 {
-    _packageFragments('<root>': FqName@24) = LazyJavaPackageFragment@25['<root>']
-    _packageFragments('A': FqName@26) = null
-    _packageFragments('KMemberFunction0': FqName@27) = null
-    _packageFragments('Unit': FqName@28) = null
-    _packageFragments('java': FqName@29) = LazyJavaPackageFragment@30['java']
-    _packageFragments('java.lang': FqName@31) = LazyJavaPackageFragment@32['lang']
-    _packageFragments('java.lang.A': FqName@33) = null
-    _packageFragments('java.lang.KMemberFunction0': FqName@34) = null
-    _packageFragments('java.lang.Unit': FqName@35) = null
-    _packageFragments('kotlin': FqName@36) = LazyJavaPackageFragment@7['kotlin']
-    _packageFragments('kotlin.A': FqName@37) = null
-    _packageFragments('kotlin.KMemberFunction0': FqName@38) = null
-    _packageFragments('kotlin.Unit': FqName@39) = null
-    _packageFragments('kotlin.io': FqName@40) = LazyJavaPackageFragment@41['io']
-    _packageFragments('kotlin.io.A': FqName@42) = null
-    _packageFragments('kotlin.io.KMemberFunction0': FqName@43) = null
-    _packageFragments('kotlin.io.Unit': FqName@44) = null
-    _packageFragments('kotlin.jvm': FqName@45) = LazyJavaPackageFragment@46['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@47) = null
-    _packageFragments('kotlin.jvm.KMemberFunction0': FqName@48) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@49) = null
-    _packageFragments('kotlin.reflect': FqName@50) = LazyJavaPackageFragment@8['reflect']
-    _packageFragments('kotlin.reflect.KMemberFunction0': FqName@51) = null
+    packageFragments('<root>': FqName@24) = LazyJavaPackageFragment@25['<root>']
+    packageFragments('A': FqName@26) = null
+    packageFragments('KMemberFunction0': FqName@27) = null
+    packageFragments('Unit': FqName@28) = null
+    packageFragments('java': FqName@29) = LazyJavaPackageFragment@30['java']
+    packageFragments('java.lang': FqName@31) = LazyJavaPackageFragment@32['lang']
+    packageFragments('java.lang.A': FqName@33) = null
+    packageFragments('java.lang.KMemberFunction0': FqName@34) = null
+    packageFragments('java.lang.Unit': FqName@35) = null
+    packageFragments('kotlin': FqName@36) = LazyJavaPackageFragment@7['kotlin']
+    packageFragments('kotlin.A': FqName@37) = null
+    packageFragments('kotlin.KMemberFunction0': FqName@38) = null
+    packageFragments('kotlin.Unit': FqName@39) = null
+    packageFragments('kotlin.io': FqName@40) = LazyJavaPackageFragment@41['io']
+    packageFragments('kotlin.io.A': FqName@42) = null
+    packageFragments('kotlin.io.KMemberFunction0': FqName@43) = null
+    packageFragments('kotlin.io.Unit': FqName@44) = null
+    packageFragments('kotlin.jvm': FqName@45) = LazyJavaPackageFragment@46['jvm']
+    packageFragments('kotlin.jvm.A': FqName@47) = null
+    packageFragments('kotlin.jvm.KMemberFunction0': FqName@48) = null
+    packageFragments('kotlin.jvm.Unit': FqName@49) = null
+    packageFragments('kotlin.reflect': FqName@50) = LazyJavaPackageFragment@8['reflect']
+    packageFragments('kotlin.reflect.KMemberFunction0': FqName@51) = null
 }
 
 LazyJavaPackageFragment@25['<root>'] {
-    _functions('foo': Name@52) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    _functions('kotlin': Name@55) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('KMemberFunction0': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('Unit': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('foo': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('kotlin': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('KMemberFunction0': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
+    classes('Unit': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@53
+    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@53
+    classes('kotlin': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@53
+    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@53
+    functions('foo': Name@55) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@53
+    functions('kotlin': Name@59) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@53
+    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@53
 }
 
 LazyJavaPackageFragment@41['io'] {
-    _functions('foo': Name@52) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('Unit': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('foo': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('Unit': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@61
     deserializedPackageScope = DeserializedPackageMemberScope@62 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('foo': Name@52) = EmptyList@53[empty] // through DeserializedPackageMemberScope@62
+    functions('foo': Name@55) = EmptyList@58[empty] // through DeserializedPackageMemberScope@62
+    functions('foo': Name@55) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@61
     memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
     membersProtos = HashMap@64 // through DeserializedPackageMemberScope@62
-    properties('foo': Name@52) = EmptyList@53[empty] // through DeserializedPackageMemberScope@62
-    properties('x': Name@65) = EmptyList@53[empty] // 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'] {
-    _functions('lang': Name@66) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('lang': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@67
+    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
 }
 
 LazyJavaPackageFragment@46['jvm'] {
-    _functions('foo': Name@52) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('Unit': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('foo': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@70
+    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
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    _functions('foo': Name@52) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    _functions('io': Name@73) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    _functions('jvm': Name@74) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    _functions('reflect': Name@75) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('Any': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('ExtensionFunction0': Name@77) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('Unit': Name@57) = DeserializedClassDescriptor@6['Unit'] // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('foo': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('io': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('jvm': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('reflect': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = DeserializedPackageMemberScope@81 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('foo': Name@52) = EmptyList@53[empty] // through DeserializedPackageMemberScope@81
-    functions('io': Name@73) = EmptyList@53[empty] // through DeserializedPackageMemberScope@81
-    functions('jvm': Name@74) = EmptyList@53[empty] // through DeserializedPackageMemberScope@81
-    functions('reflect': Name@75) = EmptyList@53[empty] // through DeserializedPackageMemberScope@81
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@72
-    membersProtos = HashMap@83 // through DeserializedPackageMemberScope@81
-    properties('foo': Name@52) = EmptyList@53[empty] // through DeserializedPackageMemberScope@81
-    properties('io': Name@73) = EmptyList@53[empty] // through DeserializedPackageMemberScope@81
-    properties('jvm': Name@74) = EmptyList@53[empty] // through DeserializedPackageMemberScope@81
-    properties('reflect': Name@75) = EmptyList@53[empty] // through DeserializedPackageMemberScope@81
-    properties('x': Name@65) = EmptyList@53[empty] // through DeserializedPackageMemberScope@81
+    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 = HashMap@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
 }
 
 LazyJavaPackageFragment@32['lang'] {
-    _functions('foo': Name@52) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('foo': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@84
+    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
 }
 
 LazyJavaPackageFragment@8['reflect'] {
-    _functions('KMemberFunction0': Name@86) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('KMemberFunction0': Name@88) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@87
+    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
 }
 

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

@@ -73,7 +73,7 @@ DeserializedTypeParameterDescriptor@39['T'] {
     upperBoundsAsType = DeserializedType@42['kotlin.Any']
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@43
     memberScope = DeserializedClassMemberScope@44
 }
@@ -83,7 +83,7 @@ DeserializedType@42['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@44
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@34['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@43
     memberScope = DeserializedClassMemberScope@44
 }
@@ -98,7 +98,7 @@ DeserializedType@38['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@44
 }
 
-DeserializedType@34['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@43
     memberScope = DeserializedClassMemberScope@44
 }
@@ -132,193 +132,193 @@ DeserializedType@53['kotlin.Function0'] {
 }
 
 LazyJavaPackageFragmentProvider@55 {
-    _packageFragments('<root>': FqName@56) = LazyJavaPackageFragment@57['<root>']
-    _packageFragments('A': FqName@58) = null
-    _packageFragments('AA': FqName@59) = null
-    _packageFragments('Int': FqName@60) = null
-    _packageFragments('KExtensionFunction1': FqName@61) = null
-    _packageFragments('KFunction0': FqName@62) = null
-    _packageFragments('KMemberFunction0': FqName@63) = null
-    _packageFragments('String': FqName@64) = null
-    _packageFragments('Unit': FqName@65) = null
-    _packageFragments('java': FqName@66) = LazyJavaPackageFragment@67['java']
-    _packageFragments('java.lang': FqName@68) = LazyJavaPackageFragment@69['lang']
-    _packageFragments('java.lang.A': FqName@70) = null
-    _packageFragments('java.lang.AA': FqName@71) = null
-    _packageFragments('java.lang.Int': FqName@72) = null
-    _packageFragments('java.lang.KExtensionFunction1': FqName@73) = null
-    _packageFragments('java.lang.KFunction0': FqName@74) = null
-    _packageFragments('java.lang.KMemberFunction0': FqName@75) = null
-    _packageFragments('java.lang.String': FqName@76) = null
-    _packageFragments('java.lang.Unit': FqName@77) = null
-    _packageFragments('kotlin': FqName@78) = LazyJavaPackageFragment@17['kotlin']
-    _packageFragments('kotlin.A': FqName@79) = null
-    _packageFragments('kotlin.AA': FqName@80) = null
-    _packageFragments('kotlin.Int': FqName@81) = null
-    _packageFragments('kotlin.KExtensionFunction1': FqName@82) = null
-    _packageFragments('kotlin.KFunction0': FqName@83) = null
-    _packageFragments('kotlin.KMemberFunction0': FqName@84) = null
-    _packageFragments('kotlin.String': FqName@85) = null
-    _packageFragments('kotlin.Unit': FqName@86) = null
-    _packageFragments('kotlin.io': FqName@87) = LazyJavaPackageFragment@88['io']
-    _packageFragments('kotlin.io.A': FqName@89) = null
-    _packageFragments('kotlin.io.AA': FqName@90) = null
-    _packageFragments('kotlin.io.Int': FqName@91) = null
-    _packageFragments('kotlin.io.KExtensionFunction1': FqName@92) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@93) = null
-    _packageFragments('kotlin.io.KMemberFunction0': FqName@94) = null
-    _packageFragments('kotlin.io.String': FqName@95) = null
-    _packageFragments('kotlin.io.Unit': FqName@96) = null
-    _packageFragments('kotlin.jvm': FqName@97) = LazyJavaPackageFragment@98['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@99) = null
-    _packageFragments('kotlin.jvm.AA': FqName@100) = null
-    _packageFragments('kotlin.jvm.Int': FqName@101) = null
-    _packageFragments('kotlin.jvm.KExtensionFunction1': FqName@102) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@103) = null
-    _packageFragments('kotlin.jvm.KMemberFunction0': FqName@104) = null
-    _packageFragments('kotlin.jvm.String': FqName@105) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@106) = null
-    _packageFragments('kotlin.reflect': FqName@107) = LazyJavaPackageFragment@18['reflect']
-    _packageFragments('kotlin.reflect.AA': FqName@108) = null
-    _packageFragments('kotlin.reflect.Int': FqName@109) = null
-    _packageFragments('kotlin.reflect.KExtensionFunction1': FqName@110) = null
-    _packageFragments('kotlin.reflect.KFunction0': FqName@111) = null
-    _packageFragments('kotlin.reflect.KMemberFunction0': FqName@112) = null
-    _packageFragments('kotlin.reflect.String': FqName@113) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@114) = null
-    _packageFragments('other': FqName@115) = null
-    _packageFragments('other.A': FqName@116) = null
-    _packageFragments('other.String': FqName@117) = null
-    _packageFragments('other.baz': FqName@118) = null
-    _packageFragments('other.foo': FqName@119) = null
+    packageFragments('<root>': FqName@56) = LazyJavaPackageFragment@57['<root>']
+    packageFragments('A': FqName@58) = null
+    packageFragments('AA': FqName@59) = null
+    packageFragments('Int': FqName@60) = null
+    packageFragments('KExtensionFunction1': FqName@61) = null
+    packageFragments('KFunction0': FqName@62) = null
+    packageFragments('KMemberFunction0': FqName@63) = null
+    packageFragments('String': FqName@64) = null
+    packageFragments('Unit': FqName@65) = null
+    packageFragments('java': FqName@66) = LazyJavaPackageFragment@67['java']
+    packageFragments('java.lang': FqName@68) = LazyJavaPackageFragment@69['lang']
+    packageFragments('java.lang.A': FqName@70) = null
+    packageFragments('java.lang.AA': FqName@71) = null
+    packageFragments('java.lang.Int': FqName@72) = null
+    packageFragments('java.lang.KExtensionFunction1': FqName@73) = null
+    packageFragments('java.lang.KFunction0': FqName@74) = null
+    packageFragments('java.lang.KMemberFunction0': FqName@75) = null
+    packageFragments('java.lang.String': FqName@76) = null
+    packageFragments('java.lang.Unit': FqName@77) = null
+    packageFragments('kotlin': FqName@78) = LazyJavaPackageFragment@17['kotlin']
+    packageFragments('kotlin.A': FqName@79) = null
+    packageFragments('kotlin.AA': FqName@80) = null
+    packageFragments('kotlin.Int': FqName@81) = null
+    packageFragments('kotlin.KExtensionFunction1': FqName@82) = null
+    packageFragments('kotlin.KFunction0': FqName@83) = null
+    packageFragments('kotlin.KMemberFunction0': FqName@84) = null
+    packageFragments('kotlin.String': FqName@85) = null
+    packageFragments('kotlin.Unit': FqName@86) = null
+    packageFragments('kotlin.io': FqName@87) = LazyJavaPackageFragment@88['io']
+    packageFragments('kotlin.io.A': FqName@89) = null
+    packageFragments('kotlin.io.AA': FqName@90) = null
+    packageFragments('kotlin.io.Int': FqName@91) = null
+    packageFragments('kotlin.io.KExtensionFunction1': FqName@92) = null
+    packageFragments('kotlin.io.KFunction0': FqName@93) = null
+    packageFragments('kotlin.io.KMemberFunction0': FqName@94) = null
+    packageFragments('kotlin.io.String': FqName@95) = null
+    packageFragments('kotlin.io.Unit': FqName@96) = null
+    packageFragments('kotlin.jvm': FqName@97) = LazyJavaPackageFragment@98['jvm']
+    packageFragments('kotlin.jvm.A': FqName@99) = null
+    packageFragments('kotlin.jvm.AA': FqName@100) = null
+    packageFragments('kotlin.jvm.Int': FqName@101) = null
+    packageFragments('kotlin.jvm.KExtensionFunction1': FqName@102) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@103) = null
+    packageFragments('kotlin.jvm.KMemberFunction0': FqName@104) = null
+    packageFragments('kotlin.jvm.String': FqName@105) = null
+    packageFragments('kotlin.jvm.Unit': FqName@106) = null
+    packageFragments('kotlin.reflect': FqName@107) = LazyJavaPackageFragment@18['reflect']
+    packageFragments('kotlin.reflect.AA': FqName@108) = null
+    packageFragments('kotlin.reflect.Int': FqName@109) = null
+    packageFragments('kotlin.reflect.KExtensionFunction1': FqName@110) = null
+    packageFragments('kotlin.reflect.KFunction0': FqName@111) = null
+    packageFragments('kotlin.reflect.KMemberFunction0': FqName@112) = null
+    packageFragments('kotlin.reflect.String': FqName@113) = null
+    packageFragments('kotlin.reflect.Unit': FqName@114) = null
+    packageFragments('other': FqName@115) = null
+    packageFragments('other.A': FqName@116) = null
+    packageFragments('other.String': FqName@117) = null
+    packageFragments('other.baz': FqName@118) = null
+    packageFragments('other.foo': FqName@119) = null
 }
 
 LazyJavaPackageFragment@57['<root>'] {
-    _functions('bar': Name@120) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    _functions('bazbaz': Name@123) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    _functions('foofoo': Name@124) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    _functions('kotlin': Name@125) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    _functions('other': Name@126) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('AA': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('Int': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('KExtensionFunction1': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('KFunction0': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('KMemberFunction0': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('String': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('Unit': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('bar': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('bazbaz': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('foofoo': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('kotlin': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('other': Name@135) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    deserializedPackageScope = Empty@136 // through LazyPackageFragmentScopeForJavaPackage@122
-    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('AA': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('KExtensionFunction1': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('KFunction0': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    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
 }
 
 LazyJavaPackageFragment@88['io'] {
-    _functions('bar': Name@120) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    _functions('bazbaz': Name@123) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    _functions('foofoo': Name@124) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('Int': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@138
     classes('String': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('Unit': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('bar': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('bazbaz': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('foofoo': Name@124) = 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@120) = EmptyList@121[empty] // through DeserializedPackageMemberScope@140
-    functions('bazbaz': Name@123) = EmptyList@121[empty] // through DeserializedPackageMemberScope@140
-    functions('foofoo': Name@124) = EmptyList@121[empty] // through DeserializedPackageMemberScope@140
+    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 = HashMap@142 // through DeserializedPackageMemberScope@140
-    properties('bar': Name@120) = EmptyList@121[empty] // through DeserializedPackageMemberScope@140
-    properties('bazbaz': Name@123) = EmptyList@121[empty] // through DeserializedPackageMemberScope@140
-    properties('foofoo': Name@124) = EmptyList@121[empty] // 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
 }
 
 LazyJavaPackageFragment@67['java'] {
-    _functions('lang': Name@143) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@144
-    classes('lang': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@144
-    deserializedPackageScope = Empty@136 // through LazyPackageFragmentScopeForJavaPackage@144
+    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
 }
 
 LazyJavaPackageFragment@98['jvm'] {
-    _functions('bar': Name@120) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    _functions('bazbaz': Name@123) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    _functions('foofoo': Name@124) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('Int': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@147
+    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@147
     classes('String': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('Unit': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('bar': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('bazbaz': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('foofoo': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    deserializedPackageScope = Empty@136 // 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
 }
 
 LazyJavaPackageFragment@17['kotlin'] {
-    _functions('bar': Name@120) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    _functions('bazbaz': Name@123) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    _functions('foofoo': Name@124) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    _functions('io': Name@150) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    _functions('jvm': Name@151) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    _functions('reflect': Name@152) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('Any': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('ExtensionFunction0': Name@154) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('ExtensionFunction1': Name@155) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('Function0': Name@156) = DeserializedClassDescriptor@6['Function0'] // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('Int': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('String': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('Unit': Name@133) = DeserializedClassDescriptor@14['Unit'] // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('bar': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('bazbaz': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('foofoo': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('io': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('jvm': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('reflect': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    deserializedPackageScope = DeserializedPackageMemberScope@160 // through LazyPackageFragmentScopeForJavaPackage@149
-    functions('bar': Name@120) = EmptyList@121[empty] // through DeserializedPackageMemberScope@160
-    functions('bazbaz': Name@123) = EmptyList@121[empty] // through DeserializedPackageMemberScope@160
-    functions('foofoo': Name@124) = EmptyList@121[empty] // through DeserializedPackageMemberScope@160
-    functions('io': Name@150) = EmptyList@121[empty] // through DeserializedPackageMemberScope@160
-    functions('jvm': Name@151) = EmptyList@121[empty] // through DeserializedPackageMemberScope@160
-    functions('reflect': Name@152) = EmptyList@121[empty] // through DeserializedPackageMemberScope@160
-    memberIndex = computeMemberIndex$1@161 // through LazyPackageFragmentScopeForJavaPackage@149
-    membersProtos = HashMap@162 // through DeserializedPackageMemberScope@160
-    properties('bar': Name@120) = EmptyList@121[empty] // through DeserializedPackageMemberScope@160
-    properties('bazbaz': Name@123) = EmptyList@121[empty] // through DeserializedPackageMemberScope@160
-    properties('foofoo': Name@124) = EmptyList@121[empty] // through DeserializedPackageMemberScope@160
-    properties('io': Name@150) = EmptyList@121[empty] // through DeserializedPackageMemberScope@160
-    properties('jvm': Name@151) = EmptyList@121[empty] // through DeserializedPackageMemberScope@160
-    properties('reflect': Name@152) = EmptyList@121[empty] // through DeserializedPackageMemberScope@160
+    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 = HashMap@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
 }
 
 LazyJavaPackageFragment@69['lang'] {
-    _functions('bar': Name@120) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@163
-    _functions('bazbaz': Name@123) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@163
-    _functions('foofoo': Name@124) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@163
-    classes('bar': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@163
-    classes('bazbaz': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@163
-    classes('foofoo': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@163
-    deserializedPackageScope = Empty@136 // through LazyPackageFragmentScopeForJavaPackage@163
+    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
 }
 
 LazyJavaPackageFragment@18['reflect'] {
-    _functions('bar': Name@120) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@165
-    _functions('bazbaz': Name@123) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@165
-    _functions('foofoo': Name@124) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('Int': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@165
+    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@132) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('Unit': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('bar': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('bazbaz': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('foofoo': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    deserializedPackageScope = Empty@136 // 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
 }
 

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

@@ -46,6 +46,11 @@ 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
@@ -56,11 +61,6 @@ DeserializedType@18['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
 DeserializedType@29['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
 }
@@ -82,172 +82,172 @@ DeserializedType@34['kotlin.Function1'] {
 }
 
 LazyJavaPackageFragmentProvider@36 {
-    _packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
-    _packageFragments('A': FqName@39) = null
-    _packageFragments('Int': FqName@40) = null
-    _packageFragments('KFunction0': FqName@41) = null
-    _packageFragments('KFunction1': FqName@42) = null
-    _packageFragments('String': FqName@43) = null
-    _packageFragments('Unit': FqName@44) = null
-    _packageFragments('java': FqName@45) = LazyJavaPackageFragment@46['java']
-    _packageFragments('java.lang': FqName@47) = LazyJavaPackageFragment@48['lang']
-    _packageFragments('java.lang.Int': FqName@49) = null
-    _packageFragments('java.lang.KFunction0': FqName@50) = null
-    _packageFragments('java.lang.KFunction1': FqName@51) = null
-    _packageFragments('java.lang.String': FqName@52) = null
-    _packageFragments('java.lang.Unit': FqName@53) = null
-    _packageFragments('kotlin': FqName@54) = LazyJavaPackageFragment@13['kotlin']
-    _packageFragments('kotlin.Int': FqName@55) = null
-    _packageFragments('kotlin.KFunction0': FqName@56) = null
-    _packageFragments('kotlin.KFunction1': FqName@57) = null
-    _packageFragments('kotlin.String': FqName@58) = null
-    _packageFragments('kotlin.Unit': FqName@59) = null
-    _packageFragments('kotlin.io': FqName@60) = LazyJavaPackageFragment@61['io']
-    _packageFragments('kotlin.io.Int': FqName@62) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@63) = null
-    _packageFragments('kotlin.io.KFunction1': FqName@64) = null
-    _packageFragments('kotlin.io.String': FqName@65) = null
-    _packageFragments('kotlin.io.Unit': FqName@66) = null
-    _packageFragments('kotlin.jvm': FqName@67) = LazyJavaPackageFragment@68['jvm']
-    _packageFragments('kotlin.jvm.Int': FqName@69) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@70) = null
-    _packageFragments('kotlin.jvm.KFunction1': FqName@71) = null
-    _packageFragments('kotlin.jvm.String': FqName@72) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@73) = null
-    _packageFragments('kotlin.reflect': FqName@74) = LazyJavaPackageFragment@14['reflect']
-    _packageFragments('kotlin.reflect.Int': FqName@75) = null
-    _packageFragments('kotlin.reflect.KFunction0': FqName@76) = null
-    _packageFragments('kotlin.reflect.KFunction1': FqName@77) = null
-    _packageFragments('kotlin.reflect.String': FqName@78) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@79) = null
+    packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
+    packageFragments('A': FqName@39) = null
+    packageFragments('Int': FqName@40) = null
+    packageFragments('KFunction0': FqName@41) = null
+    packageFragments('KFunction1': FqName@42) = null
+    packageFragments('String': FqName@43) = null
+    packageFragments('Unit': FqName@44) = null
+    packageFragments('java': FqName@45) = LazyJavaPackageFragment@46['java']
+    packageFragments('java.lang': FqName@47) = LazyJavaPackageFragment@48['lang']
+    packageFragments('java.lang.Int': FqName@49) = null
+    packageFragments('java.lang.KFunction0': FqName@50) = null
+    packageFragments('java.lang.KFunction1': FqName@51) = null
+    packageFragments('java.lang.String': FqName@52) = null
+    packageFragments('java.lang.Unit': FqName@53) = null
+    packageFragments('kotlin': FqName@54) = LazyJavaPackageFragment@13['kotlin']
+    packageFragments('kotlin.Int': FqName@55) = null
+    packageFragments('kotlin.KFunction0': FqName@56) = null
+    packageFragments('kotlin.KFunction1': FqName@57) = null
+    packageFragments('kotlin.String': FqName@58) = null
+    packageFragments('kotlin.Unit': FqName@59) = null
+    packageFragments('kotlin.io': FqName@60) = LazyJavaPackageFragment@61['io']
+    packageFragments('kotlin.io.Int': FqName@62) = null
+    packageFragments('kotlin.io.KFunction0': FqName@63) = null
+    packageFragments('kotlin.io.KFunction1': FqName@64) = null
+    packageFragments('kotlin.io.String': FqName@65) = null
+    packageFragments('kotlin.io.Unit': FqName@66) = null
+    packageFragments('kotlin.jvm': FqName@67) = LazyJavaPackageFragment@68['jvm']
+    packageFragments('kotlin.jvm.Int': FqName@69) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@70) = null
+    packageFragments('kotlin.jvm.KFunction1': FqName@71) = null
+    packageFragments('kotlin.jvm.String': FqName@72) = null
+    packageFragments('kotlin.jvm.Unit': FqName@73) = null
+    packageFragments('kotlin.reflect': FqName@74) = LazyJavaPackageFragment@14['reflect']
+    packageFragments('kotlin.reflect.Int': FqName@75) = null
+    packageFragments('kotlin.reflect.KFunction0': FqName@76) = null
+    packageFragments('kotlin.reflect.KFunction1': FqName@77) = null
+    packageFragments('kotlin.reflect.String': FqName@78) = null
+    packageFragments('kotlin.reflect.Unit': FqName@79) = null
 }
 
 LazyJavaPackageFragment@38['<root>'] {
-    _functions('bar': Name@80) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    _functions('baz': Name@83) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    _functions('foo': Name@84) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    _functions('kotlin': Name@85) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('KFunction0': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('KFunction1': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('bar': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('baz': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('foo': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('kotlin': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@92 // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('KFunction0': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('KFunction1': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('String': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('Unit': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('kotlin': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('kotlin': Name@92) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@81
+    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
 LazyJavaPackageFragment@61['io'] {
-    _functions('bar': Name@80) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    _functions('baz': Name@83) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    _functions('foo': Name@84) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('bar': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('baz': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('foo': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('String': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('Unit': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@94
     deserializedPackageScope = DeserializedPackageMemberScope@95 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('bar': Name@80) = EmptyList@81[empty] // through DeserializedPackageMemberScope@95
-    functions('baz': Name@83) = EmptyList@81[empty] // through DeserializedPackageMemberScope@95
-    functions('foo': Name@84) = EmptyList@81[empty] // through DeserializedPackageMemberScope@95
+    functions('bar': Name@86) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
+    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('baz': Name@87) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
+    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('foo': Name@88) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
+    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@94
     memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
     membersProtos = HashMap@97 // through DeserializedPackageMemberScope@95
-    properties('bar': Name@80) = EmptyList@81[empty] // through DeserializedPackageMemberScope@95
-    properties('baz': Name@83) = EmptyList@81[empty] // through DeserializedPackageMemberScope@95
-    properties('foo': Name@84) = EmptyList@81[empty] // through DeserializedPackageMemberScope@95
-    properties('x': Name@98) = EmptyList@81[empty] // through DeserializedPackageMemberScope@95
-    properties('y': Name@99) = EmptyList@81[empty] // through DeserializedPackageMemberScope@95
-    properties('z': Name@100) = EmptyList@81[empty] // through DeserializedPackageMemberScope@95
+    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'] {
-    _functions('lang': Name@101) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    deserializedPackageScope = Empty@92 // through LazyPackageFragmentScopeForJavaPackage@102
+    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
 }
 
 LazyJavaPackageFragment@68['jvm'] {
-    _functions('bar': Name@80) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    _functions('baz': Name@83) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    _functions('foo': Name@84) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('bar': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('baz': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('foo': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@92 // through LazyPackageFragmentScopeForJavaPackage@105
+    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
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    _functions('bar': Name@80) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    _functions('baz': Name@83) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    _functions('foo': Name@84) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    _functions('io': Name@108) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    _functions('jvm': Name@109) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    _functions('reflect': Name@110) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Any': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Function0': Name@112) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Function1': Name@113) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Unit': Name@90) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('bar': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('baz': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('foo': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('io': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('jvm': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('reflect': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = DeserializedPackageMemberScope@117 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('bar': Name@80) = EmptyList@81[empty] // through DeserializedPackageMemberScope@117
-    functions('baz': Name@83) = EmptyList@81[empty] // through DeserializedPackageMemberScope@117
-    functions('foo': Name@84) = EmptyList@81[empty] // through DeserializedPackageMemberScope@117
-    functions('io': Name@108) = EmptyList@81[empty] // through DeserializedPackageMemberScope@117
-    functions('jvm': Name@109) = EmptyList@81[empty] // through DeserializedPackageMemberScope@117
-    functions('reflect': Name@110) = EmptyList@81[empty] // through DeserializedPackageMemberScope@117
-    memberIndex = computeMemberIndex$1@118 // through LazyPackageFragmentScopeForJavaPackage@107
-    membersProtos = HashMap@119 // through DeserializedPackageMemberScope@117
-    properties('bar': Name@80) = EmptyList@81[empty] // through DeserializedPackageMemberScope@117
-    properties('baz': Name@83) = EmptyList@81[empty] // through DeserializedPackageMemberScope@117
-    properties('foo': Name@84) = EmptyList@81[empty] // through DeserializedPackageMemberScope@117
-    properties('io': Name@108) = EmptyList@81[empty] // through DeserializedPackageMemberScope@117
-    properties('jvm': Name@109) = EmptyList@81[empty] // through DeserializedPackageMemberScope@117
-    properties('reflect': Name@110) = EmptyList@81[empty] // through DeserializedPackageMemberScope@117
-    properties('x': Name@98) = EmptyList@81[empty] // through DeserializedPackageMemberScope@117
-    properties('y': Name@99) = EmptyList@81[empty] // through DeserializedPackageMemberScope@117
-    properties('z': Name@100) = EmptyList@81[empty] // through DeserializedPackageMemberScope@117
+    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 = HashMap@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
 }
 
 LazyJavaPackageFragment@48['lang'] {
-    _functions('bar': Name@80) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('baz': Name@83) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('foo': Name@84) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('bar': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('baz': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('foo': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    deserializedPackageScope = Empty@92 // through LazyPackageFragmentScopeForJavaPackage@120
+    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
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    _functions('bar': Name@80) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    _functions('baz': Name@83) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    _functions('foo': Name@84) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    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@89) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('bar': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('baz': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('foo': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    deserializedPackageScope = Empty@92 // 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
 }
 

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@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
 }
@@ -82,177 +82,177 @@ DeserializedType@34['kotlin.Function1'] {
 }
 
 LazyJavaPackageFragmentProvider@36 {
-    _packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
-    _packageFragments('A': FqName@39) = null
-    _packageFragments('Int': FqName@40) = null
-    _packageFragments('KFunction0': FqName@41) = null
-    _packageFragments('KFunction1': FqName@42) = null
-    _packageFragments('String': FqName@43) = null
-    _packageFragments('Unit': FqName@44) = null
-    _packageFragments('java': FqName@45) = LazyJavaPackageFragment@46['java']
-    _packageFragments('java.lang': FqName@47) = LazyJavaPackageFragment@48['lang']
-    _packageFragments('java.lang.A': FqName@49) = null
-    _packageFragments('java.lang.Int': FqName@50) = null
-    _packageFragments('java.lang.KFunction0': FqName@51) = null
-    _packageFragments('java.lang.KFunction1': FqName@52) = null
-    _packageFragments('java.lang.String': FqName@53) = null
-    _packageFragments('java.lang.Unit': FqName@54) = null
-    _packageFragments('kotlin': FqName@55) = LazyJavaPackageFragment@13['kotlin']
-    _packageFragments('kotlin.A': FqName@56) = null
-    _packageFragments('kotlin.Int': FqName@57) = null
-    _packageFragments('kotlin.KFunction0': FqName@58) = null
-    _packageFragments('kotlin.KFunction1': FqName@59) = null
-    _packageFragments('kotlin.String': FqName@60) = null
-    _packageFragments('kotlin.Unit': FqName@61) = null
-    _packageFragments('kotlin.io': FqName@62) = LazyJavaPackageFragment@63['io']
-    _packageFragments('kotlin.io.A': FqName@64) = null
-    _packageFragments('kotlin.io.Int': FqName@65) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@66) = null
-    _packageFragments('kotlin.io.KFunction1': FqName@67) = null
-    _packageFragments('kotlin.io.String': FqName@68) = null
-    _packageFragments('kotlin.io.Unit': FqName@69) = null
-    _packageFragments('kotlin.jvm': FqName@70) = LazyJavaPackageFragment@71['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@72) = null
-    _packageFragments('kotlin.jvm.Int': FqName@73) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@74) = null
-    _packageFragments('kotlin.jvm.KFunction1': FqName@75) = null
-    _packageFragments('kotlin.jvm.String': FqName@76) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@77) = null
-    _packageFragments('kotlin.reflect': FqName@78) = LazyJavaPackageFragment@14['reflect']
-    _packageFragments('kotlin.reflect.A': FqName@79) = null
-    _packageFragments('kotlin.reflect.Int': FqName@80) = null
-    _packageFragments('kotlin.reflect.KFunction0': FqName@81) = null
-    _packageFragments('kotlin.reflect.KFunction1': FqName@82) = null
-    _packageFragments('kotlin.reflect.String': FqName@83) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@84) = null
+    packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
+    packageFragments('A': FqName@39) = null
+    packageFragments('Int': FqName@40) = null
+    packageFragments('KFunction0': FqName@41) = null
+    packageFragments('KFunction1': FqName@42) = null
+    packageFragments('String': FqName@43) = null
+    packageFragments('Unit': FqName@44) = null
+    packageFragments('java': FqName@45) = LazyJavaPackageFragment@46['java']
+    packageFragments('java.lang': FqName@47) = LazyJavaPackageFragment@48['lang']
+    packageFragments('java.lang.A': FqName@49) = null
+    packageFragments('java.lang.Int': FqName@50) = null
+    packageFragments('java.lang.KFunction0': FqName@51) = null
+    packageFragments('java.lang.KFunction1': FqName@52) = null
+    packageFragments('java.lang.String': FqName@53) = null
+    packageFragments('java.lang.Unit': FqName@54) = null
+    packageFragments('kotlin': FqName@55) = LazyJavaPackageFragment@13['kotlin']
+    packageFragments('kotlin.A': FqName@56) = null
+    packageFragments('kotlin.Int': FqName@57) = null
+    packageFragments('kotlin.KFunction0': FqName@58) = null
+    packageFragments('kotlin.KFunction1': FqName@59) = null
+    packageFragments('kotlin.String': FqName@60) = null
+    packageFragments('kotlin.Unit': FqName@61) = null
+    packageFragments('kotlin.io': FqName@62) = LazyJavaPackageFragment@63['io']
+    packageFragments('kotlin.io.A': FqName@64) = null
+    packageFragments('kotlin.io.Int': FqName@65) = null
+    packageFragments('kotlin.io.KFunction0': FqName@66) = null
+    packageFragments('kotlin.io.KFunction1': FqName@67) = null
+    packageFragments('kotlin.io.String': FqName@68) = null
+    packageFragments('kotlin.io.Unit': FqName@69) = null
+    packageFragments('kotlin.jvm': FqName@70) = LazyJavaPackageFragment@71['jvm']
+    packageFragments('kotlin.jvm.A': FqName@72) = null
+    packageFragments('kotlin.jvm.Int': FqName@73) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@74) = null
+    packageFragments('kotlin.jvm.KFunction1': FqName@75) = null
+    packageFragments('kotlin.jvm.String': FqName@76) = null
+    packageFragments('kotlin.jvm.Unit': FqName@77) = null
+    packageFragments('kotlin.reflect': FqName@78) = LazyJavaPackageFragment@14['reflect']
+    packageFragments('kotlin.reflect.A': FqName@79) = null
+    packageFragments('kotlin.reflect.Int': FqName@80) = null
+    packageFragments('kotlin.reflect.KFunction0': FqName@81) = null
+    packageFragments('kotlin.reflect.KFunction1': FqName@82) = null
+    packageFragments('kotlin.reflect.String': FqName@83) = null
+    packageFragments('kotlin.reflect.Unit': FqName@84) = null
 }
 
 LazyJavaPackageFragment@38['<root>'] {
-    _functions('bar': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    _functions('baz': Name@88) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    _functions('foo': Name@89) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    _functions('kotlin': Name@90) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('Int': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('KFunction0': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('KFunction1': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('Unit': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('baz': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('kotlin': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('KFunction0': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('KFunction1': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('kotlin': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('kotlin': Name@97) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@86
 }
 
 LazyJavaPackageFragment@63['io'] {
-    _functions('bar': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    _functions('baz': Name@88) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    _functions('foo': Name@89) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('Int': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('Unit': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('baz': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@99
     deserializedPackageScope = DeserializedPackageMemberScope@100 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('bar': Name@85) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    functions('baz': Name@88) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    functions('foo': Name@89) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
+    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@99
     memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
     membersProtos = HashMap@102 // through DeserializedPackageMemberScope@100
-    properties('bar': Name@85) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    properties('baz': Name@88) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    properties('foo': Name@89) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    properties('x': Name@103) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    properties('y': Name@104) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
-    properties('z': Name@105) = EmptyList@86[empty] // through DeserializedPackageMemberScope@100
+    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'] {
-    _functions('lang': Name@106) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('lang': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@107
+    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
 }
 
 LazyJavaPackageFragment@71['jvm'] {
-    _functions('bar': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    _functions('baz': Name@88) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    _functions('foo': Name@89) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Int': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Unit': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('baz': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@110
+    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
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    _functions('bar': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('baz': Name@88) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('foo': Name@89) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('io': Name@113) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('jvm': Name@114) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('reflect': Name@115) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Any': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Function0': Name@117) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Function1': Name@118) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Int': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Unit': Name@95) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('baz': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('io': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('jvm': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('reflect': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = DeserializedPackageMemberScope@122 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('bar': Name@85) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    functions('baz': Name@88) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    functions('foo': Name@89) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    functions('io': Name@113) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    functions('jvm': Name@114) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    functions('reflect': Name@115) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@112
-    membersProtos = HashMap@124 // through DeserializedPackageMemberScope@122
-    properties('bar': Name@85) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('baz': Name@88) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('foo': Name@89) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('io': Name@113) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('jvm': Name@114) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('reflect': Name@115) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('x': Name@103) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('y': Name@104) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
-    properties('z': Name@105) = EmptyList@86[empty] // through DeserializedPackageMemberScope@122
+    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 = HashMap@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
 }
 
 LazyJavaPackageFragment@48['lang'] {
-    _functions('bar': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    _functions('baz': Name@88) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    _functions('foo': Name@89) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('baz': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@125
+    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
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    _functions('bar': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    _functions('baz': Name@88) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    _functions('foo': Name@89) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Int': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@127
+    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@94) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Unit': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('baz': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    deserializedPackageScope = Empty@97 // 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
 }
 

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@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
 DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
@@ -61,6 +56,11 @@ DeserializedType@22['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
+DeserializedType@18['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@27
+    memberScope = DeserializedClassMemberScope@28
+}
+
 DeserializedType@29['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
 }
@@ -82,178 +82,178 @@ DeserializedType@34['kotlin.Function1'] {
 }
 
 LazyJavaPackageFragmentProvider@36 {
-    _packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
-    _packageFragments('A': FqName@39) = null
-    _packageFragments('B': FqName@40) = null
-    _packageFragments('Int': FqName@41) = null
-    _packageFragments('KFunction0': FqName@42) = null
-    _packageFragments('KFunction1': FqName@43) = null
-    _packageFragments('String': FqName@44) = null
-    _packageFragments('Unit': FqName@45) = null
-    _packageFragments('java': FqName@46) = LazyJavaPackageFragment@47['java']
-    _packageFragments('java.lang': FqName@48) = LazyJavaPackageFragment@49['lang']
-    _packageFragments('java.lang.A': FqName@50) = null
-    _packageFragments('java.lang.Int': FqName@51) = null
-    _packageFragments('java.lang.KFunction0': FqName@52) = null
-    _packageFragments('java.lang.KFunction1': FqName@53) = null
-    _packageFragments('java.lang.String': FqName@54) = null
-    _packageFragments('java.lang.Unit': FqName@55) = null
-    _packageFragments('kotlin': FqName@56) = LazyJavaPackageFragment@13['kotlin']
-    _packageFragments('kotlin.A': FqName@57) = null
-    _packageFragments('kotlin.Int': FqName@58) = null
-    _packageFragments('kotlin.KFunction0': FqName@59) = null
-    _packageFragments('kotlin.KFunction1': FqName@60) = null
-    _packageFragments('kotlin.String': FqName@61) = null
-    _packageFragments('kotlin.Unit': FqName@62) = null
-    _packageFragments('kotlin.io': FqName@63) = LazyJavaPackageFragment@64['io']
-    _packageFragments('kotlin.io.A': FqName@65) = null
-    _packageFragments('kotlin.io.Int': FqName@66) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@67) = null
-    _packageFragments('kotlin.io.KFunction1': FqName@68) = null
-    _packageFragments('kotlin.io.String': FqName@69) = null
-    _packageFragments('kotlin.io.Unit': FqName@70) = null
-    _packageFragments('kotlin.jvm': FqName@71) = LazyJavaPackageFragment@72['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@73) = null
-    _packageFragments('kotlin.jvm.Int': FqName@74) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@75) = null
-    _packageFragments('kotlin.jvm.KFunction1': FqName@76) = null
-    _packageFragments('kotlin.jvm.String': FqName@77) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@78) = null
-    _packageFragments('kotlin.reflect': FqName@79) = LazyJavaPackageFragment@14['reflect']
-    _packageFragments('kotlin.reflect.A': FqName@80) = null
-    _packageFragments('kotlin.reflect.Int': FqName@81) = null
-    _packageFragments('kotlin.reflect.KFunction0': FqName@82) = null
-    _packageFragments('kotlin.reflect.KFunction1': FqName@83) = null
-    _packageFragments('kotlin.reflect.String': FqName@84) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@85) = null
+    packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
+    packageFragments('A': FqName@39) = null
+    packageFragments('B': FqName@40) = null
+    packageFragments('Int': FqName@41) = null
+    packageFragments('KFunction0': FqName@42) = null
+    packageFragments('KFunction1': FqName@43) = null
+    packageFragments('String': FqName@44) = null
+    packageFragments('Unit': FqName@45) = null
+    packageFragments('java': FqName@46) = LazyJavaPackageFragment@47['java']
+    packageFragments('java.lang': FqName@48) = LazyJavaPackageFragment@49['lang']
+    packageFragments('java.lang.A': FqName@50) = null
+    packageFragments('java.lang.Int': FqName@51) = null
+    packageFragments('java.lang.KFunction0': FqName@52) = null
+    packageFragments('java.lang.KFunction1': FqName@53) = null
+    packageFragments('java.lang.String': FqName@54) = null
+    packageFragments('java.lang.Unit': FqName@55) = null
+    packageFragments('kotlin': FqName@56) = LazyJavaPackageFragment@13['kotlin']
+    packageFragments('kotlin.A': FqName@57) = null
+    packageFragments('kotlin.Int': FqName@58) = null
+    packageFragments('kotlin.KFunction0': FqName@59) = null
+    packageFragments('kotlin.KFunction1': FqName@60) = null
+    packageFragments('kotlin.String': FqName@61) = null
+    packageFragments('kotlin.Unit': FqName@62) = null
+    packageFragments('kotlin.io': FqName@63) = LazyJavaPackageFragment@64['io']
+    packageFragments('kotlin.io.A': FqName@65) = null
+    packageFragments('kotlin.io.Int': FqName@66) = null
+    packageFragments('kotlin.io.KFunction0': FqName@67) = null
+    packageFragments('kotlin.io.KFunction1': FqName@68) = null
+    packageFragments('kotlin.io.String': FqName@69) = null
+    packageFragments('kotlin.io.Unit': FqName@70) = null
+    packageFragments('kotlin.jvm': FqName@71) = LazyJavaPackageFragment@72['jvm']
+    packageFragments('kotlin.jvm.A': FqName@73) = null
+    packageFragments('kotlin.jvm.Int': FqName@74) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@75) = null
+    packageFragments('kotlin.jvm.KFunction1': FqName@76) = null
+    packageFragments('kotlin.jvm.String': FqName@77) = null
+    packageFragments('kotlin.jvm.Unit': FqName@78) = null
+    packageFragments('kotlin.reflect': FqName@79) = LazyJavaPackageFragment@14['reflect']
+    packageFragments('kotlin.reflect.A': FqName@80) = null
+    packageFragments('kotlin.reflect.Int': FqName@81) = null
+    packageFragments('kotlin.reflect.KFunction0': FqName@82) = null
+    packageFragments('kotlin.reflect.KFunction1': FqName@83) = null
+    packageFragments('kotlin.reflect.String': FqName@84) = null
+    packageFragments('kotlin.reflect.Unit': FqName@85) = null
 }
 
 LazyJavaPackageFragment@38['<root>'] {
-    _functions('bar': Name@86) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    _functions('baz': Name@89) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    _functions('foo': Name@90) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    _functions('kotlin': Name@91) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('Int': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('KFunction0': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('KFunction1': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('String': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('Unit': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('baz': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('foo': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('kotlin': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('KFunction0': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('KFunction1': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('String': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('Unit': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('kotlin': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('kotlin': Name@98) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
 LazyJavaPackageFragment@64['io'] {
-    _functions('bar': Name@86) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    _functions('baz': Name@89) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    _functions('foo': Name@90) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('Int': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('String': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('Unit': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('baz': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('foo': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('String': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('Unit': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@100
     deserializedPackageScope = DeserializedPackageMemberScope@101 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('bar': Name@86) = EmptyList@87[empty] // through DeserializedPackageMemberScope@101
-    functions('baz': Name@89) = EmptyList@87[empty] // through DeserializedPackageMemberScope@101
-    functions('foo': Name@90) = EmptyList@87[empty] // through DeserializedPackageMemberScope@101
+    functions('bar': Name@92) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
+    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('baz': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
+    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('foo': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
+    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
     memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
     membersProtos = HashMap@103 // through DeserializedPackageMemberScope@101
-    properties('bar': Name@86) = EmptyList@87[empty] // through DeserializedPackageMemberScope@101
-    properties('baz': Name@89) = EmptyList@87[empty] // through DeserializedPackageMemberScope@101
-    properties('foo': Name@90) = EmptyList@87[empty] // through DeserializedPackageMemberScope@101
-    properties('x': Name@104) = EmptyList@87[empty] // through DeserializedPackageMemberScope@101
-    properties('y': Name@105) = EmptyList@87[empty] // through DeserializedPackageMemberScope@101
-    properties('z': Name@106) = EmptyList@87[empty] // through DeserializedPackageMemberScope@101
+    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'] {
-    _functions('lang': Name@107) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('lang': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@108
+    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
 }
 
 LazyJavaPackageFragment@72['jvm'] {
-    _functions('bar': Name@86) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    _functions('baz': Name@89) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    _functions('foo': Name@90) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('Int': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('String': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('Unit': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('baz': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('foo': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@111
+    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
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    _functions('bar': Name@86) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    _functions('baz': Name@89) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    _functions('foo': Name@90) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    _functions('io': Name@114) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    _functions('jvm': Name@115) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    _functions('reflect': Name@116) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Any': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Function0': Name@118) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Function1': Name@119) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Int': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('String': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Unit': Name@96) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('baz': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('foo': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('io': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('jvm': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('reflect': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = DeserializedPackageMemberScope@123 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('bar': Name@86) = EmptyList@87[empty] // through DeserializedPackageMemberScope@123
-    functions('baz': Name@89) = EmptyList@87[empty] // through DeserializedPackageMemberScope@123
-    functions('foo': Name@90) = EmptyList@87[empty] // through DeserializedPackageMemberScope@123
-    functions('io': Name@114) = EmptyList@87[empty] // through DeserializedPackageMemberScope@123
-    functions('jvm': Name@115) = EmptyList@87[empty] // through DeserializedPackageMemberScope@123
-    functions('reflect': Name@116) = EmptyList@87[empty] // through DeserializedPackageMemberScope@123
-    memberIndex = computeMemberIndex$1@124 // through LazyPackageFragmentScopeForJavaPackage@113
-    membersProtos = HashMap@125 // through DeserializedPackageMemberScope@123
-    properties('bar': Name@86) = EmptyList@87[empty] // through DeserializedPackageMemberScope@123
-    properties('baz': Name@89) = EmptyList@87[empty] // through DeserializedPackageMemberScope@123
-    properties('foo': Name@90) = EmptyList@87[empty] // through DeserializedPackageMemberScope@123
-    properties('io': Name@114) = EmptyList@87[empty] // through DeserializedPackageMemberScope@123
-    properties('jvm': Name@115) = EmptyList@87[empty] // through DeserializedPackageMemberScope@123
-    properties('reflect': Name@116) = EmptyList@87[empty] // through DeserializedPackageMemberScope@123
-    properties('x': Name@104) = EmptyList@87[empty] // through DeserializedPackageMemberScope@123
-    properties('y': Name@105) = EmptyList@87[empty] // through DeserializedPackageMemberScope@123
-    properties('z': Name@106) = EmptyList@87[empty] // through DeserializedPackageMemberScope@123
+    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 = HashMap@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
 }
 
 LazyJavaPackageFragment@49['lang'] {
-    _functions('bar': Name@86) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    _functions('baz': Name@89) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    _functions('foo': Name@90) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('baz': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('foo': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@126
+    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
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    _functions('bar': Name@86) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    _functions('baz': Name@89) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    _functions('foo': Name@90) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('Int': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@128
+    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@95) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('Unit': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('baz': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('foo': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    deserializedPackageScope = Empty@98 // 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
 }
 

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@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -82,165 +82,165 @@ DeserializedType@34['kotlin.Function1'] {
 }
 
 LazyJavaPackageFragmentProvider@36 {
-    _packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
-    _packageFragments('Int': FqName@39) = null
-    _packageFragments('KFunction0': FqName@40) = null
-    _packageFragments('KFunction1': FqName@41) = null
-    _packageFragments('String': FqName@42) = null
-    _packageFragments('Unit': FqName@43) = null
-    _packageFragments('java': FqName@44) = LazyJavaPackageFragment@45['java']
-    _packageFragments('java.lang': FqName@46) = LazyJavaPackageFragment@47['lang']
-    _packageFragments('java.lang.Int': FqName@48) = null
-    _packageFragments('java.lang.KFunction0': FqName@49) = null
-    _packageFragments('java.lang.KFunction1': FqName@50) = null
-    _packageFragments('java.lang.String': FqName@51) = null
-    _packageFragments('java.lang.Unit': FqName@52) = null
-    _packageFragments('kotlin': FqName@53) = LazyJavaPackageFragment@13['kotlin']
-    _packageFragments('kotlin.Int': FqName@54) = null
-    _packageFragments('kotlin.KFunction0': FqName@55) = null
-    _packageFragments('kotlin.KFunction1': FqName@56) = null
-    _packageFragments('kotlin.String': FqName@57) = null
-    _packageFragments('kotlin.Unit': FqName@58) = null
-    _packageFragments('kotlin.io': FqName@59) = LazyJavaPackageFragment@60['io']
-    _packageFragments('kotlin.io.Int': FqName@61) = null
-    _packageFragments('kotlin.io.KFunction0': FqName@62) = null
-    _packageFragments('kotlin.io.KFunction1': FqName@63) = null
-    _packageFragments('kotlin.io.String': FqName@64) = null
-    _packageFragments('kotlin.io.Unit': FqName@65) = null
-    _packageFragments('kotlin.jvm': FqName@66) = LazyJavaPackageFragment@67['jvm']
-    _packageFragments('kotlin.jvm.Int': FqName@68) = null
-    _packageFragments('kotlin.jvm.KFunction0': FqName@69) = null
-    _packageFragments('kotlin.jvm.KFunction1': FqName@70) = null
-    _packageFragments('kotlin.jvm.String': FqName@71) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@72) = null
-    _packageFragments('kotlin.reflect': FqName@73) = LazyJavaPackageFragment@14['reflect']
-    _packageFragments('kotlin.reflect.Int': FqName@74) = null
-    _packageFragments('kotlin.reflect.KFunction0': FqName@75) = null
-    _packageFragments('kotlin.reflect.KFunction1': FqName@76) = null
-    _packageFragments('kotlin.reflect.String': FqName@77) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@78) = null
+    packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
+    packageFragments('Int': FqName@39) = null
+    packageFragments('KFunction0': FqName@40) = null
+    packageFragments('KFunction1': FqName@41) = null
+    packageFragments('String': FqName@42) = null
+    packageFragments('Unit': FqName@43) = null
+    packageFragments('java': FqName@44) = LazyJavaPackageFragment@45['java']
+    packageFragments('java.lang': FqName@46) = LazyJavaPackageFragment@47['lang']
+    packageFragments('java.lang.Int': FqName@48) = null
+    packageFragments('java.lang.KFunction0': FqName@49) = null
+    packageFragments('java.lang.KFunction1': FqName@50) = null
+    packageFragments('java.lang.String': FqName@51) = null
+    packageFragments('java.lang.Unit': FqName@52) = null
+    packageFragments('kotlin': FqName@53) = LazyJavaPackageFragment@13['kotlin']
+    packageFragments('kotlin.Int': FqName@54) = null
+    packageFragments('kotlin.KFunction0': FqName@55) = null
+    packageFragments('kotlin.KFunction1': FqName@56) = null
+    packageFragments('kotlin.String': FqName@57) = null
+    packageFragments('kotlin.Unit': FqName@58) = null
+    packageFragments('kotlin.io': FqName@59) = LazyJavaPackageFragment@60['io']
+    packageFragments('kotlin.io.Int': FqName@61) = null
+    packageFragments('kotlin.io.KFunction0': FqName@62) = null
+    packageFragments('kotlin.io.KFunction1': FqName@63) = null
+    packageFragments('kotlin.io.String': FqName@64) = null
+    packageFragments('kotlin.io.Unit': FqName@65) = null
+    packageFragments('kotlin.jvm': FqName@66) = LazyJavaPackageFragment@67['jvm']
+    packageFragments('kotlin.jvm.Int': FqName@68) = null
+    packageFragments('kotlin.jvm.KFunction0': FqName@69) = null
+    packageFragments('kotlin.jvm.KFunction1': FqName@70) = null
+    packageFragments('kotlin.jvm.String': FqName@71) = null
+    packageFragments('kotlin.jvm.Unit': FqName@72) = null
+    packageFragments('kotlin.reflect': FqName@73) = LazyJavaPackageFragment@14['reflect']
+    packageFragments('kotlin.reflect.Int': FqName@74) = null
+    packageFragments('kotlin.reflect.KFunction0': FqName@75) = null
+    packageFragments('kotlin.reflect.KFunction1': FqName@76) = null
+    packageFragments('kotlin.reflect.String': FqName@77) = null
+    packageFragments('kotlin.reflect.Unit': FqName@78) = null
 }
 
 LazyJavaPackageFragment@38['<root>'] {
-    _functions('bar': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    _functions('baz': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    _functions('foo': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    _functions('kotlin': Name@84) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('KFunction0': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('KFunction1': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('Unit': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('bar': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('baz': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('kotlin': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('KFunction0': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('KFunction1': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('String': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('Unit': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('kotlin': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('kotlin': Name@91) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@80
 }
 
 LazyJavaPackageFragment@60['io'] {
-    _functions('bar': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    _functions('baz': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    _functions('foo': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('Unit': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('bar': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('baz': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('String': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('Unit': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@93
     deserializedPackageScope = DeserializedPackageMemberScope@94 // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('bar': Name@79) = EmptyList@80[empty] // through DeserializedPackageMemberScope@94
-    functions('baz': Name@82) = EmptyList@80[empty] // through DeserializedPackageMemberScope@94
-    functions('foo': Name@83) = EmptyList@80[empty] // through DeserializedPackageMemberScope@94
+    functions('bar': Name@85) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
+    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@93
+    functions('baz': Name@86) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
+    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@93
+    functions('foo': Name@87) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
+    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@93
     memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
     membersProtos = HashMap@96 // through DeserializedPackageMemberScope@94
-    properties('bar': Name@79) = EmptyList@80[empty] // through DeserializedPackageMemberScope@94
-    properties('baz': Name@82) = EmptyList@80[empty] // through DeserializedPackageMemberScope@94
-    properties('foo': Name@83) = EmptyList@80[empty] // through DeserializedPackageMemberScope@94
+    properties('bar': Name@85) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
+    properties('baz': Name@86) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
+    properties('foo': Name@87) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
 }
 
 LazyJavaPackageFragment@45['java'] {
-    _functions('lang': Name@97) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@98
+    classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
+    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@98
+    functions('lang': Name@99) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@98
     memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@98
 }
 
 LazyJavaPackageFragment@67['jvm'] {
-    _functions('bar': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    _functions('baz': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    _functions('foo': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('Unit': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('bar': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('baz': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@101
+    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@101
+    classes('String': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@101
+    classes('Unit': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@101
+    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@101
+    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@101
+    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@101
+    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@101
+    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@101
+    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@101
+    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@101
     memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@101
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    _functions('bar': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    _functions('baz': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    _functions('foo': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    _functions('io': Name@104) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    _functions('jvm': Name@105) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    _functions('reflect': Name@106) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('Any': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('Function0': Name@108) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('Function1': Name@109) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('Unit': Name@89) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('bar': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('baz': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('io': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('jvm': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('reflect': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    deserializedPackageScope = DeserializedPackageMemberScope@113 // through LazyPackageFragmentScopeForJavaPackage@103
-    functions('bar': Name@79) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    functions('baz': Name@82) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    functions('foo': Name@83) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    functions('io': Name@104) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    functions('jvm': Name@105) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    functions('reflect': Name@106) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@103
-    membersProtos = HashMap@115 // through DeserializedPackageMemberScope@113
-    properties('bar': Name@79) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    properties('baz': Name@82) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    properties('foo': Name@83) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    properties('io': Name@104) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    properties('jvm': Name@105) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
-    properties('reflect': Name@106) = EmptyList@80[empty] // through DeserializedPackageMemberScope@113
+    classes('Any': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('Function0': Name@105) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('Function1': Name@106) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('String': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('Unit': Name@84) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('io': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('jvm': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('reflect': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    deserializedPackageScope = DeserializedPackageMemberScope@110 // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('bar': Name@85) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('baz': Name@86) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('foo': Name@87) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('io': Name@111) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    functions('io': Name@111) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('jvm': Name@112) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    functions('jvm': Name@112) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('reflect': Name@113) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    functions('reflect': Name@113) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@104
+    membersProtos = HashMap@115 // through DeserializedPackageMemberScope@110
+    properties('bar': Name@85) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    properties('baz': Name@86) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    properties('foo': Name@87) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    properties('io': Name@111) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    properties('jvm': Name@112) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
+    properties('reflect': Name@113) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
 }
 
 LazyJavaPackageFragment@47['lang'] {
-    _functions('bar': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    _functions('baz': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    _functions('foo': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('bar': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('baz': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@116
     memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@116
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    _functions('bar': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    _functions('baz': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    _functions('foo': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@118
     classes('KFunction0': Name@119) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@118
     classes('KFunction1': Name@120) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('String': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Unit': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@118
     memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@118
 }
 

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

@@ -24,99 +24,99 @@ DeserializedType@11['kotlin.Function0'] {
 }
 
 LazyJavaPackageFragmentProvider@13 {
-    _packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
-    _packageFragments('A': FqName@16) = null
-    _packageFragments('B': FqName@17) = null
-    _packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    _packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    _packageFragments('java.lang.A': FqName@22) = null
-    _packageFragments('java.lang.B': FqName@23) = null
-    _packageFragments('kotlin': FqName@24) = LazyJavaPackageFragment@5['kotlin']
-    _packageFragments('kotlin.A': FqName@25) = null
-    _packageFragments('kotlin.B': FqName@26) = null
-    _packageFragments('kotlin.io': FqName@27) = LazyJavaPackageFragment@28['io']
-    _packageFragments('kotlin.io.A': FqName@29) = null
-    _packageFragments('kotlin.io.B': FqName@30) = null
-    _packageFragments('kotlin.jvm': FqName@31) = LazyJavaPackageFragment@32['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@33) = null
-    _packageFragments('kotlin.jvm.B': FqName@34) = null
-    _packageFragments('kotlin.reflect': FqName@35) = LazyJavaPackageFragment@6['reflect']
+    packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
+    packageFragments('A': FqName@16) = null
+    packageFragments('B': FqName@17) = null
+    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
+    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
+    packageFragments('java.lang.A': FqName@22) = null
+    packageFragments('java.lang.B': FqName@23) = null
+    packageFragments('kotlin': FqName@24) = LazyJavaPackageFragment@5['kotlin']
+    packageFragments('kotlin.A': FqName@25) = null
+    packageFragments('kotlin.B': FqName@26) = null
+    packageFragments('kotlin.io': FqName@27) = LazyJavaPackageFragment@28['io']
+    packageFragments('kotlin.io.A': FqName@29) = null
+    packageFragments('kotlin.io.B': FqName@30) = null
+    packageFragments('kotlin.jvm': FqName@31) = LazyJavaPackageFragment@32['jvm']
+    packageFragments('kotlin.jvm.A': FqName@33) = null
+    packageFragments('kotlin.jvm.B': FqName@34) = null
+    packageFragments('kotlin.reflect': FqName@35) = LazyJavaPackageFragment@6['reflect']
 }
 
 LazyJavaPackageFragment@15['<root>'] {
-    _functions('bar': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('foo': Name@39) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('B': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('bar': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('B': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('bar': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('bar': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('foo': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@37
 }
 
 LazyJavaPackageFragment@28['io'] {
-    _functions('bar': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    _functions('foo': Name@39) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('B': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('bar': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('B': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('bar': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@43
     classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@43
     deserializedPackageScope = DeserializedPackageMemberScope@44 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('bar': Name@36) = EmptyList@37[empty] // through DeserializedPackageMemberScope@44
-    functions('foo': Name@39) = EmptyList@37[empty] // through DeserializedPackageMemberScope@44
+    functions('bar': Name@38) = EmptyList@41[empty] // through DeserializedPackageMemberScope@44
+    functions('bar': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('foo': Name@39) = EmptyList@41[empty] // through DeserializedPackageMemberScope@44
+    functions('foo': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@43
     memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
     membersProtos = HashMap@46 // through DeserializedPackageMemberScope@44
-    properties('bar': Name@36) = EmptyList@37[empty] // through DeserializedPackageMemberScope@44
-    properties('foo': Name@39) = EmptyList@37[empty] // through DeserializedPackageMemberScope@44
+    properties('bar': Name@38) = EmptyList@41[empty] // through DeserializedPackageMemberScope@44
+    properties('foo': Name@39) = EmptyList@41[empty] // through DeserializedPackageMemberScope@44
 }
 
 LazyJavaPackageFragment@19['java'] {
-    _functions('lang': Name@47) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('lang': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('lang': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('lang': Name@49) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
     memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
 }
 
 LazyJavaPackageFragment@32['jvm'] {
-    _functions('bar': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    _functions('foo': Name@39) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('B': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('bar': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('B': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('bar': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@51
     classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@51
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('bar': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('foo': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@51
     memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@51
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    _functions('bar': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    _functions('foo': Name@39) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    _functions('io': Name@54) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    _functions('jvm': Name@55) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('Any': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('B': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('Function0': Name@57) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('bar': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('io': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('jvm': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = DeserializedPackageMemberScope@60 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('bar': Name@36) = EmptyList@37[empty] // through DeserializedPackageMemberScope@60
-    functions('foo': Name@39) = EmptyList@37[empty] // through DeserializedPackageMemberScope@60
-    functions('io': Name@54) = EmptyList@37[empty] // through DeserializedPackageMemberScope@60
-    functions('jvm': Name@55) = EmptyList@37[empty] // through DeserializedPackageMemberScope@60
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@53
-    membersProtos = HashMap@62 // through DeserializedPackageMemberScope@60
-    properties('bar': Name@36) = EmptyList@37[empty] // through DeserializedPackageMemberScope@60
-    properties('foo': Name@39) = EmptyList@37[empty] // through DeserializedPackageMemberScope@60
-    properties('io': Name@54) = EmptyList@37[empty] // through DeserializedPackageMemberScope@60
-    properties('jvm': Name@55) = EmptyList@37[empty] // through DeserializedPackageMemberScope@60
+    classes('Any': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('B': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('Function0': Name@55) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('bar': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('io': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('jvm': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    deserializedPackageScope = DeserializedPackageMemberScope@58 // through LazyPackageFragmentScopeForJavaPackage@54
+    functions('bar': Name@38) = EmptyList@41[empty] // through DeserializedPackageMemberScope@58
+    functions('bar': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@54
+    functions('foo': Name@39) = EmptyList@41[empty] // through DeserializedPackageMemberScope@58
+    functions('foo': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@54
+    functions('io': Name@59) = EmptyList@41[empty] // through DeserializedPackageMemberScope@58
+    functions('io': Name@59) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@54
+    functions('jvm': Name@60) = EmptyList@41[empty] // through DeserializedPackageMemberScope@58
+    functions('jvm': Name@60) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@54
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@54
+    membersProtos = HashMap@62 // through DeserializedPackageMemberScope@58
+    properties('bar': Name@38) = EmptyList@41[empty] // through DeserializedPackageMemberScope@58
+    properties('foo': Name@39) = EmptyList@41[empty] // through DeserializedPackageMemberScope@58
+    properties('io': Name@59) = EmptyList@41[empty] // through DeserializedPackageMemberScope@58
+    properties('jvm': Name@60) = EmptyList@41[empty] // through DeserializedPackageMemberScope@58
 }
 
 LazyJavaPackageFragment@21['lang'] {
-    _functions('bar': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    _functions('foo': Name@39) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('B': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('bar': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('B': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('bar': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@63
     classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@63
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@63
+    functions('bar': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@63
+    functions('foo': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@63
     memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@63
 }
 

compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.lazy.log

@@ -66,12 +66,12 @@ DeserializedType@28['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@41
 }
 
-DeserializedType@42['kotlin.Any'] {
+DeserializedType@37['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@40
     memberScope = DeserializedClassMemberScope@41
 }
 
-DeserializedType@37['kotlin.Any'] {
+DeserializedType@42['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@40
     memberScope = DeserializedClassMemberScope@41
 }
@@ -103,211 +103,211 @@ DeserializedType@52['kotlin.reflect.KProperty'] {
 }
 
 LazyJavaPackageFragmentProvider@55 {
-    _packageFragments('<root>': FqName@56) = LazyJavaPackageFragment@57['<root>']
-    _packageFragments('A': FqName@58) = null
-    _packageFragments('Any': FqName@59) = null
-    _packageFragments('B': FqName@60) = null
-    _packageFragments('Base': FqName@61) = null
-    _packageFragments('C': FqName@62) = null
-    _packageFragments('Int': FqName@63) = null
-    _packageFragments('KMemberProperty': FqName@64) = null
-    _packageFragments('Number': FqName@65) = null
-    _packageFragments('String': FqName@66) = null
-    _packageFragments('java': FqName@67) = LazyJavaPackageFragment@68['java']
-    _packageFragments('java.lang': FqName@69) = LazyJavaPackageFragment@70['lang']
-    _packageFragments('java.lang.A': FqName@71) = null
-    _packageFragments('java.lang.Any': FqName@72) = null
-    _packageFragments('java.lang.B': FqName@73) = null
-    _packageFragments('java.lang.Base': FqName@74) = null
-    _packageFragments('java.lang.Int': FqName@75) = null
-    _packageFragments('java.lang.KMemberProperty': FqName@76) = null
-    _packageFragments('java.lang.Number': FqName@77) = null
-    _packageFragments('java.lang.String': FqName@78) = null
-    _packageFragments('kotlin': FqName@79) = LazyJavaPackageFragment@80['kotlin']
-    _packageFragments('kotlin.A': FqName@81) = null
-    _packageFragments('kotlin.Any': FqName@82) = null
-    _packageFragments('kotlin.B': FqName@83) = null
-    _packageFragments('kotlin.Base': FqName@84) = null
-    _packageFragments('kotlin.Int': FqName@85) = null
-    _packageFragments('kotlin.KMemberProperty': FqName@86) = null
-    _packageFragments('kotlin.Number': FqName@87) = null
-    _packageFragments('kotlin.String': FqName@88) = null
-    _packageFragments('kotlin.io': FqName@89) = LazyJavaPackageFragment@90['io']
-    _packageFragments('kotlin.io.A': FqName@91) = null
-    _packageFragments('kotlin.io.Any': FqName@92) = null
-    _packageFragments('kotlin.io.B': FqName@93) = null
-    _packageFragments('kotlin.io.Base': FqName@94) = null
-    _packageFragments('kotlin.io.Int': FqName@95) = null
-    _packageFragments('kotlin.io.KMemberProperty': FqName@96) = null
-    _packageFragments('kotlin.io.Number': FqName@97) = null
-    _packageFragments('kotlin.io.String': FqName@98) = null
-    _packageFragments('kotlin.jvm': FqName@99) = LazyJavaPackageFragment@100['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@101) = null
-    _packageFragments('kotlin.jvm.Any': FqName@102) = null
-    _packageFragments('kotlin.jvm.B': FqName@103) = null
-    _packageFragments('kotlin.jvm.Base': FqName@104) = null
-    _packageFragments('kotlin.jvm.Int': FqName@105) = null
-    _packageFragments('kotlin.jvm.KMemberProperty': FqName@106) = null
-    _packageFragments('kotlin.jvm.Number': FqName@107) = null
-    _packageFragments('kotlin.jvm.String': FqName@108) = null
-    _packageFragments('kotlin.reflect': FqName@109) = LazyJavaPackageFragment@11['reflect']
-    _packageFragments('kotlin.reflect.KMemberProperty': FqName@110) = null
+    packageFragments('<root>': FqName@56) = LazyJavaPackageFragment@57['<root>']
+    packageFragments('A': FqName@58) = null
+    packageFragments('Any': FqName@59) = null
+    packageFragments('B': FqName@60) = null
+    packageFragments('Base': FqName@61) = null
+    packageFragments('C': FqName@62) = null
+    packageFragments('Int': FqName@63) = null
+    packageFragments('KMemberProperty': FqName@64) = null
+    packageFragments('Number': FqName@65) = null
+    packageFragments('String': FqName@66) = null
+    packageFragments('java': FqName@67) = LazyJavaPackageFragment@68['java']
+    packageFragments('java.lang': FqName@69) = LazyJavaPackageFragment@70['lang']
+    packageFragments('java.lang.A': FqName@71) = null
+    packageFragments('java.lang.Any': FqName@72) = null
+    packageFragments('java.lang.B': FqName@73) = null
+    packageFragments('java.lang.Base': FqName@74) = null
+    packageFragments('java.lang.Int': FqName@75) = null
+    packageFragments('java.lang.KMemberProperty': FqName@76) = null
+    packageFragments('java.lang.Number': FqName@77) = null
+    packageFragments('java.lang.String': FqName@78) = null
+    packageFragments('kotlin': FqName@79) = LazyJavaPackageFragment@80['kotlin']
+    packageFragments('kotlin.A': FqName@81) = null
+    packageFragments('kotlin.Any': FqName@82) = null
+    packageFragments('kotlin.B': FqName@83) = null
+    packageFragments('kotlin.Base': FqName@84) = null
+    packageFragments('kotlin.Int': FqName@85) = null
+    packageFragments('kotlin.KMemberProperty': FqName@86) = null
+    packageFragments('kotlin.Number': FqName@87) = null
+    packageFragments('kotlin.String': FqName@88) = null
+    packageFragments('kotlin.io': FqName@89) = LazyJavaPackageFragment@90['io']
+    packageFragments('kotlin.io.A': FqName@91) = null
+    packageFragments('kotlin.io.Any': FqName@92) = null
+    packageFragments('kotlin.io.B': FqName@93) = null
+    packageFragments('kotlin.io.Base': FqName@94) = null
+    packageFragments('kotlin.io.Int': FqName@95) = null
+    packageFragments('kotlin.io.KMemberProperty': FqName@96) = null
+    packageFragments('kotlin.io.Number': FqName@97) = null
+    packageFragments('kotlin.io.String': FqName@98) = null
+    packageFragments('kotlin.jvm': FqName@99) = LazyJavaPackageFragment@100['jvm']
+    packageFragments('kotlin.jvm.A': FqName@101) = null
+    packageFragments('kotlin.jvm.Any': FqName@102) = null
+    packageFragments('kotlin.jvm.B': FqName@103) = null
+    packageFragments('kotlin.jvm.Base': FqName@104) = null
+    packageFragments('kotlin.jvm.Int': FqName@105) = null
+    packageFragments('kotlin.jvm.KMemberProperty': FqName@106) = null
+    packageFragments('kotlin.jvm.Number': FqName@107) = null
+    packageFragments('kotlin.jvm.String': FqName@108) = null
+    packageFragments('kotlin.reflect': FqName@109) = LazyJavaPackageFragment@11['reflect']
+    packageFragments('kotlin.reflect.KMemberProperty': FqName@110) = null
 }
 
 LazyJavaPackageFragment@57['<root>'] {
-    _functions('A': Name@111) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('B': Name@113) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('C': Name@114) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('invoke': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('kotlin': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('x': Name@117) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@112
     classes('A': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Any': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('B': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('C': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Int': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('KMemberProperty': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Number': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('String': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('Any': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('B': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('C': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('Int': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('KMemberProperty': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('Number': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@112
     classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('invoke': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('kotlin': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('x': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('invoke': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('kotlin': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('x': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@112
+    functions('A': Name@111) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@112
+    functions('B': Name@114) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@112
+    functions('C': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@112
+    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@112
+    functions('invoke': Name@120) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@112
+    functions('kotlin': Name@124) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@112
+    functions('x': Name@122) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@112
     memberIndex = computeMemberIndex$1@125 // through LazyPackageFragmentScopeForJavaPackage@112
 }
 
 LazyJavaPackageFragment@90['io'] {
-    _functions('A': Name@111) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    _functions('B': Name@113) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    _functions('C': Name@114) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    _functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    _functions('invoke': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    _functions('x': Name@117) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@126
     classes('A': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('Any': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('B': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('C': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('Int': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('Number': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('String': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@126
+    classes('Any': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@126
+    classes('B': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@126
+    classes('C': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@126
+    classes('Int': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@126
+    classes('Number': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@126
+    classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@126
     classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('invoke': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('x': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@126
+    classes('invoke': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@126
+    classes('x': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@126
     deserializedPackageScope = DeserializedPackageMemberScope@127 // through LazyPackageFragmentScopeForJavaPackage@126
     functions('A': Name@111) = EmptyList@13[empty] // through DeserializedPackageMemberScope@127
-    functions('B': Name@113) = EmptyList@13[empty] // through DeserializedPackageMemberScope@127
-    functions('C': Name@114) = EmptyList@13[empty] // through DeserializedPackageMemberScope@127
+    functions('A': Name@111) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@126
+    functions('B': Name@114) = EmptyList@13[empty] // through DeserializedPackageMemberScope@127
+    functions('B': Name@114) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@126
+    functions('C': Name@115) = EmptyList@13[empty] // through DeserializedPackageMemberScope@127
+    functions('C': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@126
     functions('get': Name@12) = EmptyList@13[empty] // through DeserializedPackageMemberScope@127
-    functions('invoke': Name@115) = EmptyList@13[empty] // through DeserializedPackageMemberScope@127
-    functions('x': Name@117) = EmptyList@13[empty] // through DeserializedPackageMemberScope@127
+    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@126
+    functions('invoke': Name@120) = EmptyList@13[empty] // through DeserializedPackageMemberScope@127
+    functions('invoke': Name@120) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@126
+    functions('x': Name@122) = EmptyList@13[empty] // through DeserializedPackageMemberScope@127
+    functions('x': Name@122) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@126
     memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@126
     membersProtos = HashMap@129 // through DeserializedPackageMemberScope@127
     properties('A': Name@111) = EmptyList@13[empty] // through DeserializedPackageMemberScope@127
-    properties('B': Name@113) = EmptyList@13[empty] // through DeserializedPackageMemberScope@127
-    properties('C': Name@114) = EmptyList@13[empty] // through DeserializedPackageMemberScope@127
+    properties('B': Name@114) = EmptyList@13[empty] // through DeserializedPackageMemberScope@127
+    properties('C': Name@115) = EmptyList@13[empty] // through DeserializedPackageMemberScope@127
     properties('get': Name@12) = EmptyList@13[empty] // through DeserializedPackageMemberScope@127
-    properties('x': Name@117) = EmptyList@13[empty] // through DeserializedPackageMemberScope@127
+    properties('x': Name@122) = EmptyList@13[empty] // through DeserializedPackageMemberScope@127
 }
 
 LazyJavaPackageFragment@68['java'] {
-    _functions('lang': Name@130) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('lang': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@131
+    classes('lang': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@131
+    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@131
+    functions('lang': Name@132) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@131
     memberIndex = computeMemberIndex$1@133 // through LazyPackageFragmentScopeForJavaPackage@131
 }
 
 LazyJavaPackageFragment@100['jvm'] {
-    _functions('A': Name@111) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    _functions('B': Name@113) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    _functions('C': Name@114) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    _functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    _functions('invoke': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    _functions('x': Name@117) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@134
     classes('A': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('Any': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('B': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('C': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('Int': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('Number': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('String': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('Any': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('B': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('C': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('Int': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('Number': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@134
     classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('invoke': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('x': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('invoke': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('x': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@134
+    functions('A': Name@111) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@134
+    functions('B': Name@114) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@134
+    functions('C': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@134
+    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@134
+    functions('invoke': Name@120) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@134
+    functions('x': Name@122) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@134
     memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@134
 }
 
 LazyJavaPackageFragment@80['kotlin'] {
-    _functions('A': Name@111) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    _functions('B': Name@113) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    _functions('C': Name@114) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    _functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    _functions('invoke': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    _functions('io': Name@137) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    _functions('jvm': Name@138) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    _functions('reflect': Name@139) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    _functions('x': Name@117) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
     classes('A': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Any': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('B': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('C': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('CharSequence': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Int': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Number': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('String': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('Any': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('B': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('C': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('CharSequence': Name@137) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('Int': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('Number': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@136
     classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('invoke': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('io': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('jvm': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('reflect': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('x': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    deserializedPackageScope = DeserializedPackageMemberScope@144 // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('A': Name@111) = EmptyList@13[empty] // through DeserializedPackageMemberScope@144
-    functions('B': Name@113) = EmptyList@13[empty] // through DeserializedPackageMemberScope@144
-    functions('C': Name@114) = EmptyList@13[empty] // through DeserializedPackageMemberScope@144
-    functions('get': Name@12) = ArrayList@145[2] { DeserializedSimpleFunctionDescriptor@146['get'], DeserializedSimpleFunctionDescriptor@147['get'] } // through DeserializedPackageMemberScope@144
-    functions('invoke': Name@115) = EmptyList@13[empty] // through DeserializedPackageMemberScope@144
-    functions('io': Name@137) = EmptyList@13[empty] // through DeserializedPackageMemberScope@144
-    functions('jvm': Name@138) = EmptyList@13[empty] // through DeserializedPackageMemberScope@144
-    functions('reflect': Name@139) = EmptyList@13[empty] // through DeserializedPackageMemberScope@144
-    functions('x': Name@117) = EmptyList@13[empty] // through DeserializedPackageMemberScope@144
+    classes('invoke': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('io': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('jvm': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('reflect': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('x': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    deserializedPackageScope = DeserializedPackageMemberScope@141 // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('A': Name@111) = EmptyList@13[empty] // through DeserializedPackageMemberScope@141
+    functions('A': Name@111) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('B': Name@114) = EmptyList@13[empty] // through DeserializedPackageMemberScope@141
+    functions('B': Name@114) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('C': Name@115) = EmptyList@13[empty] // through DeserializedPackageMemberScope@141
+    functions('C': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('get': Name@12) = ArrayList@142[2] { DeserializedSimpleFunctionDescriptor@143['get'], DeserializedSimpleFunctionDescriptor@144['get'] } // through DeserializedPackageMemberScope@141
+    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('invoke': Name@120) = EmptyList@13[empty] // through DeserializedPackageMemberScope@141
+    functions('invoke': Name@120) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('io': Name@145) = EmptyList@13[empty] // through DeserializedPackageMemberScope@141
+    functions('io': Name@145) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('jvm': Name@146) = EmptyList@13[empty] // through DeserializedPackageMemberScope@141
+    functions('jvm': Name@146) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('reflect': Name@147) = EmptyList@13[empty] // through DeserializedPackageMemberScope@141
+    functions('reflect': Name@147) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('x': Name@122) = EmptyList@13[empty] // through DeserializedPackageMemberScope@141
+    functions('x': Name@122) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
     memberIndex = computeMemberIndex$1@148 // through LazyPackageFragmentScopeForJavaPackage@136
-    membersProtos = HashMap@149 // through DeserializedPackageMemberScope@144
-    properties('A': Name@111) = EmptyList@13[empty] // through DeserializedPackageMemberScope@144
-    properties('B': Name@113) = EmptyList@13[empty] // through DeserializedPackageMemberScope@144
-    properties('C': Name@114) = EmptyList@13[empty] // through DeserializedPackageMemberScope@144
-    properties('get': Name@12) = EmptyList@13[empty] // through DeserializedPackageMemberScope@144
-    properties('io': Name@137) = EmptyList@13[empty] // through DeserializedPackageMemberScope@144
-    properties('jvm': Name@138) = EmptyList@13[empty] // through DeserializedPackageMemberScope@144
-    properties('reflect': Name@139) = EmptyList@13[empty] // through DeserializedPackageMemberScope@144
-    properties('x': Name@117) = EmptyList@13[empty] // through DeserializedPackageMemberScope@144
+    membersProtos = HashMap@149 // through DeserializedPackageMemberScope@141
+    properties('A': Name@111) = EmptyList@13[empty] // through DeserializedPackageMemberScope@141
+    properties('B': Name@114) = EmptyList@13[empty] // through DeserializedPackageMemberScope@141
+    properties('C': Name@115) = EmptyList@13[empty] // through DeserializedPackageMemberScope@141
+    properties('get': Name@12) = EmptyList@13[empty] // through DeserializedPackageMemberScope@141
+    properties('io': Name@145) = EmptyList@13[empty] // through DeserializedPackageMemberScope@141
+    properties('jvm': Name@146) = EmptyList@13[empty] // through DeserializedPackageMemberScope@141
+    properties('reflect': Name@147) = EmptyList@13[empty] // through DeserializedPackageMemberScope@141
+    properties('x': Name@122) = EmptyList@13[empty] // through DeserializedPackageMemberScope@141
 }
 
 LazyJavaPackageFragment@70['lang'] {
-    _functions('A': Name@111) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    _functions('B': Name@113) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    _functions('C': Name@114) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    _functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    _functions('invoke': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    _functions('x': Name@117) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@150
     classes('A': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('B': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('C': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@150
+    classes('B': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@150
+    classes('C': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@150
     classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('invoke': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('x': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@150
+    classes('invoke': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@150
+    classes('x': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@150
+    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@150
+    functions('A': Name@111) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@150
+    functions('B': Name@114) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@150
+    functions('C': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@150
+    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@150
+    functions('invoke': Name@120) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@150
+    functions('x': Name@122) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@150
     memberIndex = computeMemberIndex$1@151 // through LazyPackageFragmentScopeForJavaPackage@150
 }
 
 LazyJavaPackageFragment@11['reflect'] {
-    _functions('KMemberProperty': Name@152) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@153
-    classes('KCallable': Name@154) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@153
-    classes('KMemberProperty': Name@155) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@153
-    classes('KProperty': Name@156) = DeserializedClassDescriptor@6['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@153
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@153
+    classes('KCallable': Name@152) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@153
+    classes('KMemberProperty': Name@154) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@153
+    classes('KProperty': Name@155) = DeserializedClassDescriptor@6['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@153
+    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@153
+    functions('KMemberProperty': Name@156) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@153
     memberIndex = computeMemberIndex$1@157 // through LazyPackageFragmentScopeForJavaPackage@153
 }
 

compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.lazy.log

@@ -59,19 +59,19 @@ DeserializedType@37['T in kotlin.reflect.KMemberProperty'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@33
 }
 
-DeserializedType@38['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@39
-    memberScope = DeserializedClassMemberScope@40
+DeserializedType@35['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@38
+    memberScope = DeserializedClassMemberScope@39
+}
+
+DeserializedType@40['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@38
+    memberScope = DeserializedClassMemberScope@39
 }
 
 DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@39
-    memberScope = DeserializedClassMemberScope@40
-}
-
-DeserializedType@35['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@39
-    memberScope = DeserializedClassMemberScope@40
+    constructor = DeserializedClassTypeConstructor@38
+    memberScope = DeserializedClassMemberScope@39
 }
 
 DeserializedType@41['kotlin.reflect.KCallable'] {
@@ -85,146 +85,146 @@ DeserializedType@44['kotlin.reflect.KProperty'] {
 }
 
 LazyJavaPackageFragmentProvider@47 {
-    _packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    _packageFragments('Base': FqName@50) = null
-    _packageFragments('Derived': FqName@51) = null
-    _packageFragments('Int': FqName@52) = null
-    _packageFragments('KMemberProperty': FqName@53) = null
-    _packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
-    _packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
-    _packageFragments('java.lang.Base': FqName@58) = null
-    _packageFragments('java.lang.Int': FqName@59) = null
-    _packageFragments('java.lang.KMemberProperty': FqName@60) = null
-    _packageFragments('kotlin': FqName@61) = LazyJavaPackageFragment@62['kotlin']
-    _packageFragments('kotlin.Base': FqName@63) = null
-    _packageFragments('kotlin.Int': FqName@64) = null
-    _packageFragments('kotlin.KMemberProperty': FqName@65) = null
-    _packageFragments('kotlin.io': FqName@66) = LazyJavaPackageFragment@67['io']
-    _packageFragments('kotlin.io.Base': FqName@68) = null
-    _packageFragments('kotlin.io.Int': FqName@69) = null
-    _packageFragments('kotlin.io.KMemberProperty': FqName@70) = null
-    _packageFragments('kotlin.jvm': FqName@71) = LazyJavaPackageFragment@72['jvm']
-    _packageFragments('kotlin.jvm.Base': FqName@73) = null
-    _packageFragments('kotlin.jvm.Int': FqName@74) = null
-    _packageFragments('kotlin.jvm.KMemberProperty': FqName@75) = null
-    _packageFragments('kotlin.reflect': FqName@76) = LazyJavaPackageFragment@9['reflect']
-    _packageFragments('kotlin.reflect.KMemberProperty': FqName@77) = null
+    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
+    packageFragments('Base': FqName@50) = null
+    packageFragments('Derived': FqName@51) = null
+    packageFragments('Int': FqName@52) = null
+    packageFragments('KMemberProperty': FqName@53) = null
+    packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
+    packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
+    packageFragments('java.lang.Base': FqName@58) = null
+    packageFragments('java.lang.Int': FqName@59) = null
+    packageFragments('java.lang.KMemberProperty': FqName@60) = null
+    packageFragments('kotlin': FqName@61) = LazyJavaPackageFragment@62['kotlin']
+    packageFragments('kotlin.Base': FqName@63) = null
+    packageFragments('kotlin.Int': FqName@64) = null
+    packageFragments('kotlin.KMemberProperty': FqName@65) = null
+    packageFragments('kotlin.io': FqName@66) = LazyJavaPackageFragment@67['io']
+    packageFragments('kotlin.io.Base': FqName@68) = null
+    packageFragments('kotlin.io.Int': FqName@69) = null
+    packageFragments('kotlin.io.KMemberProperty': FqName@70) = null
+    packageFragments('kotlin.jvm': FqName@71) = LazyJavaPackageFragment@72['jvm']
+    packageFragments('kotlin.jvm.Base': FqName@73) = null
+    packageFragments('kotlin.jvm.Int': FqName@74) = null
+    packageFragments('kotlin.jvm.KMemberProperty': FqName@75) = null
+    packageFragments('kotlin.reflect': FqName@76) = LazyJavaPackageFragment@9['reflect']
+    packageFragments('kotlin.reflect.KMemberProperty': FqName@77) = null
 }
 
 LazyJavaPackageFragment@49['<root>'] {
-    _functions('Derived': Name@78) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    _functions('foo': Name@80) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    _functions('get': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    _functions('invoke': Name@81) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    _functions('kotlin': Name@82) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@79
     classes('Derived': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('Int': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('KMemberProperty': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('KMemberProperty': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('foo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@79
     classes('get': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('invoke': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('kotlin': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('invoke': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('kotlin': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('Derived': Name@78) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('foo': Name@82) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('get': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('invoke': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('kotlin': Name@86) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@79
     memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
 LazyJavaPackageFragment@67['io'] {
-    _functions('Derived': Name@78) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    _functions('foo': Name@80) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    _functions('get': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    _functions('invoke': Name@81) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@88
     classes('Derived': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('Int': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('foo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@88
     classes('get': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('invoke': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('invoke': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@88
     deserializedPackageScope = DeserializedPackageMemberScope@89 // through LazyPackageFragmentScopeForJavaPackage@88
     functions('Derived': Name@78) = EmptyList@11[empty] // through DeserializedPackageMemberScope@89
-    functions('foo': Name@80) = EmptyList@11[empty] // through DeserializedPackageMemberScope@89
+    functions('Derived': Name@78) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('foo': Name@82) = EmptyList@11[empty] // through DeserializedPackageMemberScope@89
+    functions('foo': Name@82) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@88
     functions('get': Name@10) = EmptyList@11[empty] // through DeserializedPackageMemberScope@89
-    functions('invoke': Name@81) = EmptyList@11[empty] // through DeserializedPackageMemberScope@89
+    functions('get': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('invoke': Name@83) = EmptyList@11[empty] // through DeserializedPackageMemberScope@89
+    functions('invoke': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@88
     memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@88
     membersProtos = HashMap@91 // through DeserializedPackageMemberScope@89
     properties('Derived': Name@78) = EmptyList@11[empty] // through DeserializedPackageMemberScope@89
-    properties('foo': Name@80) = EmptyList@11[empty] // through DeserializedPackageMemberScope@89
+    properties('foo': Name@82) = EmptyList@11[empty] // through DeserializedPackageMemberScope@89
     properties('get': Name@10) = EmptyList@11[empty] // through DeserializedPackageMemberScope@89
 }
 
 LazyJavaPackageFragment@55['java'] {
-    _functions('lang': Name@92) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('lang': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@93
+    functions('lang': Name@94) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@93
     memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
 }
 
 LazyJavaPackageFragment@72['jvm'] {
-    _functions('Derived': Name@78) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    _functions('foo': Name@80) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    _functions('get': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    _functions('invoke': Name@81) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@96
     classes('Derived': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('Int': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('foo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@96
     classes('get': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('invoke': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('invoke': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('Derived': Name@78) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('foo': Name@82) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('get': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('invoke': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@96
     memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
 LazyJavaPackageFragment@62['kotlin'] {
-    _functions('Derived': Name@78) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    _functions('foo': Name@80) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    _functions('get': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    _functions('invoke': Name@81) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    _functions('io': Name@99) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    _functions('jvm': Name@100) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    _functions('reflect': Name@101) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('Any': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('Derived': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('Int': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('get': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('invoke': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('io': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('jvm': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('reflect': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = DeserializedPackageMemberScope@106 // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('Derived': Name@78) = EmptyList@11[empty] // through DeserializedPackageMemberScope@106
-    functions('foo': Name@80) = EmptyList@11[empty] // through DeserializedPackageMemberScope@106
-    functions('get': Name@10) = ArrayList@107[2] { DeserializedSimpleFunctionDescriptor@108['get'], DeserializedSimpleFunctionDescriptor@109['get'] } // through DeserializedPackageMemberScope@106
-    functions('invoke': Name@81) = EmptyList@11[empty] // through DeserializedPackageMemberScope@106
-    functions('io': Name@99) = EmptyList@11[empty] // through DeserializedPackageMemberScope@106
-    functions('jvm': Name@100) = EmptyList@11[empty] // through DeserializedPackageMemberScope@106
-    functions('reflect': Name@101) = EmptyList@11[empty] // through DeserializedPackageMemberScope@106
-    memberIndex = computeMemberIndex$1@110 // through LazyPackageFragmentScopeForJavaPackage@98
-    membersProtos = HashMap@111 // through DeserializedPackageMemberScope@106
-    properties('Derived': Name@78) = EmptyList@11[empty] // through DeserializedPackageMemberScope@106
-    properties('foo': Name@80) = EmptyList@11[empty] // through DeserializedPackageMemberScope@106
-    properties('get': Name@10) = EmptyList@11[empty] // through DeserializedPackageMemberScope@106
-    properties('io': Name@99) = EmptyList@11[empty] // through DeserializedPackageMemberScope@106
-    properties('jvm': Name@100) = EmptyList@11[empty] // through DeserializedPackageMemberScope@106
-    properties('reflect': Name@101) = EmptyList@11[empty] // through DeserializedPackageMemberScope@106
+    classes('Any': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('Derived': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('foo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('get': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('invoke': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('io': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('jvm': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('reflect': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    deserializedPackageScope = DeserializedPackageMemberScope@103 // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('Derived': Name@78) = EmptyList@11[empty] // through DeserializedPackageMemberScope@103
+    functions('Derived': Name@78) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('foo': Name@82) = EmptyList@11[empty] // through DeserializedPackageMemberScope@103
+    functions('foo': Name@82) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('get': Name@10) = ArrayList@104[2] { DeserializedSimpleFunctionDescriptor@105['get'], DeserializedSimpleFunctionDescriptor@106['get'] } // through DeserializedPackageMemberScope@103
+    functions('get': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('invoke': Name@83) = EmptyList@11[empty] // through DeserializedPackageMemberScope@103
+    functions('invoke': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('io': Name@107) = EmptyList@11[empty] // through DeserializedPackageMemberScope@103
+    functions('io': Name@107) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('jvm': Name@108) = EmptyList@11[empty] // through DeserializedPackageMemberScope@103
+    functions('jvm': Name@108) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('reflect': Name@109) = EmptyList@11[empty] // through DeserializedPackageMemberScope@103
+    functions('reflect': Name@109) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    memberIndex = computeMemberIndex$1@110 // through LazyPackageFragmentScopeForJavaPackage@99
+    membersProtos = HashMap@111 // through DeserializedPackageMemberScope@103
+    properties('Derived': Name@78) = EmptyList@11[empty] // through DeserializedPackageMemberScope@103
+    properties('foo': Name@82) = EmptyList@11[empty] // through DeserializedPackageMemberScope@103
+    properties('get': Name@10) = EmptyList@11[empty] // through DeserializedPackageMemberScope@103
+    properties('io': Name@107) = EmptyList@11[empty] // through DeserializedPackageMemberScope@103
+    properties('jvm': Name@108) = EmptyList@11[empty] // through DeserializedPackageMemberScope@103
+    properties('reflect': Name@109) = EmptyList@11[empty] // through DeserializedPackageMemberScope@103
 }
 
 LazyJavaPackageFragment@57['lang'] {
-    _functions('Derived': Name@78) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('foo': Name@80) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('get': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    _functions('invoke': Name@81) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@112
     classes('Derived': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('foo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@112
     classes('get': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('invoke': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('invoke': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@112
+    functions('Derived': Name@78) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@112
+    functions('foo': Name@82) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@112
+    functions('get': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@112
+    functions('invoke': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@112
     memberIndex = computeMemberIndex$1@113 // through LazyPackageFragmentScopeForJavaPackage@112
 }
 
 LazyJavaPackageFragment@9['reflect'] {
-    _functions('KMemberProperty': Name@114) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('KCallable': Name@116) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('KMemberProperty': Name@117) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('KProperty': Name@118) = DeserializedClassDescriptor@6['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('KCallable': Name@114) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('KMemberProperty': Name@116) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('KProperty': Name@117) = DeserializedClassDescriptor@6['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@115
+    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('KMemberProperty': Name@118) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@115
     memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@115
 }
 

compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.lazy.log

@@ -35,11 +35,6 @@ DeserializedTypeParameterDescriptor@20['T'] {
     upperBounds = LinkedHashSet@22[1] { DeserializedType@23['kotlin.Any'] }
 }
 
-DeserializedType@15['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@24
-    memberScope = DeserializedClassMemberScope@25
-}
-
 DeserializedType@19['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@24
     memberScope = DeserializedClassMemberScope@25
@@ -50,151 +45,156 @@ DeserializedType@11['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@25
 }
 
+DeserializedType@15['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@24
+    memberScope = DeserializedClassMemberScope@25
+}
+
 DeserializedType@23['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@24
     memberScope = DeserializedClassMemberScope@25
 }
 
 LazyJavaPackageFragmentProvider@26 {
-    _packageFragments('<root>': FqName@27) = LazyJavaPackageFragment@28['<root>']
-    _packageFragments('A': FqName@29) = null
-    _packageFragments('Int': FqName@30) = null
-    _packageFragments('KMemberProperty': FqName@31) = null
-    _packageFragments('KMutableMemberProperty': FqName@32) = null
-    _packageFragments('java': FqName@33) = LazyJavaPackageFragment@34['java']
-    _packageFragments('java.lang': FqName@35) = LazyJavaPackageFragment@36['lang']
-    _packageFragments('java.lang.A': FqName@37) = null
-    _packageFragments('java.lang.Int': FqName@38) = null
-    _packageFragments('java.lang.KMemberProperty': FqName@39) = null
-    _packageFragments('java.lang.KMutableMemberProperty': FqName@40) = null
-    _packageFragments('kotlin': FqName@41) = LazyJavaPackageFragment@42['kotlin']
-    _packageFragments('kotlin.A': FqName@43) = null
-    _packageFragments('kotlin.Int': FqName@44) = null
-    _packageFragments('kotlin.KMemberProperty': FqName@45) = null
-    _packageFragments('kotlin.KMutableMemberProperty': FqName@46) = null
-    _packageFragments('kotlin.io': FqName@47) = LazyJavaPackageFragment@48['io']
-    _packageFragments('kotlin.io.A': FqName@49) = null
-    _packageFragments('kotlin.io.Int': FqName@50) = null
-    _packageFragments('kotlin.io.KMemberProperty': FqName@51) = null
-    _packageFragments('kotlin.io.KMutableMemberProperty': FqName@52) = null
-    _packageFragments('kotlin.jvm': FqName@53) = LazyJavaPackageFragment@54['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@55) = null
-    _packageFragments('kotlin.jvm.Int': FqName@56) = null
-    _packageFragments('kotlin.jvm.KMemberProperty': FqName@57) = null
-    _packageFragments('kotlin.jvm.KMutableMemberProperty': FqName@58) = null
-    _packageFragments('kotlin.reflect': FqName@59) = LazyJavaPackageFragment@7['reflect']
-    _packageFragments('kotlin.reflect.A': FqName@60) = null
-    _packageFragments('kotlin.reflect.Int': FqName@61) = null
-    _packageFragments('kotlin.reflect.KMemberProperty': FqName@62) = null
-    _packageFragments('kotlin.reflect.KMutableMemberProperty': FqName@63) = null
+    packageFragments('<root>': FqName@27) = LazyJavaPackageFragment@28['<root>']
+    packageFragments('A': FqName@29) = null
+    packageFragments('Int': FqName@30) = null
+    packageFragments('KMemberProperty': FqName@31) = null
+    packageFragments('KMutableMemberProperty': FqName@32) = null
+    packageFragments('java': FqName@33) = LazyJavaPackageFragment@34['java']
+    packageFragments('java.lang': FqName@35) = LazyJavaPackageFragment@36['lang']
+    packageFragments('java.lang.A': FqName@37) = null
+    packageFragments('java.lang.Int': FqName@38) = null
+    packageFragments('java.lang.KMemberProperty': FqName@39) = null
+    packageFragments('java.lang.KMutableMemberProperty': FqName@40) = null
+    packageFragments('kotlin': FqName@41) = LazyJavaPackageFragment@42['kotlin']
+    packageFragments('kotlin.A': FqName@43) = null
+    packageFragments('kotlin.Int': FqName@44) = null
+    packageFragments('kotlin.KMemberProperty': FqName@45) = null
+    packageFragments('kotlin.KMutableMemberProperty': FqName@46) = null
+    packageFragments('kotlin.io': FqName@47) = LazyJavaPackageFragment@48['io']
+    packageFragments('kotlin.io.A': FqName@49) = null
+    packageFragments('kotlin.io.Int': FqName@50) = null
+    packageFragments('kotlin.io.KMemberProperty': FqName@51) = null
+    packageFragments('kotlin.io.KMutableMemberProperty': FqName@52) = null
+    packageFragments('kotlin.jvm': FqName@53) = LazyJavaPackageFragment@54['jvm']
+    packageFragments('kotlin.jvm.A': FqName@55) = null
+    packageFragments('kotlin.jvm.Int': FqName@56) = null
+    packageFragments('kotlin.jvm.KMemberProperty': FqName@57) = null
+    packageFragments('kotlin.jvm.KMutableMemberProperty': FqName@58) = null
+    packageFragments('kotlin.reflect': FqName@59) = LazyJavaPackageFragment@7['reflect']
+    packageFragments('kotlin.reflect.A': FqName@60) = null
+    packageFragments('kotlin.reflect.Int': FqName@61) = null
+    packageFragments('kotlin.reflect.KMemberProperty': FqName@62) = null
+    packageFragments('kotlin.reflect.KMutableMemberProperty': FqName@63) = null
 }
 
 LazyJavaPackageFragment@28['<root>'] {
-    _functions('f': Name@64) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('g': Name@67) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('invoke': Name@68) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('kotlin': Name@69) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Int': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('KMemberProperty': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('KMutableMemberProperty': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('f': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('g': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('invoke': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('kotlin': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('Int': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('KMemberProperty': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('KMutableMemberProperty': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('f': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('g': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('invoke': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('kotlin': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('f': Name@68) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('g': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('invoke': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('kotlin': Name@74) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@65
 }
 
 LazyJavaPackageFragment@48['io'] {
-    _functions('f': Name@64) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    _functions('g': Name@67) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    _functions('invoke': Name@68) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('Int': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('f': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('g': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('invoke': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('Int': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('f': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('g': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('invoke': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@76
     deserializedPackageScope = DeserializedPackageMemberScope@77 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('f': Name@64) = EmptyList@65[empty] // through DeserializedPackageMemberScope@77
-    functions('g': Name@67) = EmptyList@65[empty] // through DeserializedPackageMemberScope@77
-    functions('invoke': Name@68) = EmptyList@65[empty] // through DeserializedPackageMemberScope@77
+    functions('f': Name@68) = EmptyList@73[empty] // through DeserializedPackageMemberScope@77
+    functions('f': Name@68) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('g': Name@69) = EmptyList@73[empty] // through DeserializedPackageMemberScope@77
+    functions('g': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('invoke': Name@70) = EmptyList@73[empty] // through DeserializedPackageMemberScope@77
+    functions('invoke': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
     memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
     membersProtos = HashMap@79 // through DeserializedPackageMemberScope@77
-    properties('f': Name@64) = EmptyList@65[empty] // through DeserializedPackageMemberScope@77
-    properties('g': Name@67) = EmptyList@65[empty] // through DeserializedPackageMemberScope@77
+    properties('f': Name@68) = EmptyList@73[empty] // through DeserializedPackageMemberScope@77
+    properties('g': Name@69) = EmptyList@73[empty] // through DeserializedPackageMemberScope@77
 }
 
 LazyJavaPackageFragment@34['java'] {
-    _functions('lang': Name@80) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('lang': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('lang': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('lang': Name@82) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@81
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
 LazyJavaPackageFragment@54['jvm'] {
-    _functions('f': Name@64) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    _functions('g': Name@67) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    _functions('invoke': Name@68) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('Int': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('f': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('g': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('invoke': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('Int': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('f': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('g': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('invoke': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('f': Name@68) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('g': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('invoke': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@84
     memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
 }
 
 LazyJavaPackageFragment@42['kotlin'] {
-    _functions('f': Name@64) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    _functions('g': Name@67) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    _functions('invoke': Name@68) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    _functions('io': Name@87) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    _functions('jvm': Name@88) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    _functions('reflect': Name@89) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('Any': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('Int': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('f': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('g': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('invoke': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('io': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('jvm': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('reflect': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = DeserializedPackageMemberScope@94 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('f': Name@64) = EmptyList@65[empty] // through DeserializedPackageMemberScope@94
-    functions('g': Name@67) = EmptyList@65[empty] // through DeserializedPackageMemberScope@94
-    functions('invoke': Name@68) = EmptyList@65[empty] // through DeserializedPackageMemberScope@94
-    functions('io': Name@87) = EmptyList@65[empty] // through DeserializedPackageMemberScope@94
-    functions('jvm': Name@88) = EmptyList@65[empty] // through DeserializedPackageMemberScope@94
-    functions('reflect': Name@89) = EmptyList@65[empty] // through DeserializedPackageMemberScope@94
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@86
-    membersProtos = HashMap@96 // through DeserializedPackageMemberScope@94
-    properties('f': Name@64) = EmptyList@65[empty] // through DeserializedPackageMemberScope@94
-    properties('g': Name@67) = EmptyList@65[empty] // through DeserializedPackageMemberScope@94
-    properties('io': Name@87) = EmptyList@65[empty] // through DeserializedPackageMemberScope@94
-    properties('jvm': Name@88) = EmptyList@65[empty] // through DeserializedPackageMemberScope@94
-    properties('reflect': Name@89) = EmptyList@65[empty] // through DeserializedPackageMemberScope@94
+    classes('Any': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('Int': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('f': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('g': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('invoke': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('io': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('jvm': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('reflect': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = DeserializedPackageMemberScope@91 // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('f': Name@68) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
+    functions('f': Name@68) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('g': Name@69) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
+    functions('g': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('invoke': Name@70) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
+    functions('invoke': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('io': Name@92) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
+    functions('io': Name@92) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('jvm': Name@93) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
+    functions('jvm': Name@93) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('reflect': Name@94) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
+    functions('reflect': Name@94) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@87
+    membersProtos = HashMap@96 // through DeserializedPackageMemberScope@91
+    properties('f': Name@68) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
+    properties('g': Name@69) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
+    properties('io': Name@92) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
+    properties('jvm': Name@93) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
+    properties('reflect': Name@94) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
 }
 
 LazyJavaPackageFragment@36['lang'] {
-    _functions('f': Name@64) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    _functions('g': Name@67) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    _functions('invoke': Name@68) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('f': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('g': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('invoke': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('f': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('g': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('invoke': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@97
+    functions('f': Name@68) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@97
+    functions('g': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@97
+    functions('invoke': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@97
     memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@97
 }
 
 LazyJavaPackageFragment@7['reflect'] {
-    _functions('f': Name@64) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    _functions('g': Name@67) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    _functions('invoke': Name@68) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('Int': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('KMemberProperty': Name@71) = DeserializedClassDescriptor@2['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('KMutableMemberProperty': Name@72) = DeserializedClassDescriptor@4['KMutableMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('f': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('g': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('invoke': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('Int': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('KMemberProperty': Name@66) = DeserializedClassDescriptor@2['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('KMutableMemberProperty': Name@67) = DeserializedClassDescriptor@4['KMutableMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('f': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('g': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('invoke': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('f': Name@68) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('g': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('invoke': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@99
     memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@99
 }
 

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

@@ -86,11 +86,11 @@ DeserializedType@43['R in kotlin.reflect.KTopLevelExtensionProperty'] {
 }
 
 DeserializedType@44['T in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@39
+    constructor = AbstractLazyTypeParameterDescriptor$1@41
 }
 
 DeserializedType@45['T in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@41
+    constructor = AbstractLazyTypeParameterDescriptor$1@39
 }
 
 DeserializedType@25['kotlin.Any'] {
@@ -103,12 +103,12 @@ DeserializedType@33['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@47
 }
 
-DeserializedType@21['kotlin.Any'] {
+DeserializedType@37['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@46
     memberScope = DeserializedClassMemberScope@47
 }
 
-DeserializedType@37['kotlin.Any'] {
+DeserializedType@21['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@46
     memberScope = DeserializedClassMemberScope@47
 }
@@ -152,164 +152,164 @@ DeserializedType@64['kotlin.reflect.KTopLevelProperty'] {
 }
 
 LazyJavaPackageFragmentProvider@66 {
-    _packageFragments('<root>': FqName@67) = LazyJavaPackageFragment@68['<root>']
-    _packageFragments('A': FqName@69) = null
-    _packageFragments('Int': FqName@70) = null
-    _packageFragments('KExtensionProperty': FqName@71) = null
-    _packageFragments('KMutableExtensionProperty': FqName@72) = null
-    _packageFragments('String': FqName@73) = null
-    _packageFragments('bar': FqName@74) = null
-    _packageFragments('foo': FqName@75) = null
-    _packageFragments('java': FqName@76) = LazyJavaPackageFragment@77['java']
-    _packageFragments('java.lang': FqName@78) = LazyJavaPackageFragment@79['lang']
-    _packageFragments('java.lang.A': FqName@80) = null
-    _packageFragments('java.lang.Int': FqName@81) = null
-    _packageFragments('java.lang.KExtensionProperty': FqName@82) = null
-    _packageFragments('java.lang.KMutableExtensionProperty': FqName@83) = null
-    _packageFragments('java.lang.String': FqName@84) = null
-    _packageFragments('kotlin': FqName@85) = LazyJavaPackageFragment@86['kotlin']
-    _packageFragments('kotlin.A': FqName@87) = null
-    _packageFragments('kotlin.Int': FqName@88) = null
-    _packageFragments('kotlin.KExtensionProperty': FqName@89) = null
-    _packageFragments('kotlin.KMutableExtensionProperty': FqName@90) = null
-    _packageFragments('kotlin.String': FqName@91) = null
-    _packageFragments('kotlin.io': FqName@92) = LazyJavaPackageFragment@93['io']
-    _packageFragments('kotlin.io.A': FqName@94) = null
-    _packageFragments('kotlin.io.Int': FqName@95) = null
-    _packageFragments('kotlin.io.KExtensionProperty': FqName@96) = null
-    _packageFragments('kotlin.io.KMutableExtensionProperty': FqName@97) = null
-    _packageFragments('kotlin.io.String': FqName@98) = null
-    _packageFragments('kotlin.jvm': FqName@99) = LazyJavaPackageFragment@100['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@101) = null
-    _packageFragments('kotlin.jvm.Int': FqName@102) = null
-    _packageFragments('kotlin.jvm.KExtensionProperty': FqName@103) = null
-    _packageFragments('kotlin.jvm.KMutableExtensionProperty': FqName@104) = null
-    _packageFragments('kotlin.jvm.String': FqName@105) = null
-    _packageFragments('kotlin.reflect': FqName@106) = LazyJavaPackageFragment@17['reflect']
-    _packageFragments('kotlin.reflect.A': FqName@107) = null
-    _packageFragments('kotlin.reflect.Int': FqName@108) = null
-    _packageFragments('kotlin.reflect.KExtensionProperty': FqName@109) = null
-    _packageFragments('kotlin.reflect.KMutableExtensionProperty': FqName@110) = null
-    _packageFragments('kotlin.reflect.String': FqName@111) = null
+    packageFragments('<root>': FqName@67) = LazyJavaPackageFragment@68['<root>']
+    packageFragments('A': FqName@69) = null
+    packageFragments('Int': FqName@70) = null
+    packageFragments('KExtensionProperty': FqName@71) = null
+    packageFragments('KMutableExtensionProperty': FqName@72) = null
+    packageFragments('String': FqName@73) = null
+    packageFragments('bar': FqName@74) = null
+    packageFragments('foo': FqName@75) = null
+    packageFragments('java': FqName@76) = LazyJavaPackageFragment@77['java']
+    packageFragments('java.lang': FqName@78) = LazyJavaPackageFragment@79['lang']
+    packageFragments('java.lang.A': FqName@80) = null
+    packageFragments('java.lang.Int': FqName@81) = null
+    packageFragments('java.lang.KExtensionProperty': FqName@82) = null
+    packageFragments('java.lang.KMutableExtensionProperty': FqName@83) = null
+    packageFragments('java.lang.String': FqName@84) = null
+    packageFragments('kotlin': FqName@85) = LazyJavaPackageFragment@86['kotlin']
+    packageFragments('kotlin.A': FqName@87) = null
+    packageFragments('kotlin.Int': FqName@88) = null
+    packageFragments('kotlin.KExtensionProperty': FqName@89) = null
+    packageFragments('kotlin.KMutableExtensionProperty': FqName@90) = null
+    packageFragments('kotlin.String': FqName@91) = null
+    packageFragments('kotlin.io': FqName@92) = LazyJavaPackageFragment@93['io']
+    packageFragments('kotlin.io.A': FqName@94) = null
+    packageFragments('kotlin.io.Int': FqName@95) = null
+    packageFragments('kotlin.io.KExtensionProperty': FqName@96) = null
+    packageFragments('kotlin.io.KMutableExtensionProperty': FqName@97) = null
+    packageFragments('kotlin.io.String': FqName@98) = null
+    packageFragments('kotlin.jvm': FqName@99) = LazyJavaPackageFragment@100['jvm']
+    packageFragments('kotlin.jvm.A': FqName@101) = null
+    packageFragments('kotlin.jvm.Int': FqName@102) = null
+    packageFragments('kotlin.jvm.KExtensionProperty': FqName@103) = null
+    packageFragments('kotlin.jvm.KMutableExtensionProperty': FqName@104) = null
+    packageFragments('kotlin.jvm.String': FqName@105) = null
+    packageFragments('kotlin.reflect': FqName@106) = LazyJavaPackageFragment@17['reflect']
+    packageFragments('kotlin.reflect.A': FqName@107) = null
+    packageFragments('kotlin.reflect.Int': FqName@108) = null
+    packageFragments('kotlin.reflect.KExtensionProperty': FqName@109) = null
+    packageFragments('kotlin.reflect.KMutableExtensionProperty': FqName@110) = null
+    packageFragments('kotlin.reflect.String': FqName@111) = null
 }
 
 LazyJavaPackageFragment@68['<root>'] {
-    _functions('bar': Name@112) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    _functions('foo': Name@115) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    _functions('invoke': Name@116) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    _functions('kotlin': Name@117) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('Int': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('KExtensionProperty': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('KMutableExtensionProperty': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('String': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('bar': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('foo': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('invoke': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('kotlin': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@114
-    memberIndex = computeMemberIndex$1@124 // through LazyPackageFragmentScopeForJavaPackage@114
+    classes('Int': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('KExtensionProperty': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('KMutableExtensionProperty': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('String': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('bar': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('foo': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('invoke': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('kotlin': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('bar': Name@117) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('foo': Name@118) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('invoke': Name@119) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('kotlin': Name@123) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    memberIndex = computeMemberIndex$1@124 // through LazyPackageFragmentScopeForJavaPackage@113
 }
 
 LazyJavaPackageFragment@93['io'] {
-    _functions('bar': Name@112) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    _functions('foo': Name@115) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    _functions('invoke': Name@116) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('Int': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('String': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('bar': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('foo': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('invoke': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('Int': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('String': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('bar': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('foo': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('invoke': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@125
     deserializedPackageScope = DeserializedPackageMemberScope@126 // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('bar': Name@112) = EmptyList@113[empty] // through DeserializedPackageMemberScope@126
-    functions('foo': Name@115) = EmptyList@113[empty] // through DeserializedPackageMemberScope@126
-    functions('invoke': Name@116) = EmptyList@113[empty] // through DeserializedPackageMemberScope@126
+    functions('bar': Name@117) = EmptyList@122[empty] // through DeserializedPackageMemberScope@126
+    functions('bar': Name@117) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('foo': Name@118) = EmptyList@122[empty] // through DeserializedPackageMemberScope@126
+    functions('foo': Name@118) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('invoke': Name@119) = EmptyList@122[empty] // through DeserializedPackageMemberScope@126
+    functions('invoke': Name@119) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@125
     memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@125
     membersProtos = HashMap@128 // through DeserializedPackageMemberScope@126
-    properties('bar': Name@112) = EmptyList@113[empty] // through DeserializedPackageMemberScope@126
-    properties('foo': Name@115) = EmptyList@113[empty] // through DeserializedPackageMemberScope@126
+    properties('bar': Name@117) = EmptyList@122[empty] // through DeserializedPackageMemberScope@126
+    properties('foo': Name@118) = EmptyList@122[empty] // through DeserializedPackageMemberScope@126
 }
 
 LazyJavaPackageFragment@77['java'] {
-    _functions('lang': Name@129) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('lang': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('lang': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('lang': Name@131) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@130
     memberIndex = computeMemberIndex$1@132 // through LazyPackageFragmentScopeForJavaPackage@130
 }
 
 LazyJavaPackageFragment@100['jvm'] {
-    _functions('bar': Name@112) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    _functions('foo': Name@115) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    _functions('invoke': Name@116) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('Int': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('String': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('bar': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('foo': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('invoke': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('Int': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('String': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('bar': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('foo': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('invoke': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@133
+    functions('bar': Name@117) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@133
+    functions('foo': Name@118) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@133
+    functions('invoke': Name@119) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@133
     memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@133
 }
 
 LazyJavaPackageFragment@86['kotlin'] {
-    _functions('bar': Name@112) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    _functions('foo': Name@115) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    _functions('invoke': Name@116) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    _functions('io': Name@136) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    _functions('jvm': Name@137) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    _functions('reflect': Name@138) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Any': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Int': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('String': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('bar': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('foo': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('invoke': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('io': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('jvm': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('reflect': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    deserializedPackageScope = DeserializedPackageMemberScope@143 // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('bar': Name@112) = EmptyList@113[empty] // through DeserializedPackageMemberScope@143
-    functions('foo': Name@115) = EmptyList@113[empty] // through DeserializedPackageMemberScope@143
-    functions('invoke': Name@116) = EmptyList@113[empty] // through DeserializedPackageMemberScope@143
-    functions('io': Name@136) = EmptyList@113[empty] // through DeserializedPackageMemberScope@143
-    functions('jvm': Name@137) = EmptyList@113[empty] // through DeserializedPackageMemberScope@143
-    functions('reflect': Name@138) = EmptyList@113[empty] // through DeserializedPackageMemberScope@143
-    memberIndex = computeMemberIndex$1@144 // through LazyPackageFragmentScopeForJavaPackage@135
-    membersProtos = HashMap@145 // through DeserializedPackageMemberScope@143
-    properties('bar': Name@112) = EmptyList@113[empty] // through DeserializedPackageMemberScope@143
-    properties('foo': Name@115) = EmptyList@113[empty] // through DeserializedPackageMemberScope@143
-    properties('io': Name@136) = EmptyList@113[empty] // through DeserializedPackageMemberScope@143
-    properties('jvm': Name@137) = EmptyList@113[empty] // through DeserializedPackageMemberScope@143
-    properties('reflect': Name@138) = EmptyList@113[empty] // through DeserializedPackageMemberScope@143
+    classes('Any': Name@135) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('Int': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('String': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('bar': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('foo': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('invoke': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('io': Name@137) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('jvm': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('reflect': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    deserializedPackageScope = DeserializedPackageMemberScope@140 // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('bar': Name@117) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
+    functions('bar': Name@117) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('foo': Name@118) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
+    functions('foo': Name@118) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('invoke': Name@119) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
+    functions('invoke': Name@119) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('io': Name@141) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
+    functions('io': Name@141) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('jvm': Name@142) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
+    functions('jvm': Name@142) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('reflect': Name@143) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
+    functions('reflect': Name@143) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    memberIndex = computeMemberIndex$1@144 // through LazyPackageFragmentScopeForJavaPackage@136
+    membersProtos = HashMap@145 // through DeserializedPackageMemberScope@140
+    properties('bar': Name@117) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
+    properties('foo': Name@118) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
+    properties('io': Name@141) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
+    properties('jvm': Name@142) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
+    properties('reflect': Name@143) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
 }
 
 LazyJavaPackageFragment@79['lang'] {
-    _functions('bar': Name@112) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    _functions('foo': Name@115) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    _functions('invoke': Name@116) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('bar': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('foo': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('invoke': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('bar': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('foo': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('invoke': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@146
+    functions('bar': Name@117) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@146
+    functions('foo': Name@118) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@146
+    functions('invoke': Name@119) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@146
     memberIndex = computeMemberIndex$1@147 // through LazyPackageFragmentScopeForJavaPackage@146
 }
 
 LazyJavaPackageFragment@17['reflect'] {
-    _functions('bar': Name@112) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    _functions('foo': Name@115) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    _functions('invoke': Name@116) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('Int': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('Int': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@148
     classes('KCallable': Name@149) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('KExtensionProperty': Name@119) = DeserializedClassDescriptor@4['KExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('KMutableExtensionProperty': Name@120) = DeserializedClassDescriptor@6['KMutableExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('KExtensionProperty': Name@114) = DeserializedClassDescriptor@4['KExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('KMutableExtensionProperty': Name@115) = DeserializedClassDescriptor@6['KMutableExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@148
     classes('KMutableTopLevelExtensionProperty': Name@150) = DeserializedClassDescriptor@8['KMutableTopLevelExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@148
     classes('KMutableTopLevelProperty': Name@151) = DeserializedClassDescriptor@10['KMutableTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@148
     classes('KProperty': Name@152) = DeserializedClassDescriptor@12['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@148
     classes('KTopLevelExtensionProperty': Name@153) = DeserializedClassDescriptor@14['KTopLevelExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@148
     classes('KTopLevelProperty': Name@154) = DeserializedClassDescriptor@16['KTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('String': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('bar': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('foo': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('invoke': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('String': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('bar': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('foo': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('invoke': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@148
+    functions('bar': Name@117) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@148
+    functions('foo': Name@118) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@148
+    functions('invoke': Name@119) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@148
     memberIndex = computeMemberIndex$1@155 // through LazyPackageFragmentScopeForJavaPackage@148
 }
 

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

@@ -186,19 +186,19 @@ DeserializedType@120['K in kotlin'] {
 }
 
 DeserializedType@121['R in kotlin.reflect.KExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@69
+    constructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 DeserializedType@122['R in kotlin.reflect.KMutableExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@74
+    constructor = AbstractLazyTypeParameterDescriptor$1@79
 }
 
 DeserializedType@123['R in kotlin.reflect.KMutableExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@74
+    constructor = AbstractLazyTypeParameterDescriptor$1@79
 }
 
 DeserializedType@124['R in kotlin.reflect.KMutableExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@74
+    constructor = AbstractLazyTypeParameterDescriptor$1@79
 }
 
 DeserializedType@125['R in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
@@ -210,15 +210,15 @@ DeserializedType@126['R in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
 }
 
 DeserializedType@127['R in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@79
+    constructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
 DeserializedType@128['R in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@79
+    constructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
 DeserializedType@129['T in kotlin.reflect.KExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@98
+    constructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 DeserializedType@130['T in kotlin.reflect.KMutableExtensionProperty'] {
@@ -238,7 +238,7 @@ DeserializedType@133['T in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
 }
 
 DeserializedType@134['T in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@108
+    constructor = AbstractLazyTypeParameterDescriptor$1@98
 }
 
 DeserializedType@135['V in kotlin'] {
@@ -253,12 +253,12 @@ DeserializedType@137['V in kotlin'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@116
 }
 
-DeserializedType@105['kotlin.Any'] {
+DeserializedType@110['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
 }
 
-DeserializedType@85['kotlin.Any'] {
+DeserializedType@105['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
 }
@@ -268,32 +268,7 @@ DeserializedType@118['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@139
 }
 
-DeserializedType@140['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@114['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@110['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@71['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@76['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@100['kotlin.Any'] {
+DeserializedType@81['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
 }
@@ -303,7 +278,32 @@ DeserializedType@66['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@139
 }
 
-DeserializedType@81['kotlin.Any'] {
+DeserializedType@76['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@138
+    memberScope = DeserializedClassMemberScope@139
+}
+
+DeserializedType@114['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@138
+    memberScope = DeserializedClassMemberScope@139
+}
+
+DeserializedType@140['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@138
+    memberScope = DeserializedClassMemberScope@139
+}
+
+DeserializedType@85['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@138
+    memberScope = DeserializedClassMemberScope@139
+}
+
+DeserializedType@71['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@138
+    memberScope = DeserializedClassMemberScope@139
+}
+
+DeserializedType@100['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
 }
@@ -384,237 +384,237 @@ DeserializedType@179['kotlin.reflect.KTopLevelProperty'] {
 }
 
 LazyJavaPackageFragmentProvider@181 {
-    _packageFragments('<root>': FqName@182) = LazyJavaPackageFragment@183['<root>']
-    _packageFragments('Int': FqName@184) = null
-    _packageFragments('KExtensionProperty': FqName@185) = null
-    _packageFragments('KMutableExtensionProperty': FqName@186) = null
-    _packageFragments('KMutableTopLevelExtensionProperty': FqName@187) = null
-    _packageFragments('KTopLevelExtensionProperty': FqName@188) = null
-    _packageFragments('Long': FqName@189) = null
-    _packageFragments('String': FqName@190) = null
-    _packageFragments('countCharacters': FqName@191) = null
-    _packageFragments('java': FqName@192) = LazyJavaPackageFragment@193['java']
-    _packageFragments('java.lang': FqName@194) = LazyJavaPackageFragment@195['lang']
-    _packageFragments('java.lang.Int': FqName@196) = null
-    _packageFragments('java.lang.KExtensionProperty': FqName@197) = null
-    _packageFragments('java.lang.KMutableExtensionProperty': FqName@198) = null
-    _packageFragments('java.lang.KMutableTopLevelExtensionProperty': FqName@199) = null
-    _packageFragments('java.lang.KTopLevelExtensionProperty': FqName@200) = null
-    _packageFragments('java.lang.Long': FqName@201) = null
-    _packageFragments('java.lang.String': FqName@202) = null
-    _packageFragments('kotlin': FqName@203) = LazyJavaPackageFragment@62['kotlin']
-    _packageFragments('kotlin.Int': FqName@204) = null
-    _packageFragments('kotlin.KExtensionProperty': FqName@205) = null
-    _packageFragments('kotlin.KMutableExtensionProperty': FqName@206) = null
-    _packageFragments('kotlin.KMutableTopLevelExtensionProperty': FqName@207) = null
-    _packageFragments('kotlin.KTopLevelExtensionProperty': FqName@208) = null
-    _packageFragments('kotlin.Long': FqName@209) = null
-    _packageFragments('kotlin.String': FqName@210) = null
-    _packageFragments('kotlin.io': FqName@211) = LazyJavaPackageFragment@212['io']
-    _packageFragments('kotlin.io.Int': FqName@213) = null
-    _packageFragments('kotlin.io.KExtensionProperty': FqName@214) = null
-    _packageFragments('kotlin.io.KMutableExtensionProperty': FqName@215) = null
-    _packageFragments('kotlin.io.KMutableTopLevelExtensionProperty': FqName@216) = null
-    _packageFragments('kotlin.io.KTopLevelExtensionProperty': FqName@217) = null
-    _packageFragments('kotlin.io.Long': FqName@218) = null
-    _packageFragments('kotlin.io.String': FqName@219) = null
-    _packageFragments('kotlin.jvm': FqName@220) = LazyJavaPackageFragment@221['jvm']
-    _packageFragments('kotlin.jvm.Int': FqName@222) = null
-    _packageFragments('kotlin.jvm.KExtensionProperty': FqName@223) = null
-    _packageFragments('kotlin.jvm.KMutableExtensionProperty': FqName@224) = null
-    _packageFragments('kotlin.jvm.KMutableTopLevelExtensionProperty': FqName@225) = null
-    _packageFragments('kotlin.jvm.KTopLevelExtensionProperty': FqName@226) = null
-    _packageFragments('kotlin.jvm.Long': FqName@227) = null
-    _packageFragments('kotlin.jvm.String': FqName@228) = null
-    _packageFragments('kotlin.reflect': FqName@229) = LazyJavaPackageFragment@21['reflect']
-    _packageFragments('kotlin.reflect.Int': FqName@230) = null
-    _packageFragments('kotlin.reflect.KExtensionProperty': FqName@231) = null
-    _packageFragments('kotlin.reflect.KMutableExtensionProperty': FqName@232) = null
-    _packageFragments('kotlin.reflect.KMutableTopLevelExtensionProperty': FqName@233) = null
-    _packageFragments('kotlin.reflect.KTopLevelExtensionProperty': FqName@234) = null
-    _packageFragments('kotlin.reflect.Long': FqName@235) = null
-    _packageFragments('kotlin.reflect.String': FqName@236) = null
-    _packageFragments('meaning': FqName@237) = null
+    packageFragments('<root>': FqName@182) = LazyJavaPackageFragment@183['<root>']
+    packageFragments('Int': FqName@184) = null
+    packageFragments('KExtensionProperty': FqName@185) = null
+    packageFragments('KMutableExtensionProperty': FqName@186) = null
+    packageFragments('KMutableTopLevelExtensionProperty': FqName@187) = null
+    packageFragments('KTopLevelExtensionProperty': FqName@188) = null
+    packageFragments('Long': FqName@189) = null
+    packageFragments('String': FqName@190) = null
+    packageFragments('countCharacters': FqName@191) = null
+    packageFragments('java': FqName@192) = LazyJavaPackageFragment@193['java']
+    packageFragments('java.lang': FqName@194) = LazyJavaPackageFragment@195['lang']
+    packageFragments('java.lang.Int': FqName@196) = null
+    packageFragments('java.lang.KExtensionProperty': FqName@197) = null
+    packageFragments('java.lang.KMutableExtensionProperty': FqName@198) = null
+    packageFragments('java.lang.KMutableTopLevelExtensionProperty': FqName@199) = null
+    packageFragments('java.lang.KTopLevelExtensionProperty': FqName@200) = null
+    packageFragments('java.lang.Long': FqName@201) = null
+    packageFragments('java.lang.String': FqName@202) = null
+    packageFragments('kotlin': FqName@203) = LazyJavaPackageFragment@62['kotlin']
+    packageFragments('kotlin.Int': FqName@204) = null
+    packageFragments('kotlin.KExtensionProperty': FqName@205) = null
+    packageFragments('kotlin.KMutableExtensionProperty': FqName@206) = null
+    packageFragments('kotlin.KMutableTopLevelExtensionProperty': FqName@207) = null
+    packageFragments('kotlin.KTopLevelExtensionProperty': FqName@208) = null
+    packageFragments('kotlin.Long': FqName@209) = null
+    packageFragments('kotlin.String': FqName@210) = null
+    packageFragments('kotlin.io': FqName@211) = LazyJavaPackageFragment@212['io']
+    packageFragments('kotlin.io.Int': FqName@213) = null
+    packageFragments('kotlin.io.KExtensionProperty': FqName@214) = null
+    packageFragments('kotlin.io.KMutableExtensionProperty': FqName@215) = null
+    packageFragments('kotlin.io.KMutableTopLevelExtensionProperty': FqName@216) = null
+    packageFragments('kotlin.io.KTopLevelExtensionProperty': FqName@217) = null
+    packageFragments('kotlin.io.Long': FqName@218) = null
+    packageFragments('kotlin.io.String': FqName@219) = null
+    packageFragments('kotlin.jvm': FqName@220) = LazyJavaPackageFragment@221['jvm']
+    packageFragments('kotlin.jvm.Int': FqName@222) = null
+    packageFragments('kotlin.jvm.KExtensionProperty': FqName@223) = null
+    packageFragments('kotlin.jvm.KMutableExtensionProperty': FqName@224) = null
+    packageFragments('kotlin.jvm.KMutableTopLevelExtensionProperty': FqName@225) = null
+    packageFragments('kotlin.jvm.KTopLevelExtensionProperty': FqName@226) = null
+    packageFragments('kotlin.jvm.Long': FqName@227) = null
+    packageFragments('kotlin.jvm.String': FqName@228) = null
+    packageFragments('kotlin.reflect': FqName@229) = LazyJavaPackageFragment@21['reflect']
+    packageFragments('kotlin.reflect.Int': FqName@230) = null
+    packageFragments('kotlin.reflect.KExtensionProperty': FqName@231) = null
+    packageFragments('kotlin.reflect.KMutableExtensionProperty': FqName@232) = null
+    packageFragments('kotlin.reflect.KMutableTopLevelExtensionProperty': FqName@233) = null
+    packageFragments('kotlin.reflect.KTopLevelExtensionProperty': FqName@234) = null
+    packageFragments('kotlin.reflect.Long': FqName@235) = null
+    packageFragments('kotlin.reflect.String': FqName@236) = null
+    packageFragments('meaning': FqName@237) = null
 }
 
 LazyJavaPackageFragment@183['<root>'] {
-    _functions('countCharacters': Name@238) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    _functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    _functions('invoke': Name@240) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    _functions('kotlin': Name@241) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    _functions('meaning': Name@242) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    _functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('Int': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('KExtensionProperty': Name@244) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('KMutableExtensionProperty': Name@245) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('KMutableTopLevelExtensionProperty': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('KTopLevelExtensionProperty': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('Long': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('String': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('countCharacters': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@239
+    classes('Int': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@239
+    classes('KExtensionProperty': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@239
+    classes('KMutableExtensionProperty': Name@241) = null // through LazyPackageFragmentScopeForJavaPackage@239
+    classes('KMutableTopLevelExtensionProperty': Name@242) = null // through LazyPackageFragmentScopeForJavaPackage@239
+    classes('KTopLevelExtensionProperty': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@239
+    classes('Long': Name@244) = null // through LazyPackageFragmentScopeForJavaPackage@239
+    classes('String': Name@245) = null // through LazyPackageFragmentScopeForJavaPackage@239
+    classes('countCharacters': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@239
     classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('invoke': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('kotlin': Name@250) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('meaning': Name@242) = null // through LazyPackageFragmentScopeForJavaPackage@239
+    classes('invoke': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@239
+    classes('kotlin': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@239
+    classes('length': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@239
+    classes('meaning': Name@250) = null // through LazyPackageFragmentScopeForJavaPackage@239
     classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    deserializedPackageScope = Empty@252 // through LazyPackageFragmentScopeForJavaPackage@239
+    deserializedPackageScope = Empty@251 // through LazyPackageFragmentScopeForJavaPackage@239
+    functions('countCharacters': Name@246) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@239
+    functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@239
+    functions('invoke': Name@247) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@239
+    functions('kotlin': Name@252) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@239
+    functions('meaning': Name@250) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@239
+    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@239
     memberIndex = computeMemberIndex$1@253 // through LazyPackageFragmentScopeForJavaPackage@239
 }
 
 LazyJavaPackageFragment@212['io'] {
-    _functions('countCharacters': Name@238) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    _functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    _functions('invoke': Name@240) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    _functions('meaning': Name@242) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    _functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('Int': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('Long': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('String': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('countCharacters': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@254
+    classes('Int': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@254
+    classes('Long': Name@244) = null // through LazyPackageFragmentScopeForJavaPackage@254
+    classes('String': Name@245) = null // through LazyPackageFragmentScopeForJavaPackage@254
+    classes('countCharacters': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@254
     classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('invoke': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('meaning': Name@242) = null // through LazyPackageFragmentScopeForJavaPackage@254
+    classes('invoke': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@254
+    classes('length': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@254
+    classes('meaning': Name@250) = null // through LazyPackageFragmentScopeForJavaPackage@254
     classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@254
     deserializedPackageScope = DeserializedPackageMemberScope@255 // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('countCharacters': Name@238) = EmptyList@23[empty] // through DeserializedPackageMemberScope@255
+    functions('countCharacters': Name@246) = EmptyList@23[empty] // through DeserializedPackageMemberScope@255
+    functions('countCharacters': Name@246) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@254
     functions('get': Name@22) = EmptyList@23[empty] // through DeserializedPackageMemberScope@255
-    functions('invoke': Name@240) = EmptyList@23[empty] // through DeserializedPackageMemberScope@255
-    functions('meaning': Name@242) = EmptyList@23[empty] // through DeserializedPackageMemberScope@255
+    functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@254
+    functions('invoke': Name@247) = EmptyList@23[empty] // through DeserializedPackageMemberScope@255
+    functions('invoke': Name@247) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@254
+    functions('meaning': Name@250) = EmptyList@23[empty] // through DeserializedPackageMemberScope@255
+    functions('meaning': Name@250) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@254
     functions('set': Name@25) = EmptyList@23[empty] // through DeserializedPackageMemberScope@255
+    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@254
     memberIndex = computeMemberIndex$1@256 // through LazyPackageFragmentScopeForJavaPackage@254
     membersProtos = HashMap@257 // through DeserializedPackageMemberScope@255
-    properties('countCharacters': Name@238) = EmptyList@23[empty] // through DeserializedPackageMemberScope@255
+    properties('countCharacters': Name@246) = EmptyList@23[empty] // through DeserializedPackageMemberScope@255
     properties('get': Name@22) = EmptyList@23[empty] // through DeserializedPackageMemberScope@255
-    properties('length': Name@251) = EmptyList@23[empty] // through DeserializedPackageMemberScope@255
-    properties('meaning': Name@242) = EmptyList@23[empty] // through DeserializedPackageMemberScope@255
+    properties('length': Name@249) = EmptyList@23[empty] // through DeserializedPackageMemberScope@255
+    properties('meaning': Name@250) = EmptyList@23[empty] // through DeserializedPackageMemberScope@255
     properties('set': Name@25) = EmptyList@23[empty] // through DeserializedPackageMemberScope@255
 }
 
 LazyJavaPackageFragment@193['java'] {
-    _functions('lang': Name@258) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@259
-    classes('lang': Name@260) = null // through LazyPackageFragmentScopeForJavaPackage@259
-    deserializedPackageScope = Empty@252 // through LazyPackageFragmentScopeForJavaPackage@259
+    classes('lang': Name@258) = null // through LazyPackageFragmentScopeForJavaPackage@259
+    deserializedPackageScope = Empty@251 // through LazyPackageFragmentScopeForJavaPackage@259
+    functions('lang': Name@260) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@259
     memberIndex = computeMemberIndex$1@261 // through LazyPackageFragmentScopeForJavaPackage@259
 }
 
 LazyJavaPackageFragment@221['jvm'] {
-    _functions('countCharacters': Name@238) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    _functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    _functions('invoke': Name@240) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    _functions('meaning': Name@242) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    _functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Int': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Long': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('String': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('countCharacters': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('Int': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('Long': Name@244) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('String': Name@245) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('countCharacters': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@262
     classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('invoke': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('meaning': Name@242) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('invoke': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('length': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('meaning': Name@250) = null // through LazyPackageFragmentScopeForJavaPackage@262
     classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    deserializedPackageScope = Empty@252 // through LazyPackageFragmentScopeForJavaPackage@262
+    deserializedPackageScope = Empty@251 // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('countCharacters': Name@246) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('invoke': Name@247) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('meaning': Name@250) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@262
     memberIndex = computeMemberIndex$1@263 // through LazyPackageFragmentScopeForJavaPackage@262
 }
 
 LazyJavaPackageFragment@62['kotlin'] {
-    _functions('countCharacters': Name@238) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
-    _functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
-    _functions('invoke': Name@240) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
-    _functions('io': Name@265) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
-    _functions('jvm': Name@266) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
-    _functions('meaning': Name@242) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
-    _functions('reflect': Name@267) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
-    _functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('Any': Name@268) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('Int': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('Long': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('MutableMap': Name@269) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('String': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('Unit': Name@270) = DeserializedClassDescriptor@20['Unit'] // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('countCharacters': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('invoke': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('io': Name@271) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('jvm': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('meaning': Name@242) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('reflect': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    deserializedPackageScope = DeserializedPackageMemberScope@274 // through LazyPackageFragmentScopeForJavaPackage@264
-    functions('countCharacters': Name@238) = EmptyList@23[empty] // through DeserializedPackageMemberScope@274
-    functions('get': Name@22) = ArrayList@275[2] { DeserializedSimpleFunctionDescriptor@276['get'], DeserializedSimpleFunctionDescriptor@277['get'] } // through DeserializedPackageMemberScope@274
-    functions('invoke': Name@240) = EmptyList@23[empty] // through DeserializedPackageMemberScope@274
-    functions('io': Name@265) = EmptyList@23[empty] // through DeserializedPackageMemberScope@274
-    functions('jvm': Name@266) = EmptyList@23[empty] // through DeserializedPackageMemberScope@274
-    functions('meaning': Name@242) = EmptyList@23[empty] // through DeserializedPackageMemberScope@274
-    functions('reflect': Name@267) = EmptyList@23[empty] // through DeserializedPackageMemberScope@274
-    functions('set': Name@25) = ArrayList@278[1] { DeserializedSimpleFunctionDescriptor@279['set'] } // through DeserializedPackageMemberScope@274
-    memberIndex = computeMemberIndex$1@280 // through LazyPackageFragmentScopeForJavaPackage@264
-    membersProtos = HashMap@281 // through DeserializedPackageMemberScope@274
-    properties('countCharacters': Name@238) = EmptyList@23[empty] // through DeserializedPackageMemberScope@274
-    properties('get': Name@22) = EmptyList@23[empty] // through DeserializedPackageMemberScope@274
-    properties('io': Name@265) = EmptyList@23[empty] // through DeserializedPackageMemberScope@274
-    properties('jvm': Name@266) = EmptyList@23[empty] // through DeserializedPackageMemberScope@274
-    properties('length': Name@251) = EmptyList@23[empty] // through DeserializedPackageMemberScope@274
-    properties('meaning': Name@242) = EmptyList@23[empty] // through DeserializedPackageMemberScope@274
-    properties('reflect': Name@267) = EmptyList@23[empty] // through DeserializedPackageMemberScope@274
-    properties('set': Name@25) = EmptyList@23[empty] // through DeserializedPackageMemberScope@274
+    classes('Any': Name@264) = null // through LazyPackageFragmentScopeForJavaPackage@265
+    classes('Int': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@265
+    classes('Long': Name@244) = null // through LazyPackageFragmentScopeForJavaPackage@265
+    classes('MutableMap': Name@266) = null // through LazyPackageFragmentScopeForJavaPackage@265
+    classes('String': Name@245) = null // through LazyPackageFragmentScopeForJavaPackage@265
+    classes('Unit': Name@267) = DeserializedClassDescriptor@20['Unit'] // through LazyPackageFragmentScopeForJavaPackage@265
+    classes('countCharacters': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@265
+    classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@265
+    classes('invoke': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@265
+    classes('io': Name@268) = null // through LazyPackageFragmentScopeForJavaPackage@265
+    classes('jvm': Name@269) = null // through LazyPackageFragmentScopeForJavaPackage@265
+    classes('length': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@265
+    classes('meaning': Name@250) = null // through LazyPackageFragmentScopeForJavaPackage@265
+    classes('reflect': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@265
+    classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@265
+    deserializedPackageScope = DeserializedPackageMemberScope@271 // through LazyPackageFragmentScopeForJavaPackage@265
+    functions('countCharacters': Name@246) = EmptyList@23[empty] // through DeserializedPackageMemberScope@271
+    functions('countCharacters': Name@246) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@265
+    functions('get': Name@22) = ArrayList@272[2] { DeserializedSimpleFunctionDescriptor@273['get'], DeserializedSimpleFunctionDescriptor@274['get'] } // through DeserializedPackageMemberScope@271
+    functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@265
+    functions('invoke': Name@247) = EmptyList@23[empty] // through DeserializedPackageMemberScope@271
+    functions('invoke': Name@247) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@265
+    functions('io': Name@275) = EmptyList@23[empty] // through DeserializedPackageMemberScope@271
+    functions('io': Name@275) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@265
+    functions('jvm': Name@276) = EmptyList@23[empty] // through DeserializedPackageMemberScope@271
+    functions('jvm': Name@276) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@265
+    functions('meaning': Name@250) = EmptyList@23[empty] // through DeserializedPackageMemberScope@271
+    functions('meaning': Name@250) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@265
+    functions('reflect': Name@277) = EmptyList@23[empty] // through DeserializedPackageMemberScope@271
+    functions('reflect': Name@277) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@265
+    functions('set': Name@25) = ArrayList@278[1] { DeserializedSimpleFunctionDescriptor@279['set'] } // through DeserializedPackageMemberScope@271
+    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@265
+    memberIndex = computeMemberIndex$1@280 // through LazyPackageFragmentScopeForJavaPackage@265
+    membersProtos = HashMap@281 // through DeserializedPackageMemberScope@271
+    properties('countCharacters': Name@246) = EmptyList@23[empty] // through DeserializedPackageMemberScope@271
+    properties('get': Name@22) = EmptyList@23[empty] // through DeserializedPackageMemberScope@271
+    properties('io': Name@275) = EmptyList@23[empty] // through DeserializedPackageMemberScope@271
+    properties('jvm': Name@276) = EmptyList@23[empty] // through DeserializedPackageMemberScope@271
+    properties('length': Name@249) = EmptyList@23[empty] // through DeserializedPackageMemberScope@271
+    properties('meaning': Name@250) = EmptyList@23[empty] // through DeserializedPackageMemberScope@271
+    properties('reflect': Name@277) = EmptyList@23[empty] // through DeserializedPackageMemberScope@271
+    properties('set': Name@25) = EmptyList@23[empty] // through DeserializedPackageMemberScope@271
 }
 
 LazyJavaPackageFragment@195['lang'] {
-    _functions('countCharacters': Name@238) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@282
-    _functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@282
-    _functions('invoke': Name@240) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@282
-    _functions('meaning': Name@242) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@282
-    _functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@282
-    classes('countCharacters': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@282
+    classes('countCharacters': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@282
     classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@282
-    classes('invoke': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@282
-    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@282
-    classes('meaning': Name@242) = null // through LazyPackageFragmentScopeForJavaPackage@282
+    classes('invoke': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@282
+    classes('length': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@282
+    classes('meaning': Name@250) = null // through LazyPackageFragmentScopeForJavaPackage@282
     classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@282
-    deserializedPackageScope = Empty@252 // through LazyPackageFragmentScopeForJavaPackage@282
+    deserializedPackageScope = Empty@251 // through LazyPackageFragmentScopeForJavaPackage@282
+    functions('countCharacters': Name@246) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@282
+    functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@282
+    functions('invoke': Name@247) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@282
+    functions('meaning': Name@250) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@282
+    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@282
     memberIndex = computeMemberIndex$1@283 // through LazyPackageFragmentScopeForJavaPackage@282
 }
 
 LazyJavaPackageFragment@21['reflect'] {
-    _functions('countCharacters': Name@238) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@284
-    _functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@284
-    _functions('invoke': Name@240) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@284
-    _functions('meaning': Name@242) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@284
-    _functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@284
-    classes('Int': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@284
+    classes('Int': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@284
     classes('KCallable': Name@285) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@284
-    classes('KExtensionProperty': Name@244) = DeserializedClassDescriptor@4['KExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@284
-    classes('KMutableExtensionProperty': Name@245) = DeserializedClassDescriptor@6['KMutableExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@284
+    classes('KExtensionProperty': Name@240) = DeserializedClassDescriptor@4['KExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@284
+    classes('KMutableExtensionProperty': Name@241) = DeserializedClassDescriptor@6['KMutableExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@284
     classes('KMutableProperty': Name@286) = DeserializedClassDescriptor@8['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@284
     classes('KMutableTopLevelExtensionProperty': Name@287) = DeserializedClassDescriptor@10['KMutableTopLevelExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@284
     classes('KMutableTopLevelProperty': Name@288) = DeserializedClassDescriptor@12['KMutableTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@284
     classes('KProperty': Name@289) = DeserializedClassDescriptor@14['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@284
     classes('KTopLevelExtensionProperty': Name@290) = DeserializedClassDescriptor@16['KTopLevelExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@284
     classes('KTopLevelProperty': Name@291) = DeserializedClassDescriptor@18['KTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@284
-    classes('Long': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@284
-    classes('String': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@284
-    classes('countCharacters': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@284
+    classes('Long': Name@244) = null // through LazyPackageFragmentScopeForJavaPackage@284
+    classes('String': Name@245) = null // through LazyPackageFragmentScopeForJavaPackage@284
+    classes('countCharacters': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@284
     classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@284
-    classes('invoke': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@284
-    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@284
-    classes('meaning': Name@242) = null // through LazyPackageFragmentScopeForJavaPackage@284
+    classes('invoke': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@284
+    classes('length': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@284
+    classes('meaning': Name@250) = null // through LazyPackageFragmentScopeForJavaPackage@284
     classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@284
-    deserializedPackageScope = Empty@252 // through LazyPackageFragmentScopeForJavaPackage@284
+    deserializedPackageScope = Empty@251 // through LazyPackageFragmentScopeForJavaPackage@284
+    functions('countCharacters': Name@246) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@284
+    functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@284
+    functions('invoke': Name@247) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@284
+    functions('meaning': Name@250) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@284
+    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@284
     memberIndex = computeMemberIndex$1@292 // through LazyPackageFragmentScopeForJavaPackage@284
 }
 
 NestedClassDescriptors@293 {
-    findClass('get': Name@22) = null
-    findClass('set': Name@25) = null
+    findClass('get': Name@34) = null
+    findClass('set': Name@38) = null
 }
 
 NestedClassDescriptors@294 {
-    findClass('get': Name@34) = null
-    findClass('set': Name@38) = null
+    findClass('get': Name@22) = null
+    findClass('set': Name@25) = null
 }
 
 TypeDeserializer@295 {

compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionPropertyOnNullable.lazy.log

@@ -78,7 +78,7 @@ DeserializedType@46['R in kotlin.reflect.KExtensionProperty'] {
 }
 
 DeserializedType@47['R in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@40
+    constructor = AbstractLazyTypeParameterDescriptor$1@38
 }
 
 DeserializedType@48['T in kotlin.reflect.KExtensionProperty'] {
@@ -120,113 +120,113 @@ DeserializedType@64['kotlin.reflect.KTopLevelProperty'] {
 }
 
 LazyJavaPackageFragmentProvider@67 {
-    _packageFragments('<root>': FqName@68) = LazyJavaPackageFragment@69['<root>']
-    _packageFragments('Any': FqName@70) = null
-    _packageFragments('Int': FqName@71) = null
-    _packageFragments('java': FqName@72) = LazyJavaPackageFragment@73['java']
-    _packageFragments('java.lang': FqName@74) = LazyJavaPackageFragment@75['lang']
-    _packageFragments('java.lang.Any': FqName@76) = null
-    _packageFragments('java.lang.Int': FqName@77) = null
-    _packageFragments('kotlin': FqName@78) = LazyJavaPackageFragment@79['kotlin']
-    _packageFragments('kotlin.Any': FqName@80) = null
-    _packageFragments('kotlin.Int': FqName@81) = null
-    _packageFragments('kotlin.io': FqName@82) = LazyJavaPackageFragment@83['io']
-    _packageFragments('kotlin.io.Any': FqName@84) = null
-    _packageFragments('kotlin.io.Int': FqName@85) = null
-    _packageFragments('kotlin.jvm': FqName@86) = LazyJavaPackageFragment@87['jvm']
-    _packageFragments('kotlin.jvm.Any': FqName@88) = null
-    _packageFragments('kotlin.jvm.Int': FqName@89) = null
-    _packageFragments('kotlin.reflect': FqName@90) = LazyJavaPackageFragment@11['reflect']
-    _packageFragments('meaning': FqName@91) = null
+    packageFragments('<root>': FqName@68) = LazyJavaPackageFragment@69['<root>']
+    packageFragments('Any': FqName@70) = null
+    packageFragments('Int': FqName@71) = null
+    packageFragments('java': FqName@72) = LazyJavaPackageFragment@73['java']
+    packageFragments('java.lang': FqName@74) = LazyJavaPackageFragment@75['lang']
+    packageFragments('java.lang.Any': FqName@76) = null
+    packageFragments('java.lang.Int': FqName@77) = null
+    packageFragments('kotlin': FqName@78) = LazyJavaPackageFragment@79['kotlin']
+    packageFragments('kotlin.Any': FqName@80) = null
+    packageFragments('kotlin.Int': FqName@81) = null
+    packageFragments('kotlin.io': FqName@82) = LazyJavaPackageFragment@83['io']
+    packageFragments('kotlin.io.Any': FqName@84) = null
+    packageFragments('kotlin.io.Int': FqName@85) = null
+    packageFragments('kotlin.jvm': FqName@86) = LazyJavaPackageFragment@87['jvm']
+    packageFragments('kotlin.jvm.Any': FqName@88) = null
+    packageFragments('kotlin.jvm.Int': FqName@89) = null
+    packageFragments('kotlin.reflect': FqName@90) = LazyJavaPackageFragment@11['reflect']
+    packageFragments('meaning': FqName@91) = null
 }
 
 LazyJavaPackageFragment@69['<root>'] {
-    _functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    _functions('invoke': Name@93) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    _functions('meaning': Name@94) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('Any': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('Int': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('invoke': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('meaning': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('Any': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('invoke': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('meaning': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@93
+    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@93
+    functions('invoke': Name@95) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@93
+    functions('meaning': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@93
+    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@93
 }
 
 LazyJavaPackageFragment@83['io'] {
-    _functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    _functions('invoke': Name@93) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    _functions('meaning': Name@94) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('Any': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('Int': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('Any': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@99
     classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('invoke': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('meaning': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('invoke': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('meaning': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@99
     deserializedPackageScope = DeserializedPackageMemberScope@100 // through LazyPackageFragmentScopeForJavaPackage@99
     functions('get': Name@12) = EmptyList@13[empty] // through DeserializedPackageMemberScope@100
-    functions('invoke': Name@93) = EmptyList@13[empty] // through DeserializedPackageMemberScope@100
-    functions('meaning': Name@94) = EmptyList@13[empty] // through DeserializedPackageMemberScope@100
+    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('invoke': Name@95) = EmptyList@13[empty] // through DeserializedPackageMemberScope@100
+    functions('invoke': Name@95) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('meaning': Name@96) = EmptyList@13[empty] // through DeserializedPackageMemberScope@100
+    functions('meaning': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@99
     memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
     membersProtos = HashMap@102 // through DeserializedPackageMemberScope@100
     properties('get': Name@12) = EmptyList@13[empty] // through DeserializedPackageMemberScope@100
-    properties('meaning': Name@94) = EmptyList@13[empty] // through DeserializedPackageMemberScope@100
+    properties('meaning': Name@96) = EmptyList@13[empty] // through DeserializedPackageMemberScope@100
 }
 
 LazyJavaPackageFragment@73['java'] {
-    _functions('lang': Name@103) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('lang': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
     deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('lang': Name@105) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@104
     memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
 }
 
 LazyJavaPackageFragment@87['jvm'] {
-    _functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    _functions('invoke': Name@93) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    _functions('meaning': Name@94) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Any': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Int': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('Any': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@107
     classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('invoke': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('meaning': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('invoke': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('meaning': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@107
     deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('invoke': Name@95) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('meaning': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@107
     memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@107
 }
 
 LazyJavaPackageFragment@79['kotlin'] {
-    _functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    _functions('invoke': Name@93) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    _functions('io': Name@110) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    _functions('jvm': Name@111) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    _functions('meaning': Name@94) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('Any': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('Int': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('Any': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@109
     classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('invoke': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('io': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('jvm': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('meaning': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    deserializedPackageScope = DeserializedPackageMemberScope@114 // through LazyPackageFragmentScopeForJavaPackage@109
-    functions('get': Name@12) = ArrayList@115[2] { DeserializedSimpleFunctionDescriptor@116['get'], DeserializedSimpleFunctionDescriptor@117['get'] } // through DeserializedPackageMemberScope@114
-    functions('invoke': Name@93) = EmptyList@13[empty] // through DeserializedPackageMemberScope@114
-    functions('io': Name@110) = EmptyList@13[empty] // through DeserializedPackageMemberScope@114
-    functions('jvm': Name@111) = EmptyList@13[empty] // through DeserializedPackageMemberScope@114
-    functions('meaning': Name@94) = EmptyList@13[empty] // through DeserializedPackageMemberScope@114
+    classes('invoke': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('io': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('jvm': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('meaning': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@109
+    deserializedPackageScope = DeserializedPackageMemberScope@112 // through LazyPackageFragmentScopeForJavaPackage@109
+    functions('get': Name@12) = ArrayList@113[2] { DeserializedSimpleFunctionDescriptor@114['get'], DeserializedSimpleFunctionDescriptor@115['get'] } // through DeserializedPackageMemberScope@112
+    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@109
+    functions('invoke': Name@95) = EmptyList@13[empty] // through DeserializedPackageMemberScope@112
+    functions('invoke': Name@95) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@109
+    functions('io': Name@116) = EmptyList@13[empty] // through DeserializedPackageMemberScope@112
+    functions('io': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@109
+    functions('jvm': Name@117) = EmptyList@13[empty] // through DeserializedPackageMemberScope@112
+    functions('jvm': Name@117) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@109
+    functions('meaning': Name@96) = EmptyList@13[empty] // through DeserializedPackageMemberScope@112
+    functions('meaning': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@109
     memberIndex = computeMemberIndex$1@118 // through LazyPackageFragmentScopeForJavaPackage@109
-    membersProtos = HashMap@119 // through DeserializedPackageMemberScope@114
-    properties('get': Name@12) = EmptyList@13[empty] // through DeserializedPackageMemberScope@114
-    properties('io': Name@110) = EmptyList@13[empty] // through DeserializedPackageMemberScope@114
-    properties('jvm': Name@111) = EmptyList@13[empty] // through DeserializedPackageMemberScope@114
-    properties('meaning': Name@94) = EmptyList@13[empty] // through DeserializedPackageMemberScope@114
+    membersProtos = HashMap@119 // through DeserializedPackageMemberScope@112
+    properties('get': Name@12) = EmptyList@13[empty] // through DeserializedPackageMemberScope@112
+    properties('io': Name@116) = EmptyList@13[empty] // through DeserializedPackageMemberScope@112
+    properties('jvm': Name@117) = EmptyList@13[empty] // through DeserializedPackageMemberScope@112
+    properties('meaning': Name@96) = EmptyList@13[empty] // through DeserializedPackageMemberScope@112
 }
 
 LazyJavaPackageFragment@75['lang'] {
-    _functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('invoke': Name@93) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    _functions('meaning': Name@94) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@120
     classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('invoke': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('meaning': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@120
+    classes('invoke': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@120
+    classes('meaning': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@120
     deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@120
+    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@120
+    functions('invoke': Name@95) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@120
+    functions('meaning': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@120
     memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@120
 }
 

compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.lazy.log

@@ -16,146 +16,146 @@ DeserializedTypeParameterDescriptor@8['T'] {
     upperBounds = LinkedHashSet@10[1] { DeserializedType@11['kotlin.Any'] }
 }
 
-DeserializedType@7['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@12
-    memberScope = DeserializedClassMemberScope@13
-}
-
 DeserializedType@11['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@12
     memberScope = DeserializedClassMemberScope@13
 }
 
+DeserializedType@7['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@12
+    memberScope = DeserializedClassMemberScope@13
+}
+
 LazyJavaPackageFragmentProvider@14 {
-    _packageFragments('<root>': FqName@15) = LazyJavaPackageFragment@16['<root>']
-    _packageFragments('A': FqName@17) = null
-    _packageFragments('Any': FqName@18) = null
-    _packageFragments('KMemberProperty': FqName@19) = null
-    _packageFragments('String': FqName@20) = null
-    _packageFragments('T': FqName@21) = null
-    _packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    _packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    _packageFragments('java.lang.A': FqName@26) = null
-    _packageFragments('java.lang.Any': FqName@27) = null
-    _packageFragments('java.lang.KMemberProperty': FqName@28) = null
-    _packageFragments('java.lang.String': FqName@29) = null
-    _packageFragments('java.lang.T': FqName@30) = null
-    _packageFragments('kotlin': FqName@31) = LazyJavaPackageFragment@32['kotlin']
-    _packageFragments('kotlin.A': FqName@33) = null
-    _packageFragments('kotlin.Any': FqName@34) = null
-    _packageFragments('kotlin.KMemberProperty': FqName@35) = null
-    _packageFragments('kotlin.String': FqName@36) = null
-    _packageFragments('kotlin.T': FqName@37) = null
-    _packageFragments('kotlin.io': FqName@38) = LazyJavaPackageFragment@39['io']
-    _packageFragments('kotlin.io.A': FqName@40) = null
-    _packageFragments('kotlin.io.Any': FqName@41) = null
-    _packageFragments('kotlin.io.KMemberProperty': FqName@42) = null
-    _packageFragments('kotlin.io.String': FqName@43) = null
-    _packageFragments('kotlin.io.T': FqName@44) = null
-    _packageFragments('kotlin.jvm': FqName@45) = LazyJavaPackageFragment@46['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@47) = null
-    _packageFragments('kotlin.jvm.Any': FqName@48) = null
-    _packageFragments('kotlin.jvm.KMemberProperty': FqName@49) = null
-    _packageFragments('kotlin.jvm.String': FqName@50) = null
-    _packageFragments('kotlin.jvm.T': FqName@51) = null
-    _packageFragments('kotlin.reflect': FqName@52) = LazyJavaPackageFragment@3['reflect']
-    _packageFragments('kotlin.reflect.KMemberProperty': FqName@53) = null
+    packageFragments('<root>': FqName@15) = LazyJavaPackageFragment@16['<root>']
+    packageFragments('A': FqName@17) = null
+    packageFragments('Any': FqName@18) = null
+    packageFragments('KMemberProperty': FqName@19) = null
+    packageFragments('String': FqName@20) = null
+    packageFragments('T': FqName@21) = null
+    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
+    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
+    packageFragments('java.lang.A': FqName@26) = null
+    packageFragments('java.lang.Any': FqName@27) = null
+    packageFragments('java.lang.KMemberProperty': FqName@28) = null
+    packageFragments('java.lang.String': FqName@29) = null
+    packageFragments('java.lang.T': FqName@30) = null
+    packageFragments('kotlin': FqName@31) = LazyJavaPackageFragment@32['kotlin']
+    packageFragments('kotlin.A': FqName@33) = null
+    packageFragments('kotlin.Any': FqName@34) = null
+    packageFragments('kotlin.KMemberProperty': FqName@35) = null
+    packageFragments('kotlin.String': FqName@36) = null
+    packageFragments('kotlin.T': FqName@37) = null
+    packageFragments('kotlin.io': FqName@38) = LazyJavaPackageFragment@39['io']
+    packageFragments('kotlin.io.A': FqName@40) = null
+    packageFragments('kotlin.io.Any': FqName@41) = null
+    packageFragments('kotlin.io.KMemberProperty': FqName@42) = null
+    packageFragments('kotlin.io.String': FqName@43) = null
+    packageFragments('kotlin.io.T': FqName@44) = null
+    packageFragments('kotlin.jvm': FqName@45) = LazyJavaPackageFragment@46['jvm']
+    packageFragments('kotlin.jvm.A': FqName@47) = null
+    packageFragments('kotlin.jvm.Any': FqName@48) = null
+    packageFragments('kotlin.jvm.KMemberProperty': FqName@49) = null
+    packageFragments('kotlin.jvm.String': FqName@50) = null
+    packageFragments('kotlin.jvm.T': FqName@51) = null
+    packageFragments('kotlin.reflect': FqName@52) = LazyJavaPackageFragment@3['reflect']
+    packageFragments('kotlin.reflect.KMemberProperty': FqName@53) = null
 }
 
 LazyJavaPackageFragment@16['<root>'] {
-    _functions('foo': Name@54) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    _functions('invoke': Name@57) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    _functions('kotlin': Name@58) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('Any': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('KMemberProperty': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('String': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('invoke': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('kotlin': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('t': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('Any': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('KMemberProperty': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('String': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('foo': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('invoke': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('kotlin': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('t': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@55
+    functions('foo': Name@58) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@55
+    functions('invoke': Name@59) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@55
+    functions('kotlin': Name@64) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@55
+    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@55
 }
 
 LazyJavaPackageFragment@39['io'] {
-    _functions('foo': Name@54) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('invoke': Name@57) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Any': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('String': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('invoke': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('t': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('Any': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('String': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('foo': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('invoke': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('t': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@66
     deserializedPackageScope = DeserializedPackageMemberScope@67 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('foo': Name@54) = EmptyList@55[empty] // through DeserializedPackageMemberScope@67
-    functions('invoke': Name@57) = EmptyList@55[empty] // through DeserializedPackageMemberScope@67
+    functions('foo': Name@58) = EmptyList@63[empty] // through DeserializedPackageMemberScope@67
+    functions('foo': Name@58) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('invoke': Name@59) = EmptyList@63[empty] // through DeserializedPackageMemberScope@67
+    functions('invoke': Name@59) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@66
     memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@66
     membersProtos = HashMap@69 // through DeserializedPackageMemberScope@67
-    properties('foo': Name@54) = EmptyList@55[empty] // through DeserializedPackageMemberScope@67
-    properties('t': Name@63) = EmptyList@55[empty] // through DeserializedPackageMemberScope@67
+    properties('foo': Name@58) = EmptyList@63[empty] // through DeserializedPackageMemberScope@67
+    properties('t': Name@61) = EmptyList@63[empty] // through DeserializedPackageMemberScope@67
 }
 
 LazyJavaPackageFragment@23['java'] {
-    _functions('lang': Name@70) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('lang': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@71
+    functions('lang': Name@72) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@71
     memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
 LazyJavaPackageFragment@46['jvm'] {
-    _functions('foo': Name@54) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    _functions('invoke': Name@57) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('Any': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('String': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('invoke': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('t': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('Any': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('String': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('foo': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('invoke': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('t': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('foo': Name@58) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('invoke': Name@59) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@74
     memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@74
 }
 
 LazyJavaPackageFragment@32['kotlin'] {
-    _functions('foo': Name@54) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    _functions('invoke': Name@57) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    _functions('io': Name@77) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    _functions('jvm': Name@78) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    _functions('reflect': Name@79) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('Any': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('String': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('invoke': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('io': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('jvm': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('reflect': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('t': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = DeserializedPackageMemberScope@84 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('foo': Name@54) = EmptyList@55[empty] // through DeserializedPackageMemberScope@84
-    functions('invoke': Name@57) = EmptyList@55[empty] // through DeserializedPackageMemberScope@84
-    functions('io': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@84
-    functions('jvm': Name@78) = EmptyList@55[empty] // through DeserializedPackageMemberScope@84
-    functions('reflect': Name@79) = EmptyList@55[empty] // through DeserializedPackageMemberScope@84
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@76
-    membersProtos = HashMap@86 // through DeserializedPackageMemberScope@84
-    properties('foo': Name@54) = EmptyList@55[empty] // through DeserializedPackageMemberScope@84
-    properties('io': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@84
-    properties('jvm': Name@78) = EmptyList@55[empty] // through DeserializedPackageMemberScope@84
-    properties('reflect': Name@79) = EmptyList@55[empty] // through DeserializedPackageMemberScope@84
-    properties('t': Name@63) = EmptyList@55[empty] // through DeserializedPackageMemberScope@84
+    classes('Any': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('String': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('foo': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('invoke': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('io': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('jvm': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('reflect': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('t': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = DeserializedPackageMemberScope@81 // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('foo': Name@58) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    functions('foo': Name@58) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('invoke': Name@59) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    functions('invoke': Name@59) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('io': Name@82) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    functions('io': Name@82) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('jvm': Name@83) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    functions('jvm': Name@83) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('reflect': Name@84) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    functions('reflect': Name@84) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@77
+    membersProtos = HashMap@86 // through DeserializedPackageMemberScope@81
+    properties('foo': Name@58) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    properties('io': Name@82) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    properties('jvm': Name@83) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    properties('reflect': Name@84) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    properties('t': Name@61) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    _functions('foo': Name@54) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    _functions('invoke': Name@57) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('invoke': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('t': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('foo': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('invoke': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('t': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('foo': Name@58) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('invoke': Name@59) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@87
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
 LazyJavaPackageFragment@3['reflect'] {
-    _functions('KMemberProperty': Name@89) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('KMemberProperty': Name@91) = DeserializedClassDescriptor@2['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@90
+    classes('KMemberProperty': Name@89) = DeserializedClassDescriptor@2['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@90
+    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@90
+    functions('KMemberProperty': Name@91) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@90
     memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@90
 }
 

compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.lazy.log

@@ -31,7 +31,7 @@ DeserializedTypeParameterDescriptor@18['T'] {
     upperBounds = LinkedHashSet@20[1] { DeserializedType@21['kotlin.Any'] }
 }
 
-DeserializedType@13['kotlin.Any'] {
+DeserializedType@21['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@22
     memberScope = DeserializedClassMemberScope@23
 }
@@ -41,356 +41,356 @@ DeserializedType@17['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@23
 }
 
+DeserializedType@13['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@22
+    memberScope = DeserializedClassMemberScope@23
+}
+
 DeserializedType@9['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@22
     memberScope = DeserializedClassMemberScope@23
 }
 
-DeserializedType@21['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@22
-    memberScope = DeserializedClassMemberScope@23
-}
-
 LazyJavaClassDescriptor@24['JavaClass'] {
-    _functions('privateFinal': Name@25) = EmptyList@26[empty] // through LazyJavaClassMemberScope@27
-    _functions('privateFinal': Name@28) = EmptyList@26[empty] // through LazyJavaStaticClassScope@29
-    _functions('privateMutable': Name@30) = EmptyList@26[empty] // through LazyJavaClassMemberScope@27
-    _functions('privateMutable': Name@31) = EmptyList@26[empty] // through LazyJavaStaticClassScope@29
-    _functions('protectedFinal': Name@32) = EmptyList@26[empty] // through LazyJavaClassMemberScope@27
-    _functions('protectedFinal': Name@33) = EmptyList@26[empty] // through LazyJavaStaticClassScope@29
-    _functions('protectedMutable': Name@34) = EmptyList@26[empty] // through LazyJavaClassMemberScope@27
-    _functions('protectedMutable': Name@35) = EmptyList@26[empty] // through LazyJavaStaticClassScope@29
-    _functions('publicFinal': Name@36) = EmptyList@26[empty] // through LazyJavaClassMemberScope@27
-    _functions('publicFinal': Name@37) = EmptyList@26[empty] // through LazyJavaStaticClassScope@29
-    _functions('publicMutable': Name@38) = EmptyList@26[empty] // through LazyJavaClassMemberScope@27
-    _functions('publicMutable': Name@39) = EmptyList@26[empty] // through LazyJavaStaticClassScope@29
-    _properties('privateFinal': Name@25) = ArrayList@40[1] { JavaPropertyDescriptor@41['privateFinal'] } // through LazyJavaClassMemberScope@27
-    _properties('privateFinal': Name@28) = EmptyList@26[empty] // through LazyJavaStaticClassScope@29
-    _properties('privateMutable': Name@30) = ArrayList@42[1] { JavaPropertyDescriptor@43['privateMutable'] } // through LazyJavaClassMemberScope@27
-    _properties('privateMutable': Name@31) = EmptyList@26[empty] // through LazyJavaStaticClassScope@29
-    _properties('protectedFinal': Name@32) = ArrayList@44[1] { JavaPropertyDescriptor@45['protectedFinal'] } // through LazyJavaClassMemberScope@27
-    _properties('protectedFinal': Name@33) = EmptyList@26[empty] // through LazyJavaStaticClassScope@29
-    _properties('protectedMutable': Name@34) = ArrayList@46[1] { JavaPropertyDescriptor@47['protectedMutable'] } // through LazyJavaClassMemberScope@27
-    _properties('protectedMutable': Name@35) = EmptyList@26[empty] // through LazyJavaStaticClassScope@29
-    _properties('publicFinal': Name@36) = ArrayList@48[1] { JavaPropertyDescriptor@49['publicFinal'] } // through LazyJavaClassMemberScope@27
-    _properties('publicFinal': Name@37) = EmptyList@26[empty] // through LazyJavaStaticClassScope@29
-    _properties('publicMutable': Name@38) = ArrayList@50[1] { JavaPropertyDescriptor@51['publicMutable'] } // through LazyJavaClassMemberScope@27
-    _properties('publicMutable': Name@39) = EmptyList@26[empty] // through LazyJavaStaticClassScope@29
-    _typeConstructor = LazyJavaClassTypeConstructor@52['JavaClass']
-    defaultType = JetTypeImpl@53['JavaClass']
-    enumEntryIndex = LinkedHashMap@54 // through LazyJavaClassMemberScope@27
-    memberIndex = computeMemberIndex$1@55 // through LazyJavaClassMemberScope@27
-    memberIndex = computeMemberIndex$1@56 // through LazyJavaStaticClassScope@29
-    nestedClassIndex = LinkedHashMap@57 // through LazyJavaClassMemberScope@27
-    nestedClasses('privateFinal': Name@28) = null // through LazyJavaClassMemberScope@27
-    nestedClasses('privateMutable': Name@31) = null // through LazyJavaClassMemberScope@27
-    nestedClasses('protectedFinal': Name@33) = null // through LazyJavaClassMemberScope@27
-    nestedClasses('protectedMutable': Name@35) = null // through LazyJavaClassMemberScope@27
-    nestedClasses('publicFinal': Name@37) = null // through LazyJavaClassMemberScope@27
-    nestedClasses('publicMutable': Name@39) = null // through LazyJavaClassMemberScope@27
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@58['<this>']
+    defaultType = JetTypeImpl@25['JavaClass']
+    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@27
+    functions('privateFinal': Name@28) = EmptyList@29[empty] // through LazyJavaClassMemberScope@27
+    functions('privateFinal': Name@30) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
+    functions('privateMutable': Name@32) = EmptyList@29[empty] // through LazyJavaClassMemberScope@27
+    functions('privateMutable': Name@33) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
+    functions('protectedFinal': Name@34) = EmptyList@29[empty] // through LazyJavaClassMemberScope@27
+    functions('protectedFinal': Name@35) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
+    functions('protectedMutable': Name@36) = EmptyList@29[empty] // through LazyJavaClassMemberScope@27
+    functions('protectedMutable': Name@37) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
+    functions('publicFinal': Name@38) = EmptyList@29[empty] // through LazyJavaClassMemberScope@27
+    functions('publicFinal': Name@39) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
+    functions('publicMutable': Name@40) = EmptyList@29[empty] // through LazyJavaClassMemberScope@27
+    functions('publicMutable': Name@41) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
+    memberIndex = computeMemberIndex$1@42 // through LazyJavaClassMemberScope@27
+    memberIndex = computeMemberIndex$1@43 // through LazyJavaStaticClassScope@31
+    nestedClassIndex = LinkedHashMap@44 // through LazyJavaClassMemberScope@27
+    nestedClasses('privateFinal': Name@30) = null // through LazyJavaClassMemberScope@27
+    nestedClasses('privateMutable': Name@33) = null // through LazyJavaClassMemberScope@27
+    nestedClasses('protectedFinal': Name@35) = null // through LazyJavaClassMemberScope@27
+    nestedClasses('protectedMutable': Name@37) = null // through LazyJavaClassMemberScope@27
+    nestedClasses('publicFinal': Name@39) = null // through LazyJavaClassMemberScope@27
+    nestedClasses('publicMutable': Name@41) = null // through LazyJavaClassMemberScope@27
+    properties('privateFinal': Name@28) = ArrayList@45[1] { JavaPropertyDescriptor@46['privateFinal'] } // through LazyJavaClassMemberScope@27
+    properties('privateFinal': Name@30) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
+    properties('privateMutable': Name@32) = ArrayList@47[1] { JavaPropertyDescriptor@48['privateMutable'] } // through LazyJavaClassMemberScope@27
+    properties('privateMutable': Name@33) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
+    properties('protectedFinal': Name@34) = ArrayList@49[1] { JavaPropertyDescriptor@50['protectedFinal'] } // through LazyJavaClassMemberScope@27
+    properties('protectedFinal': Name@35) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
+    properties('protectedMutable': Name@36) = ArrayList@51[1] { JavaPropertyDescriptor@52['protectedMutable'] } // through LazyJavaClassMemberScope@27
+    properties('protectedMutable': Name@37) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
+    properties('publicFinal': Name@38) = ArrayList@53[1] { JavaPropertyDescriptor@54['publicFinal'] } // through LazyJavaClassMemberScope@27
+    properties('publicFinal': Name@39) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
+    properties('publicMutable': Name@40) = ArrayList@55[1] { JavaPropertyDescriptor@56['publicMutable'] } // through LazyJavaClassMemberScope@27
+    properties('publicMutable': Name@41) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@57['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@58['JavaClass']
 }
 
-LazyJavaClassTypeConstructor@52['JavaClass'] {
-    _parameters = ArrayList@59[empty]
-    _supertypes = ArrayList@60[1] { JetTypeImpl@61['Any'] }
+LazyJavaClassTypeConstructor@58['JavaClass'] {
+    parameters = ArrayList@59[empty]
+    supertypes = ArrayList@60[1] { JetTypeImpl@61['Any'] }
 }
 
 LazyJavaClassifierType@62['Object'] {
-    _arguments = ArrayList@63[empty]
-    _memberScope = DeserializedClassMemberScope@23
-    _nullable = 'false': Boolean@64
-    _typeConstructor = DeserializedClassTypeConstructor@22
-    classifier = JavaClassImpl@65['Object']
+    arguments = ArrayList@63[empty]
+    classifier = JavaClassImpl@64['Object']
+    memberScope = DeserializedClassMemberScope@23
+    nullable = 'false': Boolean@65
+    typeConstructor = DeserializedClassTypeConstructor@22
 }
 
 LazyJavaClassifierType@66['Object'] {
-    _arguments = ArrayList@67[empty]
-    _nullable = 'true': Boolean@68
-    _typeConstructor = DeserializedClassTypeConstructor@22
-    classifier = JavaClassImpl@65['Object']
+    arguments = ArrayList@67[empty]
+    classifier = JavaClassImpl@64['Object']
+    nullable = 'true': Boolean@68
+    typeConstructor = DeserializedClassTypeConstructor@22
 }
 
 LazyJavaClassifierType@69['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@22
     classifier = JavaClassImpl@70['Object']
+    typeConstructor = DeserializedClassTypeConstructor@22
 }
 
 LazyJavaClassifierType@71['String'] {
-    _arguments = ArrayList@72[empty]
-    _memberScope = DeserializedClassMemberScope@73
-    _nullable = 'false': Boolean@64
-    _typeConstructor = DeserializedClassTypeConstructor@74
-    classifier = JavaClassImpl@75['String']
+    arguments = ArrayList@72[empty]
+    classifier = JavaClassImpl@73['String']
+    memberScope = DeserializedClassMemberScope@74
+    nullable = 'false': Boolean@65
+    typeConstructor = DeserializedClassTypeConstructor@75
 }
 
 LazyJavaClassifierType@76['String'] {
-    _arguments = ArrayList@77[empty]
-    _nullable = 'true': Boolean@68
-    _typeConstructor = DeserializedClassTypeConstructor@74
-    classifier = JavaClassImpl@75['String']
+    arguments = ArrayList@77[empty]
+    classifier = JavaClassImpl@73['String']
+    nullable = 'true': Boolean@68
+    typeConstructor = DeserializedClassTypeConstructor@75
 }
 
 LazyJavaPackageFragmentProvider@78 {
-    _packageFragments('<root>': FqName@79) = LazyJavaPackageFragment@80['<root>']
-    _packageFragments('Any': FqName@81) = null
-    _packageFragments('Char': FqName@82) = null
-    _packageFragments('Double': FqName@83) = null
-    _packageFragments('Int': FqName@84) = null
-    _packageFragments('JavaClass': FqName@85) = null
-    _packageFragments('KMemberProperty': FqName@86) = null
-    _packageFragments('KMutableMemberProperty': FqName@87) = null
-    _packageFragments('Long': FqName@88) = null
-    _packageFragments('String': FqName@89) = null
-    _packageFragments('java': FqName@90) = LazyJavaPackageFragment@91['java']
-    _packageFragments('java.lang': FqName@92) = LazyJavaPackageFragment@93['lang']
-    _packageFragments('java.lang.Any': FqName@94) = null
-    _packageFragments('java.lang.Char': FqName@95) = null
-    _packageFragments('java.lang.Double': FqName@96) = null
-    _packageFragments('java.lang.Int': FqName@97) = null
-    _packageFragments('java.lang.JavaClass': FqName@98) = null
-    _packageFragments('java.lang.KMemberProperty': FqName@99) = null
-    _packageFragments('java.lang.KMutableMemberProperty': FqName@100) = null
-    _packageFragments('java.lang.Long': FqName@101) = null
-    _packageFragments('java.lang.String': FqName@102) = null
-    _packageFragments('kotlin': FqName@103) = LazyJavaPackageFragment@104['kotlin']
-    _packageFragments('kotlin.Any': FqName@105) = null
-    _packageFragments('kotlin.Char': FqName@106) = null
-    _packageFragments('kotlin.Double': FqName@107) = null
-    _packageFragments('kotlin.Int': FqName@108) = null
-    _packageFragments('kotlin.JavaClass': FqName@109) = null
-    _packageFragments('kotlin.KMemberProperty': FqName@110) = null
-    _packageFragments('kotlin.KMutableMemberProperty': FqName@111) = null
-    _packageFragments('kotlin.Long': FqName@112) = null
-    _packageFragments('kotlin.String': FqName@113) = null
-    _packageFragments('kotlin.io': FqName@114) = LazyJavaPackageFragment@115['io']
-    _packageFragments('kotlin.io.Any': FqName@116) = null
-    _packageFragments('kotlin.io.Char': FqName@117) = null
-    _packageFragments('kotlin.io.Double': FqName@118) = null
-    _packageFragments('kotlin.io.Int': FqName@119) = null
-    _packageFragments('kotlin.io.JavaClass': FqName@120) = null
-    _packageFragments('kotlin.io.KMemberProperty': FqName@121) = null
-    _packageFragments('kotlin.io.KMutableMemberProperty': FqName@122) = null
-    _packageFragments('kotlin.io.Long': FqName@123) = null
-    _packageFragments('kotlin.io.String': FqName@124) = null
-    _packageFragments('kotlin.jvm': FqName@125) = LazyJavaPackageFragment@126['jvm']
-    _packageFragments('kotlin.jvm.Any': FqName@127) = null
-    _packageFragments('kotlin.jvm.Char': FqName@128) = null
-    _packageFragments('kotlin.jvm.Double': FqName@129) = null
-    _packageFragments('kotlin.jvm.Int': FqName@130) = null
-    _packageFragments('kotlin.jvm.JavaClass': FqName@131) = null
-    _packageFragments('kotlin.jvm.KMemberProperty': FqName@132) = null
-    _packageFragments('kotlin.jvm.KMutableMemberProperty': FqName@133) = null
-    _packageFragments('kotlin.jvm.Long': FqName@134) = null
-    _packageFragments('kotlin.jvm.String': FqName@135) = null
-    _packageFragments('kotlin.reflect': FqName@136) = LazyJavaPackageFragment@5['reflect']
-    _packageFragments('kotlin.reflect.Any': FqName@137) = null
-    _packageFragments('kotlin.reflect.Char': FqName@138) = null
-    _packageFragments('kotlin.reflect.Double': FqName@139) = null
-    _packageFragments('kotlin.reflect.Int': FqName@140) = null
-    _packageFragments('kotlin.reflect.JavaClass': FqName@141) = null
-    _packageFragments('kotlin.reflect.KMemberProperty': FqName@142) = null
-    _packageFragments('kotlin.reflect.KMutableMemberProperty': FqName@143) = null
-    _packageFragments('kotlin.reflect.Long': FqName@144) = null
-    _packageFragments('kotlin.reflect.String': FqName@145) = null
+    packageFragments('<root>': FqName@79) = LazyJavaPackageFragment@80['<root>']
+    packageFragments('Any': FqName@81) = null
+    packageFragments('Char': FqName@82) = null
+    packageFragments('Double': FqName@83) = null
+    packageFragments('Int': FqName@84) = null
+    packageFragments('JavaClass': FqName@85) = null
+    packageFragments('KMemberProperty': FqName@86) = null
+    packageFragments('KMutableMemberProperty': FqName@87) = null
+    packageFragments('Long': FqName@88) = null
+    packageFragments('String': FqName@89) = null
+    packageFragments('java': FqName@90) = LazyJavaPackageFragment@91['java']
+    packageFragments('java.lang': FqName@92) = LazyJavaPackageFragment@93['lang']
+    packageFragments('java.lang.Any': FqName@94) = null
+    packageFragments('java.lang.Char': FqName@95) = null
+    packageFragments('java.lang.Double': FqName@96) = null
+    packageFragments('java.lang.Int': FqName@97) = null
+    packageFragments('java.lang.JavaClass': FqName@98) = null
+    packageFragments('java.lang.KMemberProperty': FqName@99) = null
+    packageFragments('java.lang.KMutableMemberProperty': FqName@100) = null
+    packageFragments('java.lang.Long': FqName@101) = null
+    packageFragments('java.lang.String': FqName@102) = null
+    packageFragments('kotlin': FqName@103) = LazyJavaPackageFragment@104['kotlin']
+    packageFragments('kotlin.Any': FqName@105) = null
+    packageFragments('kotlin.Char': FqName@106) = null
+    packageFragments('kotlin.Double': FqName@107) = null
+    packageFragments('kotlin.Int': FqName@108) = null
+    packageFragments('kotlin.JavaClass': FqName@109) = null
+    packageFragments('kotlin.KMemberProperty': FqName@110) = null
+    packageFragments('kotlin.KMutableMemberProperty': FqName@111) = null
+    packageFragments('kotlin.Long': FqName@112) = null
+    packageFragments('kotlin.String': FqName@113) = null
+    packageFragments('kotlin.io': FqName@114) = LazyJavaPackageFragment@115['io']
+    packageFragments('kotlin.io.Any': FqName@116) = null
+    packageFragments('kotlin.io.Char': FqName@117) = null
+    packageFragments('kotlin.io.Double': FqName@118) = null
+    packageFragments('kotlin.io.Int': FqName@119) = null
+    packageFragments('kotlin.io.JavaClass': FqName@120) = null
+    packageFragments('kotlin.io.KMemberProperty': FqName@121) = null
+    packageFragments('kotlin.io.KMutableMemberProperty': FqName@122) = null
+    packageFragments('kotlin.io.Long': FqName@123) = null
+    packageFragments('kotlin.io.String': FqName@124) = null
+    packageFragments('kotlin.jvm': FqName@125) = LazyJavaPackageFragment@126['jvm']
+    packageFragments('kotlin.jvm.Any': FqName@127) = null
+    packageFragments('kotlin.jvm.Char': FqName@128) = null
+    packageFragments('kotlin.jvm.Double': FqName@129) = null
+    packageFragments('kotlin.jvm.Int': FqName@130) = null
+    packageFragments('kotlin.jvm.JavaClass': FqName@131) = null
+    packageFragments('kotlin.jvm.KMemberProperty': FqName@132) = null
+    packageFragments('kotlin.jvm.KMutableMemberProperty': FqName@133) = null
+    packageFragments('kotlin.jvm.Long': FqName@134) = null
+    packageFragments('kotlin.jvm.String': FqName@135) = null
+    packageFragments('kotlin.reflect': FqName@136) = LazyJavaPackageFragment@5['reflect']
+    packageFragments('kotlin.reflect.Any': FqName@137) = null
+    packageFragments('kotlin.reflect.Char': FqName@138) = null
+    packageFragments('kotlin.reflect.Double': FqName@139) = null
+    packageFragments('kotlin.reflect.Int': FqName@140) = null
+    packageFragments('kotlin.reflect.JavaClass': FqName@141) = null
+    packageFragments('kotlin.reflect.KMemberProperty': FqName@142) = null
+    packageFragments('kotlin.reflect.KMutableMemberProperty': FqName@143) = null
+    packageFragments('kotlin.reflect.Long': FqName@144) = null
+    packageFragments('kotlin.reflect.String': FqName@145) = null
     topLevelClasses(JavaClassImpl@146['JavaClass']) = LazyJavaClassDescriptor@24['JavaClass']
 }
 
 LazyJavaPackageFragment@80['<root>'] {
-    _functions('invoke': Name@147) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    _functions('kotlin': Name@149) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    _functions('privateFinal': Name@150) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    _functions('privateMutable': Name@151) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    _functions('protectedFinal': Name@152) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    _functions('protectedMutable': Name@153) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    _functions('publicFinal': Name@154) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    _functions('publicMutable': Name@155) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('Any': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('Char': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('Double': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('Int': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('JavaClass': Name@160) = LazyJavaClassDescriptor@24['JavaClass'] // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('KMemberProperty': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('KMutableMemberProperty': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('Long': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('String': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('invoke': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('kotlin': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('privateFinal': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('privateMutable': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('protectedFinal': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('protectedMutable': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('publicFinal': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('publicMutable': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    deserializedPackageScope = Empty@166 // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('Any': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('Char': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('Double': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('Int': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('JavaClass': Name@152) = LazyJavaClassDescriptor@24['JavaClass'] // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('KMemberProperty': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('KMutableMemberProperty': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('Long': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('String': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('invoke': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('kotlin': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('privateFinal': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('privateMutable': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('protectedFinal': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('protectedMutable': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('publicFinal': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    classes('publicMutable': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@148
+    deserializedPackageScope = Empty@165 // through LazyPackageFragmentScopeForJavaPackage@148
+    functions('invoke': Name@157) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@148
+    functions('kotlin': Name@166) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@148
+    functions('privateFinal': Name@159) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@148
+    functions('privateMutable': Name@160) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@148
+    functions('protectedFinal': Name@161) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@148
+    functions('protectedMutable': Name@162) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@148
+    functions('publicFinal': Name@163) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@148
+    functions('publicMutable': Name@164) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@148
     memberIndex = computeMemberIndex$1@167 // through LazyPackageFragmentScopeForJavaPackage@148
 }
 
 LazyJavaPackageFragment@115['io'] {
-    _functions('invoke': Name@147) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    _functions('privateFinal': Name@150) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    _functions('privateMutable': Name@151) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    _functions('protectedFinal': Name@152) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    _functions('protectedMutable': Name@153) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    _functions('publicFinal': Name@154) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    _functions('publicMutable': Name@155) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('Any': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('Char': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('Double': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('Int': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('Long': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('String': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('invoke': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('privateFinal': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('privateMutable': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('protectedFinal': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('protectedMutable': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('publicFinal': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('publicMutable': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@168
+    classes('Any': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@168
+    classes('Char': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@168
+    classes('Double': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@168
+    classes('Int': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@168
+    classes('Long': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@168
+    classes('String': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@168
+    classes('invoke': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@168
+    classes('privateFinal': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@168
+    classes('privateMutable': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@168
+    classes('protectedFinal': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@168
+    classes('protectedMutable': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@168
+    classes('publicFinal': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@168
+    classes('publicMutable': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@168
     deserializedPackageScope = DeserializedPackageMemberScope@169 // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('invoke': Name@147) = EmptyList@26[empty] // through DeserializedPackageMemberScope@169
-    functions('privateFinal': Name@150) = EmptyList@26[empty] // through DeserializedPackageMemberScope@169
-    functions('privateMutable': Name@151) = EmptyList@26[empty] // through DeserializedPackageMemberScope@169
-    functions('protectedFinal': Name@152) = EmptyList@26[empty] // through DeserializedPackageMemberScope@169
-    functions('protectedMutable': Name@153) = EmptyList@26[empty] // through DeserializedPackageMemberScope@169
-    functions('publicFinal': Name@154) = EmptyList@26[empty] // through DeserializedPackageMemberScope@169
-    functions('publicMutable': Name@155) = EmptyList@26[empty] // through DeserializedPackageMemberScope@169
+    functions('invoke': Name@157) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
+    functions('invoke': Name@157) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@168
+    functions('privateFinal': Name@159) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
+    functions('privateFinal': Name@159) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@168
+    functions('privateMutable': Name@160) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
+    functions('privateMutable': Name@160) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@168
+    functions('protectedFinal': Name@161) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
+    functions('protectedFinal': Name@161) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@168
+    functions('protectedMutable': Name@162) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
+    functions('protectedMutable': Name@162) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@168
+    functions('publicFinal': Name@163) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
+    functions('publicFinal': Name@163) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@168
+    functions('publicMutable': Name@164) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
+    functions('publicMutable': Name@164) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@168
     memberIndex = computeMemberIndex$1@170 // through LazyPackageFragmentScopeForJavaPackage@168
     membersProtos = HashMap@171 // through DeserializedPackageMemberScope@169
-    properties('privateFinal': Name@150) = EmptyList@26[empty] // through DeserializedPackageMemberScope@169
-    properties('privateMutable': Name@151) = EmptyList@26[empty] // through DeserializedPackageMemberScope@169
-    properties('protectedFinal': Name@152) = EmptyList@26[empty] // through DeserializedPackageMemberScope@169
-    properties('protectedMutable': Name@153) = EmptyList@26[empty] // through DeserializedPackageMemberScope@169
-    properties('publicFinal': Name@154) = EmptyList@26[empty] // through DeserializedPackageMemberScope@169
-    properties('publicMutable': Name@155) = EmptyList@26[empty] // through DeserializedPackageMemberScope@169
+    properties('privateFinal': Name@159) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
+    properties('privateMutable': Name@160) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
+    properties('protectedFinal': Name@161) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
+    properties('protectedMutable': Name@162) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
+    properties('publicFinal': Name@163) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
+    properties('publicMutable': Name@164) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
 }
 
 LazyJavaPackageFragment@91['java'] {
-    _functions('lang': Name@172) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('lang': Name@174) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    deserializedPackageScope = Empty@166 // through LazyPackageFragmentScopeForJavaPackage@173
+    classes('lang': Name@172) = null // through LazyPackageFragmentScopeForJavaPackage@173
+    deserializedPackageScope = Empty@165 // through LazyPackageFragmentScopeForJavaPackage@173
+    functions('lang': Name@174) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@173
     memberIndex = computeMemberIndex$1@175 // through LazyPackageFragmentScopeForJavaPackage@173
 }
 
 LazyJavaPackageFragment@126['jvm'] {
-    _functions('invoke': Name@147) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@176
-    _functions('privateFinal': Name@150) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@176
-    _functions('privateMutable': Name@151) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@176
-    _functions('protectedFinal': Name@152) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@176
-    _functions('protectedMutable': Name@153) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@176
-    _functions('publicFinal': Name@154) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@176
-    _functions('publicMutable': Name@155) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('Any': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('Char': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('Double': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('Int': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('Long': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('String': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('invoke': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('privateFinal': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('privateMutable': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('protectedFinal': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('protectedMutable': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('publicFinal': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('publicMutable': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    deserializedPackageScope = Empty@166 // through LazyPackageFragmentScopeForJavaPackage@176
+    classes('Any': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@176
+    classes('Char': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@176
+    classes('Double': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@176
+    classes('Int': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@176
+    classes('Long': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@176
+    classes('String': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@176
+    classes('invoke': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@176
+    classes('privateFinal': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@176
+    classes('privateMutable': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@176
+    classes('protectedFinal': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@176
+    classes('protectedMutable': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@176
+    classes('publicFinal': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@176
+    classes('publicMutable': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@176
+    deserializedPackageScope = Empty@165 // through LazyPackageFragmentScopeForJavaPackage@176
+    functions('invoke': Name@157) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@176
+    functions('privateFinal': Name@159) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@176
+    functions('privateMutable': Name@160) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@176
+    functions('protectedFinal': Name@161) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@176
+    functions('protectedMutable': Name@162) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@176
+    functions('publicFinal': Name@163) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@176
+    functions('publicMutable': Name@164) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@176
     memberIndex = computeMemberIndex$1@177 // through LazyPackageFragmentScopeForJavaPackage@176
 }
 
 LazyJavaPackageFragment@104['kotlin'] {
-    _functions('invoke': Name@147) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@178
-    _functions('io': Name@179) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@178
-    _functions('jvm': Name@180) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@178
-    _functions('privateFinal': Name@150) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@178
-    _functions('privateMutable': Name@151) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@178
-    _functions('protectedFinal': Name@152) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@178
-    _functions('protectedMutable': Name@153) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@178
-    _functions('publicFinal': Name@154) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@178
-    _functions('publicMutable': Name@155) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@178
-    _functions('reflect': Name@181) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@178
-    classes('Any': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@178
-    classes('Char': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@178
-    classes('Double': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@178
-    classes('Int': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@178
-    classes('Long': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@178
-    classes('String': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@178
-    classes('invoke': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@178
-    classes('io': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@178
-    classes('jvm': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@178
-    classes('privateFinal': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@178
-    classes('privateMutable': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@178
-    classes('protectedFinal': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@178
-    classes('protectedMutable': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@178
-    classes('publicFinal': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@178
-    classes('publicMutable': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@178
-    classes('reflect': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@178
-    deserializedPackageScope = DeserializedPackageMemberScope@186 // through LazyPackageFragmentScopeForJavaPackage@178
-    functions('invoke': Name@147) = EmptyList@26[empty] // through DeserializedPackageMemberScope@186
-    functions('io': Name@179) = EmptyList@26[empty] // through DeserializedPackageMemberScope@186
-    functions('jvm': Name@180) = EmptyList@26[empty] // through DeserializedPackageMemberScope@186
-    functions('privateFinal': Name@150) = EmptyList@26[empty] // through DeserializedPackageMemberScope@186
-    functions('privateMutable': Name@151) = EmptyList@26[empty] // through DeserializedPackageMemberScope@186
-    functions('protectedFinal': Name@152) = EmptyList@26[empty] // through DeserializedPackageMemberScope@186
-    functions('protectedMutable': Name@153) = EmptyList@26[empty] // through DeserializedPackageMemberScope@186
-    functions('publicFinal': Name@154) = EmptyList@26[empty] // through DeserializedPackageMemberScope@186
-    functions('publicMutable': Name@155) = EmptyList@26[empty] // through DeserializedPackageMemberScope@186
-    functions('reflect': Name@181) = EmptyList@26[empty] // through DeserializedPackageMemberScope@186
-    memberIndex = computeMemberIndex$1@187 // through LazyPackageFragmentScopeForJavaPackage@178
-    membersProtos = HashMap@188 // through DeserializedPackageMemberScope@186
-    properties('io': Name@179) = EmptyList@26[empty] // through DeserializedPackageMemberScope@186
-    properties('jvm': Name@180) = EmptyList@26[empty] // through DeserializedPackageMemberScope@186
-    properties('privateFinal': Name@150) = EmptyList@26[empty] // through DeserializedPackageMemberScope@186
-    properties('privateMutable': Name@151) = EmptyList@26[empty] // through DeserializedPackageMemberScope@186
-    properties('protectedFinal': Name@152) = EmptyList@26[empty] // through DeserializedPackageMemberScope@186
-    properties('protectedMutable': Name@153) = EmptyList@26[empty] // through DeserializedPackageMemberScope@186
-    properties('publicFinal': Name@154) = EmptyList@26[empty] // through DeserializedPackageMemberScope@186
-    properties('publicMutable': Name@155) = EmptyList@26[empty] // through DeserializedPackageMemberScope@186
-    properties('reflect': Name@181) = EmptyList@26[empty] // through DeserializedPackageMemberScope@186
+    classes('Any': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('Char': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('Double': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('Int': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('Long': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('String': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('invoke': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('io': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('jvm': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('privateFinal': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('privateMutable': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('protectedFinal': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('protectedMutable': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('publicFinal': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('publicMutable': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('reflect': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    deserializedPackageScope = DeserializedPackageMemberScope@183 // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('invoke': Name@157) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
+    functions('invoke': Name@157) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('io': Name@184) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
+    functions('io': Name@184) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('jvm': Name@185) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
+    functions('jvm': Name@185) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('privateFinal': Name@159) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
+    functions('privateFinal': Name@159) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('privateMutable': Name@160) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
+    functions('privateMutable': Name@160) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('protectedFinal': Name@161) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
+    functions('protectedFinal': Name@161) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('protectedMutable': Name@162) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
+    functions('protectedMutable': Name@162) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('publicFinal': Name@163) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
+    functions('publicFinal': Name@163) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('publicMutable': Name@164) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
+    functions('publicMutable': Name@164) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('reflect': Name@186) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
+    functions('reflect': Name@186) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    memberIndex = computeMemberIndex$1@187 // through LazyPackageFragmentScopeForJavaPackage@179
+    membersProtos = HashMap@188 // through DeserializedPackageMemberScope@183
+    properties('io': Name@184) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
+    properties('jvm': Name@185) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
+    properties('privateFinal': Name@159) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
+    properties('privateMutable': Name@160) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
+    properties('protectedFinal': Name@161) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
+    properties('protectedMutable': Name@162) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
+    properties('publicFinal': Name@163) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
+    properties('publicMutable': Name@164) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
+    properties('reflect': Name@186) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
 }
 
 LazyJavaPackageFragment@93['lang'] {
-    _functions('invoke': Name@147) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    _functions('privateFinal': Name@150) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    _functions('privateMutable': Name@151) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    _functions('protectedFinal': Name@152) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    _functions('protectedMutable': Name@153) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    _functions('publicFinal': Name@154) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    _functions('publicMutable': Name@155) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('invoke': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('privateFinal': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('privateMutable': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('protectedFinal': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('protectedMutable': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('publicFinal': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('publicMutable': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    deserializedPackageScope = Empty@166 // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('invoke': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('privateFinal': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('privateMutable': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('protectedFinal': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('protectedMutable': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('publicFinal': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('publicMutable': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    deserializedPackageScope = Empty@165 // through LazyPackageFragmentScopeForJavaPackage@189
+    functions('invoke': Name@157) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@189
+    functions('privateFinal': Name@159) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@189
+    functions('privateMutable': Name@160) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@189
+    functions('protectedFinal': Name@161) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@189
+    functions('protectedMutable': Name@162) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@189
+    functions('publicFinal': Name@163) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@189
+    functions('publicMutable': Name@164) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@189
     memberIndex = computeMemberIndex$1@190 // through LazyPackageFragmentScopeForJavaPackage@189
 }
 
 LazyJavaPackageFragment@5['reflect'] {
-    _functions('invoke': Name@147) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    _functions('privateFinal': Name@150) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    _functions('privateMutable': Name@151) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    _functions('protectedFinal': Name@152) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    _functions('protectedMutable': Name@153) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    _functions('publicFinal': Name@154) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    _functions('publicMutable': Name@155) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('Any': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('Char': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('Double': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('Int': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('KMemberProperty': Name@161) = DeserializedClassDescriptor@2['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('KMutableMemberProperty': Name@162) = DeserializedClassDescriptor@4['KMutableMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('Long': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('String': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('invoke': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('privateFinal': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('privateMutable': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('protectedFinal': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('protectedMutable': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('publicFinal': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('publicMutable': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    deserializedPackageScope = Empty@166 // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('Any': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('Char': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('Double': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('Int': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('KMemberProperty': Name@153) = DeserializedClassDescriptor@2['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('KMutableMemberProperty': Name@154) = DeserializedClassDescriptor@4['KMutableMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('Long': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('String': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('invoke': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('privateFinal': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('privateMutable': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('protectedFinal': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('protectedMutable': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('publicFinal': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('publicMutable': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    deserializedPackageScope = Empty@165 // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('invoke': Name@157) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('privateFinal': Name@159) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('privateMutable': Name@160) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('protectedFinal': Name@161) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('protectedMutable': Name@162) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('publicFinal': Name@163) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('publicMutable': Name@164) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@191
     memberIndex = computeMemberIndex$1@192 // through LazyPackageFragmentScopeForJavaPackage@191
 }
 

compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.lazy.log

@@ -91,7 +91,7 @@ DeserializedType@45['R in kotlin.reflect.KMutableTopLevelVariable'] {
 }
 
 DeserializedType@46['R in kotlin.reflect.KMutableVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@43
+    constructor = AbstractLazyTypeParameterDescriptor$1@37
 }
 
 DeserializedType@47['R in kotlin.reflect.KTopLevelVariable'] {
@@ -103,15 +103,15 @@ DeserializedType@48['R in kotlin.reflect.KTopLevelVariable'] {
 }
 
 DeserializedType@49['R in kotlin.reflect.KVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@37
+    constructor = AbstractLazyTypeParameterDescriptor$1@43
 }
 
-DeserializedType@31['kotlin.Any'] {
+DeserializedType@23['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@50
     memberScope = DeserializedClassMemberScope@51
 }
 
-DeserializedType@27['kotlin.Any'] {
+DeserializedType@31['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@50
     memberScope = DeserializedClassMemberScope@51
 }
@@ -121,7 +121,7 @@ DeserializedType@35['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@51
 }
 
-DeserializedType@23['kotlin.Any'] {
+DeserializedType@27['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@50
     memberScope = DeserializedClassMemberScope@51
 }
@@ -179,393 +179,393 @@ DeserializedType@75['kotlin.reflect.KVariable'] {
 }
 
 LazyJavaClassDescriptor@76['JavaClass'] {
-    _functionTypeForSamInterface = null
-    _functions('invoke': Name@77) = EmptyList@78[empty] // through LazyJavaClassMemberScope@79
-    _functions('invoke': Name@77) = EmptyList@78[empty] // through LazyJavaStaticClassScope@80
-    _functions('privateFinal': Name@81) = EmptyList@78[empty] // through LazyJavaClassMemberScope@79
-    _functions('privateFinal': Name@81) = EmptyList@78[empty] // through LazyJavaStaticClassScope@80
-    _functions('privateMutable': Name@82) = EmptyList@78[empty] // through LazyJavaClassMemberScope@79
-    _functions('privateMutable': Name@82) = EmptyList@78[empty] // through LazyJavaStaticClassScope@80
-    _functions('protectedFinal': Name@83) = EmptyList@78[empty] // through LazyJavaClassMemberScope@79
-    _functions('protectedFinal': Name@83) = EmptyList@78[empty] // through LazyJavaStaticClassScope@80
-    _functions('protectedMutable': Name@84) = EmptyList@78[empty] // through LazyJavaClassMemberScope@79
-    _functions('protectedMutable': Name@84) = EmptyList@78[empty] // through LazyJavaStaticClassScope@80
-    _functions('publicFinal': Name@85) = EmptyList@78[empty] // through LazyJavaClassMemberScope@79
-    _functions('publicFinal': Name@85) = EmptyList@78[empty] // through LazyJavaStaticClassScope@80
-    _functions('publicMutable': Name@86) = EmptyList@78[empty] // through LazyJavaClassMemberScope@79
-    _functions('publicMutable': Name@86) = EmptyList@78[empty] // through LazyJavaStaticClassScope@80
-    _properties('privateFinal': Name@81) = ArrayList@87[1] { JavaPropertyDescriptor@88['privateFinal'] } // through LazyJavaStaticClassScope@80
-    _properties('privateFinal': Name@81) = EmptyList@78[empty] // through LazyJavaClassMemberScope@79
-    _properties('privateMutable': Name@82) = ArrayList@89[1] { JavaPropertyDescriptor@90['privateMutable'] } // through LazyJavaStaticClassScope@80
-    _properties('privateMutable': Name@82) = EmptyList@78[empty] // through LazyJavaClassMemberScope@79
-    _properties('protectedFinal': Name@83) = ArrayList@91[1] { JavaPropertyDescriptor@92['protectedFinal'] } // through LazyJavaStaticClassScope@80
-    _properties('protectedFinal': Name@83) = EmptyList@78[empty] // through LazyJavaClassMemberScope@79
-    _properties('protectedMutable': Name@84) = ArrayList@93[1] { JavaPropertyDescriptor@94['protectedMutable'] } // through LazyJavaStaticClassScope@80
-    _properties('protectedMutable': Name@84) = EmptyList@78[empty] // through LazyJavaClassMemberScope@79
-    _properties('publicFinal': Name@85) = ArrayList@95[1] { JavaPropertyDescriptor@96['publicFinal'] } // through LazyJavaStaticClassScope@80
-    _properties('publicFinal': Name@85) = EmptyList@78[empty] // through LazyJavaClassMemberScope@79
-    _properties('publicMutable': Name@86) = ArrayList@97[1] { JavaPropertyDescriptor@98['publicMutable'] } // through LazyJavaStaticClassScope@80
-    _properties('publicMutable': Name@86) = EmptyList@78[empty] // through LazyJavaClassMemberScope@79
-    _typeConstructor = LazyJavaClassTypeConstructor@99['JavaClass']
-    enumEntryIndex = LinkedHashMap@100 // through LazyJavaClassMemberScope@79
-    memberIndex = computeMemberIndex$1@101 // through LazyJavaClassMemberScope@79
-    memberIndex = computeMemberIndex$1@102 // through LazyJavaStaticClassScope@80
-    nestedClassIndex = LinkedHashMap@103 // through LazyJavaClassMemberScope@79
-    nestedClasses('Any': Name@104) = null // through LazyJavaClassMemberScope@79
-    nestedClasses('Char': Name@105) = null // through LazyJavaClassMemberScope@79
-    nestedClasses('Double': Name@106) = null // through LazyJavaClassMemberScope@79
-    nestedClasses('String': Name@107) = null // through LazyJavaClassMemberScope@79
-    nestedClasses('Throwable': Name@108) = null // through LazyJavaClassMemberScope@79
-    nestedClasses('invoke': Name@77) = null // through LazyJavaClassMemberScope@79
-    nestedClasses('privateFinal': Name@81) = null // through LazyJavaClassMemberScope@79
-    nestedClasses('privateMutable': Name@82) = null // through LazyJavaClassMemberScope@79
-    nestedClasses('protectedFinal': Name@83) = null // through LazyJavaClassMemberScope@79
-    nestedClasses('protectedMutable': Name@84) = null // through LazyJavaClassMemberScope@79
-    nestedClasses('publicFinal': Name@85) = null // through LazyJavaClassMemberScope@79
-    nestedClasses('publicMutable': Name@86) = null // through LazyJavaClassMemberScope@79
+    enumEntryIndex = LinkedHashMap@77 // through LazyJavaClassMemberScope@78
+    functionTypeForSamInterface = null
+    functions('invoke': Name@79) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
+    functions('invoke': Name@79) = EmptyList@80[empty] // through LazyJavaStaticClassScope@81
+    functions('privateFinal': Name@82) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
+    functions('privateFinal': Name@82) = EmptyList@80[empty] // through LazyJavaStaticClassScope@81
+    functions('privateMutable': Name@83) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
+    functions('privateMutable': Name@83) = EmptyList@80[empty] // through LazyJavaStaticClassScope@81
+    functions('protectedFinal': Name@84) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
+    functions('protectedFinal': Name@84) = EmptyList@80[empty] // through LazyJavaStaticClassScope@81
+    functions('protectedMutable': Name@85) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
+    functions('protectedMutable': Name@85) = EmptyList@80[empty] // through LazyJavaStaticClassScope@81
+    functions('publicFinal': Name@86) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
+    functions('publicFinal': Name@86) = EmptyList@80[empty] // through LazyJavaStaticClassScope@81
+    functions('publicMutable': Name@87) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
+    functions('publicMutable': Name@87) = EmptyList@80[empty] // through LazyJavaStaticClassScope@81
+    memberIndex = computeMemberIndex$1@88 // through LazyJavaClassMemberScope@78
+    memberIndex = computeMemberIndex$1@89 // through LazyJavaStaticClassScope@81
+    nestedClassIndex = LinkedHashMap@90 // through LazyJavaClassMemberScope@78
+    nestedClasses('Any': Name@91) = null // through LazyJavaClassMemberScope@78
+    nestedClasses('Char': Name@92) = null // through LazyJavaClassMemberScope@78
+    nestedClasses('Double': Name@93) = null // through LazyJavaClassMemberScope@78
+    nestedClasses('String': Name@94) = null // through LazyJavaClassMemberScope@78
+    nestedClasses('Throwable': Name@95) = null // through LazyJavaClassMemberScope@78
+    nestedClasses('invoke': Name@79) = null // through LazyJavaClassMemberScope@78
+    nestedClasses('privateFinal': Name@82) = null // through LazyJavaClassMemberScope@78
+    nestedClasses('privateMutable': Name@83) = null // through LazyJavaClassMemberScope@78
+    nestedClasses('protectedFinal': Name@84) = null // through LazyJavaClassMemberScope@78
+    nestedClasses('protectedMutable': Name@85) = null // through LazyJavaClassMemberScope@78
+    nestedClasses('publicFinal': Name@86) = null // through LazyJavaClassMemberScope@78
+    nestedClasses('publicMutable': Name@87) = null // through LazyJavaClassMemberScope@78
+    properties('privateFinal': Name@82) = ArrayList@96[1] { JavaPropertyDescriptor@97['privateFinal'] } // through LazyJavaStaticClassScope@81
+    properties('privateFinal': Name@82) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
+    properties('privateMutable': Name@83) = ArrayList@98[1] { JavaPropertyDescriptor@99['privateMutable'] } // through LazyJavaStaticClassScope@81
+    properties('privateMutable': Name@83) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
+    properties('protectedFinal': Name@84) = ArrayList@100[1] { JavaPropertyDescriptor@101['protectedFinal'] } // through LazyJavaStaticClassScope@81
+    properties('protectedFinal': Name@84) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
+    properties('protectedMutable': Name@85) = ArrayList@102[1] { JavaPropertyDescriptor@103['protectedMutable'] } // through LazyJavaStaticClassScope@81
+    properties('protectedMutable': Name@85) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
+    properties('publicFinal': Name@86) = ArrayList@104[1] { JavaPropertyDescriptor@105['publicFinal'] } // through LazyJavaStaticClassScope@81
+    properties('publicFinal': Name@86) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
+    properties('publicMutable': Name@87) = ArrayList@106[1] { JavaPropertyDescriptor@107['publicMutable'] } // through LazyJavaStaticClassScope@81
+    properties('publicMutable': Name@87) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
+    typeConstructor = LazyJavaClassTypeConstructor@108['JavaClass']
 }
 
-LazyJavaClassTypeConstructor@99['JavaClass'] {
-    _parameters = ArrayList@109[empty]
-    _supertypes = ArrayList@110[1] { JetTypeImpl@111['Any'] }
+LazyJavaClassTypeConstructor@108['JavaClass'] {
+    parameters = ArrayList@109[empty]
+    supertypes = ArrayList@110[1] { JetTypeImpl@111['Any'] }
 }
 
 LazyJavaClassifierType@112['JavaClass'] {
-    _arguments = ArrayList@113[empty]
-    _memberScope = LazyJavaClassMemberScope@79
-    _nullable = 'false': Boolean@114
-    _typeConstructor = LazyJavaClassTypeConstructor@99['JavaClass']
-    classifier = JavaClassImpl@115['JavaClass']
+    arguments = ArrayList@113[empty]
+    classifier = JavaClassImpl@114['JavaClass']
+    memberScope = LazyJavaClassMemberScope@78
+    nullable = 'false': Boolean@115
+    typeConstructor = LazyJavaClassTypeConstructor@108['JavaClass']
 }
 
 LazyJavaClassifierType@116['JavaClass'] {
-    _arguments = ArrayList@117[empty]
-    _nullable = 'true': Boolean@118
-    _typeConstructor = LazyJavaClassTypeConstructor@99['JavaClass']
-    classifier = JavaClassImpl@115['JavaClass']
+    arguments = ArrayList@117[empty]
+    classifier = JavaClassImpl@114['JavaClass']
+    nullable = 'true': Boolean@118
+    typeConstructor = LazyJavaClassTypeConstructor@108['JavaClass']
 }
 
 LazyJavaClassifierType@119['Object'] {
-    _arguments = ArrayList@120[empty]
-    _memberScope = DeserializedClassMemberScope@51
-    _nullable = 'false': Boolean@114
-    _typeConstructor = DeserializedClassTypeConstructor@50
+    arguments = ArrayList@120[empty]
     classifier = JavaClassImpl@121['Object']
+    memberScope = DeserializedClassMemberScope@51
+    nullable = 'false': Boolean@115
+    typeConstructor = DeserializedClassTypeConstructor@50
 }
 
 LazyJavaClassifierType@122['Object'] {
-    _arguments = ArrayList@123[empty]
-    _nullable = 'true': Boolean@118
-    _typeConstructor = DeserializedClassTypeConstructor@50
+    arguments = ArrayList@123[empty]
     classifier = JavaClassImpl@121['Object']
+    nullable = 'true': Boolean@118
+    typeConstructor = DeserializedClassTypeConstructor@50
 }
 
 LazyJavaClassifierType@124['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@50
     classifier = JavaClassImpl@125['Object']
+    typeConstructor = DeserializedClassTypeConstructor@50
 }
 
 LazyJavaClassifierType@126['String'] {
-    _arguments = ArrayList@127[empty]
-    _memberScope = DeserializedClassMemberScope@128
-    _nullable = 'false': Boolean@114
-    _typeConstructor = DeserializedClassTypeConstructor@129
-    classifier = JavaClassImpl@130['String']
+    arguments = ArrayList@127[empty]
+    classifier = JavaClassImpl@128['String']
+    memberScope = DeserializedClassMemberScope@129
+    nullable = 'false': Boolean@115
+    typeConstructor = DeserializedClassTypeConstructor@130
 }
 
 LazyJavaClassifierType@131['String'] {
-    _arguments = ArrayList@132[empty]
-    _nullable = 'true': Boolean@118
-    _typeConstructor = DeserializedClassTypeConstructor@129
-    classifier = JavaClassImpl@130['String']
+    arguments = ArrayList@132[empty]
+    classifier = JavaClassImpl@128['String']
+    nullable = 'true': Boolean@118
+    typeConstructor = DeserializedClassTypeConstructor@130
 }
 
 LazyJavaClassifierType@133['Throwable'] {
-    _arguments = ArrayList@134[empty]
-    _memberScope = DeserializedClassMemberScope@135
-    _nullable = 'false': Boolean@114
-    _typeConstructor = DeserializedClassTypeConstructor@136
-    classifier = JavaClassImpl@137['Throwable']
+    arguments = ArrayList@134[empty]
+    classifier = JavaClassImpl@135['Throwable']
+    memberScope = DeserializedClassMemberScope@136
+    nullable = 'false': Boolean@115
+    typeConstructor = DeserializedClassTypeConstructor@137
 }
 
 LazyJavaClassifierType@138['Throwable'] {
-    _arguments = ArrayList@139[empty]
-    _nullable = 'true': Boolean@118
-    _typeConstructor = DeserializedClassTypeConstructor@136
-    classifier = JavaClassImpl@137['Throwable']
+    arguments = ArrayList@139[empty]
+    classifier = JavaClassImpl@135['Throwable']
+    nullable = 'true': Boolean@118
+    typeConstructor = DeserializedClassTypeConstructor@137
 }
 
 LazyJavaPackageFragmentProvider@140 {
-    _packageFragments('<root>': FqName@141) = LazyJavaPackageFragment@142['<root>']
-    _packageFragments('Any': FqName@143) = null
-    _packageFragments('Char': FqName@144) = null
-    _packageFragments('Double': FqName@145) = null
-    _packageFragments('JavaClass': FqName@146) = null
-    _packageFragments('KMutableProperty': FqName@147) = null
-    _packageFragments('KMutableTopLevelProperty': FqName@148) = null
-    _packageFragments('KProperty': FqName@149) = null
-    _packageFragments('KTopLevelProperty': FqName@150) = null
-    _packageFragments('String': FqName@151) = null
-    _packageFragments('Throwable': FqName@152) = null
-    _packageFragments('java': FqName@153) = LazyJavaPackageFragment@154['java']
-    _packageFragments('java.lang': FqName@155) = LazyJavaPackageFragment@156['lang']
-    _packageFragments('java.lang.Any': FqName@157) = null
-    _packageFragments('java.lang.Char': FqName@158) = null
-    _packageFragments('java.lang.Double': FqName@159) = null
-    _packageFragments('java.lang.JavaClass': FqName@160) = null
-    _packageFragments('java.lang.KMutableProperty': FqName@161) = null
-    _packageFragments('java.lang.KMutableTopLevelProperty': FqName@162) = null
-    _packageFragments('java.lang.KProperty': FqName@163) = null
-    _packageFragments('java.lang.KTopLevelProperty': FqName@164) = null
-    _packageFragments('java.lang.String': FqName@165) = null
-    _packageFragments('java.lang.Throwable': FqName@166) = null
-    _packageFragments('kotlin': FqName@167) = LazyJavaPackageFragment@168['kotlin']
-    _packageFragments('kotlin.Any': FqName@169) = null
-    _packageFragments('kotlin.Char': FqName@170) = null
-    _packageFragments('kotlin.Double': FqName@171) = null
-    _packageFragments('kotlin.JavaClass': FqName@172) = null
-    _packageFragments('kotlin.KMutableProperty': FqName@173) = null
-    _packageFragments('kotlin.KMutableTopLevelProperty': FqName@174) = null
-    _packageFragments('kotlin.KProperty': FqName@175) = null
-    _packageFragments('kotlin.KTopLevelProperty': FqName@176) = null
-    _packageFragments('kotlin.String': FqName@177) = null
-    _packageFragments('kotlin.Throwable': FqName@178) = null
-    _packageFragments('kotlin.io': FqName@179) = LazyJavaPackageFragment@180['io']
-    _packageFragments('kotlin.io.Any': FqName@181) = null
-    _packageFragments('kotlin.io.Char': FqName@182) = null
-    _packageFragments('kotlin.io.Double': FqName@183) = null
-    _packageFragments('kotlin.io.JavaClass': FqName@184) = null
-    _packageFragments('kotlin.io.KMutableProperty': FqName@185) = null
-    _packageFragments('kotlin.io.KMutableTopLevelProperty': FqName@186) = null
-    _packageFragments('kotlin.io.KProperty': FqName@187) = null
-    _packageFragments('kotlin.io.KTopLevelProperty': FqName@188) = null
-    _packageFragments('kotlin.io.String': FqName@189) = null
-    _packageFragments('kotlin.io.Throwable': FqName@190) = null
-    _packageFragments('kotlin.jvm': FqName@191) = LazyJavaPackageFragment@192['jvm']
-    _packageFragments('kotlin.jvm.Any': FqName@193) = null
-    _packageFragments('kotlin.jvm.Char': FqName@194) = null
-    _packageFragments('kotlin.jvm.Double': FqName@195) = null
-    _packageFragments('kotlin.jvm.JavaClass': FqName@196) = null
-    _packageFragments('kotlin.jvm.KMutableProperty': FqName@197) = null
-    _packageFragments('kotlin.jvm.KMutableTopLevelProperty': FqName@198) = null
-    _packageFragments('kotlin.jvm.KProperty': FqName@199) = null
-    _packageFragments('kotlin.jvm.KTopLevelProperty': FqName@200) = null
-    _packageFragments('kotlin.jvm.String': FqName@201) = null
-    _packageFragments('kotlin.jvm.Throwable': FqName@202) = null
-    _packageFragments('kotlin.reflect': FqName@203) = LazyJavaPackageFragment@19['reflect']
-    _packageFragments('kotlin.reflect.Any': FqName@204) = null
-    _packageFragments('kotlin.reflect.Char': FqName@205) = null
-    _packageFragments('kotlin.reflect.Double': FqName@206) = null
-    _packageFragments('kotlin.reflect.JavaClass': FqName@207) = null
-    _packageFragments('kotlin.reflect.KMutableProperty': FqName@208) = null
-    _packageFragments('kotlin.reflect.KMutableTopLevelProperty': FqName@209) = null
-    _packageFragments('kotlin.reflect.KProperty': FqName@210) = null
-    _packageFragments('kotlin.reflect.KTopLevelProperty': FqName@211) = null
-    _packageFragments('kotlin.reflect.String': FqName@212) = null
-    _packageFragments('kotlin.reflect.Throwable': FqName@213) = null
+    packageFragments('<root>': FqName@141) = LazyJavaPackageFragment@142['<root>']
+    packageFragments('Any': FqName@143) = null
+    packageFragments('Char': FqName@144) = null
+    packageFragments('Double': FqName@145) = null
+    packageFragments('JavaClass': FqName@146) = null
+    packageFragments('KMutableProperty': FqName@147) = null
+    packageFragments('KMutableTopLevelProperty': FqName@148) = null
+    packageFragments('KProperty': FqName@149) = null
+    packageFragments('KTopLevelProperty': FqName@150) = null
+    packageFragments('String': FqName@151) = null
+    packageFragments('Throwable': FqName@152) = null
+    packageFragments('java': FqName@153) = LazyJavaPackageFragment@154['java']
+    packageFragments('java.lang': FqName@155) = LazyJavaPackageFragment@156['lang']
+    packageFragments('java.lang.Any': FqName@157) = null
+    packageFragments('java.lang.Char': FqName@158) = null
+    packageFragments('java.lang.Double': FqName@159) = null
+    packageFragments('java.lang.JavaClass': FqName@160) = null
+    packageFragments('java.lang.KMutableProperty': FqName@161) = null
+    packageFragments('java.lang.KMutableTopLevelProperty': FqName@162) = null
+    packageFragments('java.lang.KProperty': FqName@163) = null
+    packageFragments('java.lang.KTopLevelProperty': FqName@164) = null
+    packageFragments('java.lang.String': FqName@165) = null
+    packageFragments('java.lang.Throwable': FqName@166) = null
+    packageFragments('kotlin': FqName@167) = LazyJavaPackageFragment@168['kotlin']
+    packageFragments('kotlin.Any': FqName@169) = null
+    packageFragments('kotlin.Char': FqName@170) = null
+    packageFragments('kotlin.Double': FqName@171) = null
+    packageFragments('kotlin.JavaClass': FqName@172) = null
+    packageFragments('kotlin.KMutableProperty': FqName@173) = null
+    packageFragments('kotlin.KMutableTopLevelProperty': FqName@174) = null
+    packageFragments('kotlin.KProperty': FqName@175) = null
+    packageFragments('kotlin.KTopLevelProperty': FqName@176) = null
+    packageFragments('kotlin.String': FqName@177) = null
+    packageFragments('kotlin.Throwable': FqName@178) = null
+    packageFragments('kotlin.io': FqName@179) = LazyJavaPackageFragment@180['io']
+    packageFragments('kotlin.io.Any': FqName@181) = null
+    packageFragments('kotlin.io.Char': FqName@182) = null
+    packageFragments('kotlin.io.Double': FqName@183) = null
+    packageFragments('kotlin.io.JavaClass': FqName@184) = null
+    packageFragments('kotlin.io.KMutableProperty': FqName@185) = null
+    packageFragments('kotlin.io.KMutableTopLevelProperty': FqName@186) = null
+    packageFragments('kotlin.io.KProperty': FqName@187) = null
+    packageFragments('kotlin.io.KTopLevelProperty': FqName@188) = null
+    packageFragments('kotlin.io.String': FqName@189) = null
+    packageFragments('kotlin.io.Throwable': FqName@190) = null
+    packageFragments('kotlin.jvm': FqName@191) = LazyJavaPackageFragment@192['jvm']
+    packageFragments('kotlin.jvm.Any': FqName@193) = null
+    packageFragments('kotlin.jvm.Char': FqName@194) = null
+    packageFragments('kotlin.jvm.Double': FqName@195) = null
+    packageFragments('kotlin.jvm.JavaClass': FqName@196) = null
+    packageFragments('kotlin.jvm.KMutableProperty': FqName@197) = null
+    packageFragments('kotlin.jvm.KMutableTopLevelProperty': FqName@198) = null
+    packageFragments('kotlin.jvm.KProperty': FqName@199) = null
+    packageFragments('kotlin.jvm.KTopLevelProperty': FqName@200) = null
+    packageFragments('kotlin.jvm.String': FqName@201) = null
+    packageFragments('kotlin.jvm.Throwable': FqName@202) = null
+    packageFragments('kotlin.reflect': FqName@203) = LazyJavaPackageFragment@19['reflect']
+    packageFragments('kotlin.reflect.Any': FqName@204) = null
+    packageFragments('kotlin.reflect.Char': FqName@205) = null
+    packageFragments('kotlin.reflect.Double': FqName@206) = null
+    packageFragments('kotlin.reflect.JavaClass': FqName@207) = null
+    packageFragments('kotlin.reflect.KMutableProperty': FqName@208) = null
+    packageFragments('kotlin.reflect.KMutableTopLevelProperty': FqName@209) = null
+    packageFragments('kotlin.reflect.KProperty': FqName@210) = null
+    packageFragments('kotlin.reflect.KTopLevelProperty': FqName@211) = null
+    packageFragments('kotlin.reflect.String': FqName@212) = null
+    packageFragments('kotlin.reflect.Throwable': FqName@213) = null
     topLevelClasses(JavaClassImpl@214['JavaClass']) = LazyJavaClassDescriptor@76['JavaClass']
 }
 
 LazyJavaPackageFragment@142['<root>'] {
-    _functions('JavaClass': Name@215) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    _functions('invoke': Name@77) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    _functions('kotlin': Name@217) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    _functions('privateFinal': Name@81) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    _functions('privateMutable': Name@82) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    _functions('protectedFinal': Name@83) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    _functions('protectedMutable': Name@84) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    _functions('publicFinal': Name@85) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    _functions('publicMutable': Name@86) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('Any': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('Char': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('Double': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('JavaClass': Name@218) = LazyJavaClassDescriptor@76['JavaClass'] // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('KMutableProperty': Name@219) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('KMutableTopLevelProperty': Name@220) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('KProperty': Name@221) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('KTopLevelProperty': Name@222) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('String': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('Throwable': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('invoke': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('kotlin': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('privateFinal': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('privateMutable': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('protectedFinal': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('protectedMutable': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('publicFinal': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('publicMutable': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    deserializedPackageScope = Empty@224 // through LazyPackageFragmentScopeForJavaPackage@216
-    memberIndex = computeMemberIndex$1@225 // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('Any': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('Char': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('Double': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('JavaClass': Name@216) = LazyJavaClassDescriptor@76['JavaClass'] // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('KMutableProperty': Name@217) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('KMutableTopLevelProperty': Name@218) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('KProperty': Name@219) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('KTopLevelProperty': Name@220) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('Throwable': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('invoke': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('kotlin': Name@221) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('privateFinal': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('privateMutable': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('protectedFinal': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('protectedMutable': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('publicFinal': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('publicMutable': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    deserializedPackageScope = Empty@222 // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('JavaClass': Name@223) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('invoke': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('kotlin': Name@224) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('privateFinal': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('privateMutable': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('protectedFinal': Name@84) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('protectedMutable': Name@85) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('publicFinal': Name@86) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('publicMutable': Name@87) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    memberIndex = computeMemberIndex$1@225 // through LazyPackageFragmentScopeForJavaPackage@215
 }
 
 LazyJavaPackageFragment@180['io'] {
-    _functions('invoke': Name@77) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    _functions('privateFinal': Name@81) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    _functions('privateMutable': Name@82) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    _functions('protectedFinal': Name@83) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    _functions('protectedMutable': Name@84) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    _functions('publicFinal': Name@85) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    _functions('publicMutable': Name@86) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('Any': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('Char': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('Double': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('String': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('Throwable': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('invoke': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('privateFinal': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('privateMutable': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('protectedFinal': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('protectedMutable': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('publicFinal': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('publicMutable': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@226
+    classes('Any': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@226
+    classes('Char': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@226
+    classes('Double': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@226
+    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@226
+    classes('Throwable': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@226
+    classes('invoke': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@226
+    classes('privateFinal': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@226
+    classes('privateMutable': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@226
+    classes('protectedFinal': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@226
+    classes('protectedMutable': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@226
+    classes('publicFinal': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@226
+    classes('publicMutable': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@226
     deserializedPackageScope = DeserializedPackageMemberScope@227 // through LazyPackageFragmentScopeForJavaPackage@226
-    functions('invoke': Name@77) = EmptyList@78[empty] // through DeserializedPackageMemberScope@227
-    functions('privateFinal': Name@81) = EmptyList@78[empty] // through DeserializedPackageMemberScope@227
-    functions('privateMutable': Name@82) = EmptyList@78[empty] // through DeserializedPackageMemberScope@227
-    functions('protectedFinal': Name@83) = EmptyList@78[empty] // through DeserializedPackageMemberScope@227
-    functions('protectedMutable': Name@84) = EmptyList@78[empty] // through DeserializedPackageMemberScope@227
-    functions('publicFinal': Name@85) = EmptyList@78[empty] // through DeserializedPackageMemberScope@227
-    functions('publicMutable': Name@86) = EmptyList@78[empty] // through DeserializedPackageMemberScope@227
+    functions('invoke': Name@79) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
+    functions('invoke': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@226
+    functions('privateFinal': Name@82) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
+    functions('privateFinal': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@226
+    functions('privateMutable': Name@83) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
+    functions('privateMutable': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@226
+    functions('protectedFinal': Name@84) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
+    functions('protectedFinal': Name@84) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@226
+    functions('protectedMutable': Name@85) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
+    functions('protectedMutable': Name@85) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@226
+    functions('publicFinal': Name@86) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
+    functions('publicFinal': Name@86) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@226
+    functions('publicMutable': Name@87) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
+    functions('publicMutable': Name@87) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@226
     memberIndex = computeMemberIndex$1@228 // through LazyPackageFragmentScopeForJavaPackage@226
     membersProtos = HashMap@229 // through DeserializedPackageMemberScope@227
-    properties('privateFinal': Name@81) = EmptyList@78[empty] // through DeserializedPackageMemberScope@227
-    properties('privateMutable': Name@82) = EmptyList@78[empty] // through DeserializedPackageMemberScope@227
-    properties('protectedFinal': Name@83) = EmptyList@78[empty] // through DeserializedPackageMemberScope@227
-    properties('protectedMutable': Name@84) = EmptyList@78[empty] // through DeserializedPackageMemberScope@227
-    properties('publicFinal': Name@85) = EmptyList@78[empty] // through DeserializedPackageMemberScope@227
-    properties('publicMutable': Name@86) = EmptyList@78[empty] // through DeserializedPackageMemberScope@227
+    properties('privateFinal': Name@82) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
+    properties('privateMutable': Name@83) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
+    properties('protectedFinal': Name@84) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
+    properties('protectedMutable': Name@85) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
+    properties('publicFinal': Name@86) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
+    properties('publicMutable': Name@87) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
 }
 
 LazyJavaPackageFragment@154['java'] {
-    _functions('lang': Name@230) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@231
-    classes('lang': Name@232) = null // through LazyPackageFragmentScopeForJavaPackage@231
-    deserializedPackageScope = Empty@224 // through LazyPackageFragmentScopeForJavaPackage@231
+    classes('lang': Name@230) = null // through LazyPackageFragmentScopeForJavaPackage@231
+    deserializedPackageScope = Empty@222 // through LazyPackageFragmentScopeForJavaPackage@231
+    functions('lang': Name@232) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@231
     memberIndex = computeMemberIndex$1@233 // through LazyPackageFragmentScopeForJavaPackage@231
 }
 
 LazyJavaPackageFragment@192['jvm'] {
-    _functions('invoke': Name@77) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    _functions('privateFinal': Name@81) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    _functions('privateMutable': Name@82) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    _functions('protectedFinal': Name@83) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    _functions('protectedMutable': Name@84) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    _functions('publicFinal': Name@85) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    _functions('publicMutable': Name@86) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('Any': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('Char': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('Double': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('String': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('Throwable': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('invoke': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('privateFinal': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('privateMutable': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('protectedFinal': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('protectedMutable': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('publicFinal': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('publicMutable': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    deserializedPackageScope = Empty@224 // through LazyPackageFragmentScopeForJavaPackage@234
+    classes('Any': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@234
+    classes('Char': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@234
+    classes('Double': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@234
+    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@234
+    classes('Throwable': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@234
+    classes('invoke': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@234
+    classes('privateFinal': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@234
+    classes('privateMutable': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@234
+    classes('protectedFinal': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@234
+    classes('protectedMutable': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@234
+    classes('publicFinal': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@234
+    classes('publicMutable': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@234
+    deserializedPackageScope = Empty@222 // through LazyPackageFragmentScopeForJavaPackage@234
+    functions('invoke': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@234
+    functions('privateFinal': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@234
+    functions('privateMutable': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@234
+    functions('protectedFinal': Name@84) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@234
+    functions('protectedMutable': Name@85) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@234
+    functions('publicFinal': Name@86) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@234
+    functions('publicMutable': Name@87) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@234
     memberIndex = computeMemberIndex$1@235 // through LazyPackageFragmentScopeForJavaPackage@234
 }
 
 LazyJavaPackageFragment@168['kotlin'] {
-    _functions('invoke': Name@77) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@236
-    _functions('io': Name@237) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@236
-    _functions('jvm': Name@238) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@236
-    _functions('privateFinal': Name@81) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@236
-    _functions('privateMutable': Name@82) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@236
-    _functions('protectedFinal': Name@83) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@236
-    _functions('protectedMutable': Name@84) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@236
-    _functions('publicFinal': Name@85) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@236
-    _functions('publicMutable': Name@86) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@236
-    _functions('reflect': Name@239) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('Any': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('Char': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('Double': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('String': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('Throwable': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('invoke': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('io': Name@241) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('jvm': Name@242) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('privateFinal': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('privateMutable': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('protectedFinal': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('protectedMutable': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('publicFinal': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('publicMutable': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('reflect': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    deserializedPackageScope = DeserializedPackageMemberScope@244 // through LazyPackageFragmentScopeForJavaPackage@236
-    functions('invoke': Name@77) = EmptyList@78[empty] // through DeserializedPackageMemberScope@244
-    functions('io': Name@237) = EmptyList@78[empty] // through DeserializedPackageMemberScope@244
-    functions('jvm': Name@238) = EmptyList@78[empty] // through DeserializedPackageMemberScope@244
-    functions('privateFinal': Name@81) = EmptyList@78[empty] // through DeserializedPackageMemberScope@244
-    functions('privateMutable': Name@82) = EmptyList@78[empty] // through DeserializedPackageMemberScope@244
-    functions('protectedFinal': Name@83) = EmptyList@78[empty] // through DeserializedPackageMemberScope@244
-    functions('protectedMutable': Name@84) = EmptyList@78[empty] // through DeserializedPackageMemberScope@244
-    functions('publicFinal': Name@85) = EmptyList@78[empty] // through DeserializedPackageMemberScope@244
-    functions('publicMutable': Name@86) = EmptyList@78[empty] // through DeserializedPackageMemberScope@244
-    functions('reflect': Name@239) = EmptyList@78[empty] // through DeserializedPackageMemberScope@244
-    memberIndex = computeMemberIndex$1@245 // through LazyPackageFragmentScopeForJavaPackage@236
-    membersProtos = HashMap@246 // through DeserializedPackageMemberScope@244
-    properties('io': Name@237) = EmptyList@78[empty] // through DeserializedPackageMemberScope@244
-    properties('jvm': Name@238) = EmptyList@78[empty] // through DeserializedPackageMemberScope@244
-    properties('privateFinal': Name@81) = EmptyList@78[empty] // through DeserializedPackageMemberScope@244
-    properties('privateMutable': Name@82) = EmptyList@78[empty] // through DeserializedPackageMemberScope@244
-    properties('protectedFinal': Name@83) = EmptyList@78[empty] // through DeserializedPackageMemberScope@244
-    properties('protectedMutable': Name@84) = EmptyList@78[empty] // through DeserializedPackageMemberScope@244
-    properties('publicFinal': Name@85) = EmptyList@78[empty] // through DeserializedPackageMemberScope@244
-    properties('publicMutable': Name@86) = EmptyList@78[empty] // through DeserializedPackageMemberScope@244
-    properties('reflect': Name@239) = EmptyList@78[empty] // through DeserializedPackageMemberScope@244
+    classes('Any': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@237
+    classes('Char': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@237
+    classes('Double': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@237
+    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@237
+    classes('Throwable': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@237
+    classes('invoke': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@237
+    classes('io': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@237
+    classes('jvm': Name@239) = null // through LazyPackageFragmentScopeForJavaPackage@237
+    classes('privateFinal': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@237
+    classes('privateMutable': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@237
+    classes('protectedFinal': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@237
+    classes('protectedMutable': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@237
+    classes('publicFinal': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@237
+    classes('publicMutable': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@237
+    classes('reflect': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@237
+    deserializedPackageScope = DeserializedPackageMemberScope@241 // through LazyPackageFragmentScopeForJavaPackage@237
+    functions('invoke': Name@79) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
+    functions('invoke': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@237
+    functions('io': Name@242) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
+    functions('io': Name@242) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@237
+    functions('jvm': Name@243) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
+    functions('jvm': Name@243) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@237
+    functions('privateFinal': Name@82) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
+    functions('privateFinal': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@237
+    functions('privateMutable': Name@83) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
+    functions('privateMutable': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@237
+    functions('protectedFinal': Name@84) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
+    functions('protectedFinal': Name@84) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@237
+    functions('protectedMutable': Name@85) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
+    functions('protectedMutable': Name@85) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@237
+    functions('publicFinal': Name@86) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
+    functions('publicFinal': Name@86) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@237
+    functions('publicMutable': Name@87) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
+    functions('publicMutable': Name@87) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@237
+    functions('reflect': Name@244) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
+    functions('reflect': Name@244) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@237
+    memberIndex = computeMemberIndex$1@245 // through LazyPackageFragmentScopeForJavaPackage@237
+    membersProtos = HashMap@246 // through DeserializedPackageMemberScope@241
+    properties('io': Name@242) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
+    properties('jvm': Name@243) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
+    properties('privateFinal': Name@82) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
+    properties('privateMutable': Name@83) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
+    properties('protectedFinal': Name@84) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
+    properties('protectedMutable': Name@85) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
+    properties('publicFinal': Name@86) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
+    properties('publicMutable': Name@87) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
+    properties('reflect': Name@244) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
 }
 
 LazyJavaPackageFragment@156['lang'] {
-    _functions('invoke': Name@77) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@247
-    _functions('privateFinal': Name@81) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@247
-    _functions('privateMutable': Name@82) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@247
-    _functions('protectedFinal': Name@83) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@247
-    _functions('protectedMutable': Name@84) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@247
-    _functions('publicFinal': Name@85) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@247
-    _functions('publicMutable': Name@86) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@247
-    classes('invoke': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@247
-    classes('privateFinal': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@247
-    classes('privateMutable': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@247
-    classes('protectedFinal': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@247
-    classes('protectedMutable': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@247
-    classes('publicFinal': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@247
-    classes('publicMutable': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@247
-    deserializedPackageScope = Empty@224 // through LazyPackageFragmentScopeForJavaPackage@247
+    classes('invoke': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@247
+    classes('privateFinal': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@247
+    classes('privateMutable': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@247
+    classes('protectedFinal': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@247
+    classes('protectedMutable': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@247
+    classes('publicFinal': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@247
+    classes('publicMutable': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@247
+    deserializedPackageScope = Empty@222 // through LazyPackageFragmentScopeForJavaPackage@247
+    functions('invoke': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@247
+    functions('privateFinal': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@247
+    functions('privateMutable': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@247
+    functions('protectedFinal': Name@84) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@247
+    functions('protectedMutable': Name@85) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@247
+    functions('publicFinal': Name@86) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@247
+    functions('publicMutable': Name@87) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@247
     memberIndex = computeMemberIndex$1@248 // through LazyPackageFragmentScopeForJavaPackage@247
 }
 
 LazyJavaPackageFragment@19['reflect'] {
-    _functions('invoke': Name@77) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@249
-    _functions('privateFinal': Name@81) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@249
-    _functions('privateMutable': Name@82) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@249
-    _functions('protectedFinal': Name@83) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@249
-    _functions('protectedMutable': Name@84) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@249
-    _functions('publicFinal': Name@85) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@249
-    _functions('publicMutable': Name@86) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('Any': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('Char': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('Double': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@249
+    classes('Any': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@249
+    classes('Char': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@249
+    classes('Double': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@249
     classes('KCallable': Name@250) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@249
     classes('KMutableProperty': Name@251) = DeserializedClassDescriptor@4['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('KMutableTopLevelProperty': Name@220) = DeserializedClassDescriptor@6['KMutableTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@249
+    classes('KMutableTopLevelProperty': Name@218) = DeserializedClassDescriptor@6['KMutableTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@249
     classes('KMutableTopLevelVariable': Name@252) = DeserializedClassDescriptor@8['KMutableTopLevelVariable'] // through LazyPackageFragmentScopeForJavaPackage@249
     classes('KMutableVariable': Name@253) = DeserializedClassDescriptor@10['KMutableVariable'] // through LazyPackageFragmentScopeForJavaPackage@249
     classes('KProperty': Name@254) = DeserializedClassDescriptor@12['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('KTopLevelProperty': Name@222) = DeserializedClassDescriptor@14['KTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@249
+    classes('KTopLevelProperty': Name@220) = DeserializedClassDescriptor@14['KTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@249
     classes('KTopLevelVariable': Name@255) = DeserializedClassDescriptor@16['KTopLevelVariable'] // through LazyPackageFragmentScopeForJavaPackage@249
     classes('KVariable': Name@256) = DeserializedClassDescriptor@18['KVariable'] // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('String': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('Throwable': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('invoke': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('privateFinal': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('privateMutable': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('protectedFinal': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('protectedMutable': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('publicFinal': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('publicMutable': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    deserializedPackageScope = Empty@224 // through LazyPackageFragmentScopeForJavaPackage@249
+    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@249
+    classes('Throwable': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@249
+    classes('invoke': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@249
+    classes('privateFinal': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@249
+    classes('privateMutable': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@249
+    classes('protectedFinal': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@249
+    classes('protectedMutable': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@249
+    classes('publicFinal': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@249
+    classes('publicMutable': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@249
+    deserializedPackageScope = Empty@222 // through LazyPackageFragmentScopeForJavaPackage@249
+    functions('invoke': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@249
+    functions('privateFinal': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@249
+    functions('privateMutable': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@249
+    functions('protectedFinal': Name@84) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@249
+    functions('protectedMutable': Name@85) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@249
+    functions('publicFinal': Name@86) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@249
+    functions('publicMutable': Name@87) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@249
     memberIndex = computeMemberIndex$1@257 // through LazyPackageFragmentScopeForJavaPackage@249
 }
 

compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.lazy.log

@@ -1,107 +1,107 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('String': FqName@3) = null
-    _packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    _packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    _packageFragments('java.lang.String': FqName@8) = null
-    _packageFragments('kotlin': FqName@9) = LazyJavaPackageFragment@10['kotlin']
-    _packageFragments('kotlin.String': FqName@11) = null
-    _packageFragments('kotlin.io': FqName@12) = LazyJavaPackageFragment@13['io']
-    _packageFragments('kotlin.io.String': FqName@14) = null
-    _packageFragments('kotlin.jvm': FqName@15) = LazyJavaPackageFragment@16['jvm']
-    _packageFragments('kotlin.jvm.String': FqName@17) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('String': FqName@3) = null
+    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
+    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
+    packageFragments('java.lang.String': FqName@8) = null
+    packageFragments('kotlin': FqName@9) = LazyJavaPackageFragment@10['kotlin']
+    packageFragments('kotlin.String': FqName@11) = null
+    packageFragments('kotlin.io': FqName@12) = LazyJavaPackageFragment@13['io']
+    packageFragments('kotlin.io.String': FqName@14) = null
+    packageFragments('kotlin.jvm': FqName@15) = LazyJavaPackageFragment@16['jvm']
+    packageFragments('kotlin.jvm.String': FqName@17) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    _functions('invoke': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    _functions('lambda': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    _functions('local': Name@22) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    _functions('param': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('lambda': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('local': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('param': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    classes('lambda': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    classes('local': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    classes('param': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('invoke': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('lambda': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('local': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('param': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
 LazyJavaPackageFragment@13['io'] {
-    _functions('invoke': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('lambda': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('local': Name@22) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('param': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('invoke': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('lambda': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('local': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('param': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@27
     deserializedPackageScope = DeserializedPackageMemberScope@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('invoke': Name@18) = EmptyList@19[empty] // through DeserializedPackageMemberScope@28
-    functions('lambda': Name@21) = EmptyList@19[empty] // through DeserializedPackageMemberScope@28
-    functions('local': Name@22) = EmptyList@19[empty] // through DeserializedPackageMemberScope@28
-    functions('param': Name@23) = EmptyList@19[empty] // through DeserializedPackageMemberScope@28
+    functions('invoke': Name@20) = EmptyList@25[empty] // through DeserializedPackageMemberScope@28
+    functions('invoke': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('lambda': Name@21) = EmptyList@25[empty] // through DeserializedPackageMemberScope@28
+    functions('lambda': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('local': Name@22) = EmptyList@25[empty] // through DeserializedPackageMemberScope@28
+    functions('local': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('param': Name@23) = EmptyList@25[empty] // through DeserializedPackageMemberScope@28
+    functions('param': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
     membersProtos = HashMap@30 // through DeserializedPackageMemberScope@28
 }
 
 LazyJavaPackageFragment@5['java'] {
-    _functions('lang': Name@31) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('lang': Name@33) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
 }
 
 LazyJavaPackageFragment@16['jvm'] {
-    _functions('invoke': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    _functions('lambda': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    _functions('local': Name@22) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    _functions('param': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('invoke': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@35
     classes('lambda': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@35
     classes('local': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@35
     classes('param': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('invoke': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('lambda': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('local': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('param': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@35
     memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
 }
 
 LazyJavaPackageFragment@10['kotlin'] {
-    _functions('invoke': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('io': Name@38) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('jvm': Name@39) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('lambda': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('local': Name@22) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('param': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('invoke': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('io': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('jvm': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('io': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('jvm': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@37
     classes('lambda': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@37
     classes('local': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@37
     classes('param': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = DeserializedPackageMemberScope@42 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('invoke': Name@18) = EmptyList@19[empty] // through DeserializedPackageMemberScope@42
-    functions('io': Name@38) = EmptyList@19[empty] // through DeserializedPackageMemberScope@42
-    functions('jvm': Name@39) = EmptyList@19[empty] // through DeserializedPackageMemberScope@42
-    functions('lambda': Name@21) = EmptyList@19[empty] // through DeserializedPackageMemberScope@42
-    functions('local': Name@22) = EmptyList@19[empty] // through DeserializedPackageMemberScope@42
-    functions('param': Name@23) = EmptyList@19[empty] // through DeserializedPackageMemberScope@42
+    deserializedPackageScope = DeserializedPackageMemberScope@40 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('invoke': Name@20) = EmptyList@25[empty] // through DeserializedPackageMemberScope@40
+    functions('invoke': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('io': Name@41) = EmptyList@25[empty] // through DeserializedPackageMemberScope@40
+    functions('io': Name@41) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('jvm': Name@42) = EmptyList@25[empty] // through DeserializedPackageMemberScope@40
+    functions('jvm': Name@42) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('lambda': Name@21) = EmptyList@25[empty] // through DeserializedPackageMemberScope@40
+    functions('lambda': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('local': Name@22) = EmptyList@25[empty] // through DeserializedPackageMemberScope@40
+    functions('local': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('param': Name@23) = EmptyList@25[empty] // through DeserializedPackageMemberScope@40
+    functions('param': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@37
-    membersProtos = HashMap@44 // through DeserializedPackageMemberScope@42
-    properties('io': Name@38) = EmptyList@19[empty] // through DeserializedPackageMemberScope@42
-    properties('jvm': Name@39) = EmptyList@19[empty] // through DeserializedPackageMemberScope@42
+    membersProtos = HashMap@44 // through DeserializedPackageMemberScope@40
+    properties('io': Name@41) = EmptyList@25[empty] // through DeserializedPackageMemberScope@40
+    properties('jvm': Name@42) = EmptyList@25[empty] // through DeserializedPackageMemberScope@40
 }
 
 LazyJavaPackageFragment@7['lang'] {
-    _functions('invoke': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    _functions('lambda': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    _functions('local': Name@22) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    _functions('param': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('invoke': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('lambda': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('local': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('param': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@45
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('invoke': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('lambda': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('local': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('param': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@45
     memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
 }

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

@@ -104,57 +104,57 @@ DeserializedTypeParameterDescriptor@68['T'] {
 }
 
 DeserializedType@73['R in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@54
+    constructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 DeserializedType@74['R in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@49
+    constructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
 DeserializedType@75['R in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@49
+    constructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
 DeserializedType@76['T in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@65
+    constructor = AbstractLazyTypeParameterDescriptor$1@70
 }
 
 DeserializedType@77['T in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@70
+    constructor = AbstractLazyTypeParameterDescriptor$1@65
 }
 
 DeserializedType@78['T in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@70
-}
-
-DeserializedType@79['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@80
-    memberScope = DeserializedClassMemberScope@81
-}
-
-DeserializedType@56['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@80
-    memberScope = DeserializedClassMemberScope@81
-}
-
-DeserializedType@51['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@80
-    memberScope = DeserializedClassMemberScope@81
-}
-
-DeserializedType@72['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@80
-    memberScope = DeserializedClassMemberScope@81
+    constructor = AbstractLazyTypeParameterDescriptor$1@65
 }
 
 DeserializedType@67['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@80
-    memberScope = DeserializedClassMemberScope@81
+    constructor = DeserializedClassTypeConstructor@79
+    memberScope = DeserializedClassMemberScope@80
+}
+
+DeserializedType@56['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@79
+    memberScope = DeserializedClassMemberScope@80
+}
+
+DeserializedType@81['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@79
+    memberScope = DeserializedClassMemberScope@80
 }
 
 DeserializedType@82['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@80
-    memberScope = DeserializedClassMemberScope@81
+    constructor = DeserializedClassTypeConstructor@79
+    memberScope = DeserializedClassMemberScope@80
+}
+
+DeserializedType@51['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@79
+    memberScope = DeserializedClassMemberScope@80
+}
+
+DeserializedType@72['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@79
+    memberScope = DeserializedClassMemberScope@80
 }
 
 DeserializedType@83['kotlin.String'] {
@@ -192,108 +192,108 @@ DeserializedType@99['kotlin.reflect.KProperty'] {
 }
 
 LazyJavaPackageFragmentProvider@101 {
-    _packageFragments('<root>': FqName@102) = LazyJavaPackageFragment@103['<root>']
-    _packageFragments('A': FqName@104) = null
-    _packageFragments('KMemberProperty': FqName@105) = null
-    _packageFragments('KMutableMemberProperty': FqName@106) = null
-    _packageFragments('String': FqName@107) = null
-    _packageFragments('Unit': FqName@108) = null
-    _packageFragments('java': FqName@109) = LazyJavaPackageFragment@110['java']
-    _packageFragments('java.lang': FqName@111) = LazyJavaPackageFragment@112['lang']
-    _packageFragments('java.lang.A': FqName@113) = null
-    _packageFragments('java.lang.KMemberProperty': FqName@114) = null
-    _packageFragments('java.lang.KMutableMemberProperty': FqName@115) = null
-    _packageFragments('java.lang.String': FqName@116) = null
-    _packageFragments('java.lang.Unit': FqName@117) = null
-    _packageFragments('kotlin': FqName@118) = LazyJavaPackageFragment@38['kotlin']
-    _packageFragments('kotlin.A': FqName@119) = null
-    _packageFragments('kotlin.KMemberProperty': FqName@120) = null
-    _packageFragments('kotlin.KMutableMemberProperty': FqName@121) = null
-    _packageFragments('kotlin.String': FqName@122) = null
-    _packageFragments('kotlin.Unit': FqName@123) = null
-    _packageFragments('kotlin.io': FqName@124) = LazyJavaPackageFragment@125['io']
-    _packageFragments('kotlin.io.A': FqName@126) = null
-    _packageFragments('kotlin.io.KMemberProperty': FqName@127) = null
-    _packageFragments('kotlin.io.KMutableMemberProperty': FqName@128) = null
-    _packageFragments('kotlin.io.String': FqName@129) = null
-    _packageFragments('kotlin.io.Unit': FqName@130) = null
-    _packageFragments('kotlin.jvm': FqName@131) = LazyJavaPackageFragment@132['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@133) = null
-    _packageFragments('kotlin.jvm.KMemberProperty': FqName@134) = null
-    _packageFragments('kotlin.jvm.KMutableMemberProperty': FqName@135) = null
-    _packageFragments('kotlin.jvm.String': FqName@136) = null
-    _packageFragments('kotlin.jvm.Unit': FqName@137) = null
-    _packageFragments('kotlin.reflect': FqName@138) = LazyJavaPackageFragment@13['reflect']
-    _packageFragments('kotlin.reflect.A': FqName@139) = null
-    _packageFragments('kotlin.reflect.KMemberProperty': FqName@140) = null
-    _packageFragments('kotlin.reflect.KMutableMemberProperty': FqName@141) = null
-    _packageFragments('kotlin.reflect.String': FqName@142) = null
-    _packageFragments('kotlin.reflect.Unit': FqName@143) = null
+    packageFragments('<root>': FqName@102) = LazyJavaPackageFragment@103['<root>']
+    packageFragments('A': FqName@104) = null
+    packageFragments('KMemberProperty': FqName@105) = null
+    packageFragments('KMutableMemberProperty': FqName@106) = null
+    packageFragments('String': FqName@107) = null
+    packageFragments('Unit': FqName@108) = null
+    packageFragments('java': FqName@109) = LazyJavaPackageFragment@110['java']
+    packageFragments('java.lang': FqName@111) = LazyJavaPackageFragment@112['lang']
+    packageFragments('java.lang.A': FqName@113) = null
+    packageFragments('java.lang.KMemberProperty': FqName@114) = null
+    packageFragments('java.lang.KMutableMemberProperty': FqName@115) = null
+    packageFragments('java.lang.String': FqName@116) = null
+    packageFragments('java.lang.Unit': FqName@117) = null
+    packageFragments('kotlin': FqName@118) = LazyJavaPackageFragment@38['kotlin']
+    packageFragments('kotlin.A': FqName@119) = null
+    packageFragments('kotlin.KMemberProperty': FqName@120) = null
+    packageFragments('kotlin.KMutableMemberProperty': FqName@121) = null
+    packageFragments('kotlin.String': FqName@122) = null
+    packageFragments('kotlin.Unit': FqName@123) = null
+    packageFragments('kotlin.io': FqName@124) = LazyJavaPackageFragment@125['io']
+    packageFragments('kotlin.io.A': FqName@126) = null
+    packageFragments('kotlin.io.KMemberProperty': FqName@127) = null
+    packageFragments('kotlin.io.KMutableMemberProperty': FqName@128) = null
+    packageFragments('kotlin.io.String': FqName@129) = null
+    packageFragments('kotlin.io.Unit': FqName@130) = null
+    packageFragments('kotlin.jvm': FqName@131) = LazyJavaPackageFragment@132['jvm']
+    packageFragments('kotlin.jvm.A': FqName@133) = null
+    packageFragments('kotlin.jvm.KMemberProperty': FqName@134) = null
+    packageFragments('kotlin.jvm.KMutableMemberProperty': FqName@135) = null
+    packageFragments('kotlin.jvm.String': FqName@136) = null
+    packageFragments('kotlin.jvm.Unit': FqName@137) = null
+    packageFragments('kotlin.reflect': FqName@138) = LazyJavaPackageFragment@13['reflect']
+    packageFragments('kotlin.reflect.A': FqName@139) = null
+    packageFragments('kotlin.reflect.KMemberProperty': FqName@140) = null
+    packageFragments('kotlin.reflect.KMutableMemberProperty': FqName@141) = null
+    packageFragments('kotlin.reflect.String': FqName@142) = null
+    packageFragments('kotlin.reflect.Unit': FqName@143) = null
 }
 
 LazyJavaPackageFragment@103['<root>'] {
-    _functions('A': Name@144) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    _functions('bar': Name@146) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    _functions('foo': Name@147) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    _functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    _functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    _functions('kotlin': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    _functions('self': Name@149) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    _functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    _functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@145
     classes('A': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('KMemberProperty': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('KMutableMemberProperty': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('Unit': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('bar': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('foo': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@145
+    classes('KMemberProperty': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@145
+    classes('KMutableMemberProperty': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@145
+    classes('String': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@145
+    classes('Unit': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@145
+    classes('bar': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@145
+    classes('foo': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@145
     classes('get': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@145
     classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('kotlin': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('self': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@145
+    classes('kotlin': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@145
+    classes('self': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@145
     classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@145
     classes('toString': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    deserializedPackageScope = Empty@155 // through LazyPackageFragmentScopeForJavaPackage@145
+    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@145
+    functions('A': Name@144) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@145
+    functions('bar': Name@150) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@145
+    functions('foo': Name@151) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@145
+    functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@145
+    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@145
+    functions('kotlin': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@145
+    functions('self': Name@153) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@145
+    functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@145
+    functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@145
     memberIndex = computeMemberIndex$1@156 // through LazyPackageFragmentScopeForJavaPackage@145
 }
 
 LazyJavaPackageFragment@125['io'] {
-    _functions('A': Name@144) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    _functions('bar': Name@146) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    _functions('foo': Name@147) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    _functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    _functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    _functions('self': Name@149) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    _functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    _functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@157
     classes('A': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('Unit': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('bar': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('foo': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@157
+    classes('String': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@157
+    classes('Unit': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@157
+    classes('bar': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@157
+    classes('foo': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@157
     classes('get': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@157
     classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('self': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@157
+    classes('self': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@157
     classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@157
     classes('toString': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@157
     deserializedPackageScope = DeserializedPackageMemberScope@158 // through LazyPackageFragmentScopeForJavaPackage@157
     functions('A': Name@144) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
-    functions('bar': Name@146) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
-    functions('foo': Name@147) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
+    functions('A': Name@144) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@157
+    functions('bar': Name@150) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
+    functions('bar': Name@150) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@157
+    functions('foo': Name@151) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
+    functions('foo': Name@151) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@157
     functions('get': Name@14) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
+    functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@157
     functions('invoke': Name@40) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
-    functions('self': Name@149) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
+    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@157
+    functions('self': Name@153) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
+    functions('self': Name@153) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@157
     functions('set': Name@17) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
+    functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@157
     functions('toString': Name@42) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
+    functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@157
     memberIndex = computeMemberIndex$1@159 // through LazyPackageFragmentScopeForJavaPackage@157
     membersProtos = HashMap@160 // through DeserializedPackageMemberScope@158
     properties('A': Name@144) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
     properties('Unit': Name@161) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
-    properties('bar': Name@146) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
-    properties('foo': Name@147) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
+    properties('bar': Name@150) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
+    properties('foo': Name@151) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
     properties('get': Name@14) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
-    properties('self': Name@149) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
+    properties('self': Name@153) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
     properties('set': Name@17) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
     properties('toString': Name@42) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
     properties('x': Name@162) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
@@ -302,137 +302,137 @@ LazyJavaPackageFragment@125['io'] {
 }
 
 LazyJavaPackageFragment@110['java'] {
-    _functions('lang': Name@165) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('lang': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    deserializedPackageScope = Empty@155 // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('lang': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@166
+    functions('lang': Name@167) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@166
     memberIndex = computeMemberIndex$1@168 // through LazyPackageFragmentScopeForJavaPackage@166
 }
 
 LazyJavaPackageFragment@132['jvm'] {
-    _functions('A': Name@144) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('bar': Name@146) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('foo': Name@147) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('self': Name@149) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@169
     classes('A': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('Unit': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('bar': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('foo': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('String': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('Unit': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('bar': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('foo': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@169
     classes('get': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@169
     classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('self': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('self': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@169
     classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@169
     classes('toString': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    deserializedPackageScope = Empty@155 // through LazyPackageFragmentScopeForJavaPackage@169
+    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('A': Name@144) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('bar': Name@150) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('foo': Name@151) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('self': Name@153) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@169
     memberIndex = computeMemberIndex$1@170 // through LazyPackageFragmentScopeForJavaPackage@169
 }
 
 LazyJavaPackageFragment@38['kotlin'] {
-    _functions('A': Name@144) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    _functions('bar': Name@146) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    _functions('foo': Name@147) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    _functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    _functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    _functions('io': Name@172) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    _functions('jvm': Name@173) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    _functions('reflect': Name@174) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    _functions('self': Name@149) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    _functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    _functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
     classes('A': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('Any': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('Unit': Name@153) = DeserializedClassDescriptor@12['Unit'] // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('bar': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('foo': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@171
+    classes('Any': Name@172) = null // through LazyPackageFragmentScopeForJavaPackage@171
+    classes('String': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@171
+    classes('Unit': Name@149) = DeserializedClassDescriptor@12['Unit'] // through LazyPackageFragmentScopeForJavaPackage@171
+    classes('bar': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@171
+    classes('foo': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@171
     classes('get': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@171
     classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('io': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('jvm': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('reflect': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('self': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@171
+    classes('io': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@171
+    classes('jvm': Name@174) = null // through LazyPackageFragmentScopeForJavaPackage@171
+    classes('reflect': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@171
+    classes('self': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@171
     classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@171
     classes('toString': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    deserializedPackageScope = DeserializedPackageMemberScope@179 // through LazyPackageFragmentScopeForJavaPackage@171
-    functions('A': Name@144) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    functions('bar': Name@146) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    functions('foo': Name@147) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    functions('get': Name@14) = ArrayList@180[2] { DeserializedSimpleFunctionDescriptor@181['get'], DeserializedSimpleFunctionDescriptor@182['get'] } // through DeserializedPackageMemberScope@179
-    functions('invoke': Name@40) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    functions('io': Name@172) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    functions('jvm': Name@173) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    functions('reflect': Name@174) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    functions('self': Name@149) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    functions('set': Name@17) = ArrayList@183[1] { DeserializedSimpleFunctionDescriptor@184['set'] } // through DeserializedPackageMemberScope@179
-    functions('toString': Name@42) = ArrayList@185[3] { DeserializedSimpleFunctionDescriptor@186['toString'], DeserializedSimpleFunctionDescriptor@187['toString'], DeserializedSimpleFunctionDescriptor@188['toString'] } // through DeserializedPackageMemberScope@179
+    deserializedPackageScope = DeserializedPackageMemberScope@176 // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('A': Name@144) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    functions('A': Name@144) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('bar': Name@150) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    functions('bar': Name@150) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('foo': Name@151) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    functions('foo': Name@151) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('get': Name@14) = ArrayList@177[2] { DeserializedSimpleFunctionDescriptor@178['get'], DeserializedSimpleFunctionDescriptor@179['get'] } // through DeserializedPackageMemberScope@176
+    functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('invoke': Name@40) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('io': Name@180) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    functions('io': Name@180) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('jvm': Name@181) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    functions('jvm': Name@181) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('reflect': Name@182) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    functions('reflect': Name@182) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('self': Name@153) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    functions('self': Name@153) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('set': Name@17) = ArrayList@183[1] { DeserializedSimpleFunctionDescriptor@184['set'] } // through DeserializedPackageMemberScope@176
+    functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('toString': Name@42) = ArrayList@185[3] { DeserializedSimpleFunctionDescriptor@186['toString'], DeserializedSimpleFunctionDescriptor@187['toString'], DeserializedSimpleFunctionDescriptor@188['toString'] } // through DeserializedPackageMemberScope@176
+    functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@171
     memberIndex = computeMemberIndex$1@189 // through LazyPackageFragmentScopeForJavaPackage@171
-    membersProtos = HashMap@190 // through DeserializedPackageMemberScope@179
-    properties('A': Name@144) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    properties('Unit': Name@161) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    properties('bar': Name@146) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    properties('foo': Name@147) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    properties('get': Name@14) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    properties('io': Name@172) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    properties('jvm': Name@173) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    properties('reflect': Name@174) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    properties('self': Name@149) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    properties('set': Name@17) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    properties('toString': Name@42) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    properties('x': Name@162) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    properties('y': Name@163) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
-    properties('z': Name@164) = EmptyList@15[empty] // through DeserializedPackageMemberScope@179
+    membersProtos = HashMap@190 // through DeserializedPackageMemberScope@176
+    properties('A': Name@144) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    properties('Unit': Name@161) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    properties('bar': Name@150) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    properties('foo': Name@151) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    properties('get': Name@14) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    properties('io': Name@180) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    properties('jvm': Name@181) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    properties('reflect': Name@182) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    properties('self': Name@153) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    properties('set': Name@17) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    properties('toString': Name@42) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    properties('x': Name@162) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    properties('y': Name@163) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
+    properties('z': Name@164) = EmptyList@15[empty] // through DeserializedPackageMemberScope@176
 }
 
 LazyJavaPackageFragment@112['lang'] {
-    _functions('A': Name@144) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    _functions('bar': Name@146) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    _functions('foo': Name@147) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    _functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    _functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    _functions('self': Name@149) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    _functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    _functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@191
     classes('A': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('bar': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('foo': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('bar': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('foo': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@191
     classes('get': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@191
     classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('self': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('self': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@191
     classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@191
     classes('toString': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    deserializedPackageScope = Empty@155 // through LazyPackageFragmentScopeForJavaPackage@191
+    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('A': Name@144) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('bar': Name@150) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('foo': Name@151) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('self': Name@153) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@191
     memberIndex = computeMemberIndex$1@192 // through LazyPackageFragmentScopeForJavaPackage@191
 }
 
 LazyJavaPackageFragment@13['reflect'] {
-    _functions('A': Name@144) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    _functions('bar': Name@146) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    _functions('foo': Name@147) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    _functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    _functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    _functions('self': Name@149) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    _functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    _functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
     classes('A': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@193
     classes('KCallable': Name@194) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@193
     classes('KMemberProperty': Name@195) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@193
     classes('KMutableMemberProperty': Name@196) = DeserializedClassDescriptor@6['KMutableMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@193
     classes('KMutableProperty': Name@197) = DeserializedClassDescriptor@8['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@193
     classes('KProperty': Name@198) = DeserializedClassDescriptor@10['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('Unit': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('bar': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('foo': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@193
+    classes('String': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@193
+    classes('Unit': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@193
+    classes('bar': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@193
+    classes('foo': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@193
     classes('get': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@193
     classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('self': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@193
+    classes('self': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@193
     classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@193
     classes('toString': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    deserializedPackageScope = Empty@155 // through LazyPackageFragmentScopeForJavaPackage@193
+    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@193
+    functions('A': Name@144) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
+    functions('bar': Name@150) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
+    functions('foo': Name@151) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
+    functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
+    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
+    functions('self': Name@153) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
+    functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
+    functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
     memberIndex = computeMemberIndex$1@199 // through LazyPackageFragmentScopeForJavaPackage@193
 }
 

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

@@ -119,15 +119,15 @@ DeserializedType@77['K in kotlin'] {
 }
 
 DeserializedType@78['R in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@53
+    constructor = AbstractLazyTypeParameterDescriptor$1@48
 }
 
 DeserializedType@79['R in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@48
+    constructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 DeserializedType@80['R in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@48
+    constructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 DeserializedType@81['T in kotlin.reflect.KMemberProperty'] {
@@ -154,7 +154,7 @@ DeserializedType@86['V in kotlin'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
-DeserializedType@55['kotlin.Any'] {
+DeserializedType@71['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@87
     memberScope = DeserializedClassMemberScope@88
 }
@@ -164,12 +164,12 @@ DeserializedType@50['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@88
 }
 
-DeserializedType@89['kotlin.Any'] {
+DeserializedType@55['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@87
     memberScope = DeserializedClassMemberScope@88
 }
 
-DeserializedType@45['kotlin.Any'] {
+DeserializedType@75['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@87
     memberScope = DeserializedClassMemberScope@88
 }
@@ -179,12 +179,12 @@ DeserializedType@66['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@88
 }
 
-DeserializedType@71['kotlin.Any'] {
+DeserializedType@45['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@87
     memberScope = DeserializedClassMemberScope@88
 }
 
-DeserializedType@75['kotlin.Any'] {
+DeserializedType@89['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@87
     memberScope = DeserializedClassMemberScope@88
 }
@@ -233,221 +233,221 @@ DeserializedType@111['kotlin.reflect.KProperty'] {
 }
 
 LazyJavaPackageFragmentProvider@113 {
-    _packageFragments('<root>': FqName@114) = LazyJavaPackageFragment@115['<root>']
-    _packageFragments('A': FqName@116) = null
-    _packageFragments('Int': FqName@117) = null
-    _packageFragments('KMemberProperty': FqName@118) = null
-    _packageFragments('KMutableMemberProperty': FqName@119) = null
-    _packageFragments('String': FqName@120) = null
-    _packageFragments('java': FqName@121) = LazyJavaPackageFragment@122['java']
-    _packageFragments('java.lang': FqName@123) = LazyJavaPackageFragment@124['lang']
-    _packageFragments('java.lang.A': FqName@125) = null
-    _packageFragments('java.lang.Int': FqName@126) = null
-    _packageFragments('java.lang.KMemberProperty': FqName@127) = null
-    _packageFragments('java.lang.KMutableMemberProperty': FqName@128) = null
-    _packageFragments('java.lang.String': FqName@129) = null
-    _packageFragments('kotlin': FqName@130) = LazyJavaPackageFragment@41['kotlin']
-    _packageFragments('kotlin.A': FqName@131) = null
-    _packageFragments('kotlin.Int': FqName@132) = null
-    _packageFragments('kotlin.KMemberProperty': FqName@133) = null
-    _packageFragments('kotlin.KMutableMemberProperty': FqName@134) = null
-    _packageFragments('kotlin.String': FqName@135) = null
-    _packageFragments('kotlin.io': FqName@136) = LazyJavaPackageFragment@137['io']
-    _packageFragments('kotlin.io.A': FqName@138) = null
-    _packageFragments('kotlin.io.Int': FqName@139) = null
-    _packageFragments('kotlin.io.KMemberProperty': FqName@140) = null
-    _packageFragments('kotlin.io.KMutableMemberProperty': FqName@141) = null
-    _packageFragments('kotlin.io.String': FqName@142) = null
-    _packageFragments('kotlin.jvm': FqName@143) = LazyJavaPackageFragment@144['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@145) = null
-    _packageFragments('kotlin.jvm.Int': FqName@146) = null
-    _packageFragments('kotlin.jvm.KMemberProperty': FqName@147) = null
-    _packageFragments('kotlin.jvm.KMutableMemberProperty': FqName@148) = null
-    _packageFragments('kotlin.jvm.String': FqName@149) = null
-    _packageFragments('kotlin.reflect': FqName@150) = LazyJavaPackageFragment@15['reflect']
-    _packageFragments('kotlin.reflect.A': FqName@151) = null
-    _packageFragments('kotlin.reflect.Int': FqName@152) = null
-    _packageFragments('kotlin.reflect.KMemberProperty': FqName@153) = null
-    _packageFragments('kotlin.reflect.KMutableMemberProperty': FqName@154) = null
-    _packageFragments('kotlin.reflect.String': FqName@155) = null
+    packageFragments('<root>': FqName@114) = LazyJavaPackageFragment@115['<root>']
+    packageFragments('A': FqName@116) = null
+    packageFragments('Int': FqName@117) = null
+    packageFragments('KMemberProperty': FqName@118) = null
+    packageFragments('KMutableMemberProperty': FqName@119) = null
+    packageFragments('String': FqName@120) = null
+    packageFragments('java': FqName@121) = LazyJavaPackageFragment@122['java']
+    packageFragments('java.lang': FqName@123) = LazyJavaPackageFragment@124['lang']
+    packageFragments('java.lang.A': FqName@125) = null
+    packageFragments('java.lang.Int': FqName@126) = null
+    packageFragments('java.lang.KMemberProperty': FqName@127) = null
+    packageFragments('java.lang.KMutableMemberProperty': FqName@128) = null
+    packageFragments('java.lang.String': FqName@129) = null
+    packageFragments('kotlin': FqName@130) = LazyJavaPackageFragment@41['kotlin']
+    packageFragments('kotlin.A': FqName@131) = null
+    packageFragments('kotlin.Int': FqName@132) = null
+    packageFragments('kotlin.KMemberProperty': FqName@133) = null
+    packageFragments('kotlin.KMutableMemberProperty': FqName@134) = null
+    packageFragments('kotlin.String': FqName@135) = null
+    packageFragments('kotlin.io': FqName@136) = LazyJavaPackageFragment@137['io']
+    packageFragments('kotlin.io.A': FqName@138) = null
+    packageFragments('kotlin.io.Int': FqName@139) = null
+    packageFragments('kotlin.io.KMemberProperty': FqName@140) = null
+    packageFragments('kotlin.io.KMutableMemberProperty': FqName@141) = null
+    packageFragments('kotlin.io.String': FqName@142) = null
+    packageFragments('kotlin.jvm': FqName@143) = LazyJavaPackageFragment@144['jvm']
+    packageFragments('kotlin.jvm.A': FqName@145) = null
+    packageFragments('kotlin.jvm.Int': FqName@146) = null
+    packageFragments('kotlin.jvm.KMemberProperty': FqName@147) = null
+    packageFragments('kotlin.jvm.KMutableMemberProperty': FqName@148) = null
+    packageFragments('kotlin.jvm.String': FqName@149) = null
+    packageFragments('kotlin.reflect': FqName@150) = LazyJavaPackageFragment@15['reflect']
+    packageFragments('kotlin.reflect.A': FqName@151) = null
+    packageFragments('kotlin.reflect.Int': FqName@152) = null
+    packageFragments('kotlin.reflect.KMemberProperty': FqName@153) = null
+    packageFragments('kotlin.reflect.KMutableMemberProperty': FqName@154) = null
+    packageFragments('kotlin.reflect.String': FqName@155) = null
 }
 
 LazyJavaPackageFragment@115['<root>'] {
-    _functions('A': Name@156) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    _functions('bar': Name@158) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    _functions('foo': Name@159) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    _functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    _functions('invoke': Name@160) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    _functions('kotlin': Name@161) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    _functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@157
     classes('A': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('Int': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('KMemberProperty': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('KMutableMemberProperty': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('String': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('bar': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('foo': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@157
+    classes('Int': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@157
+    classes('KMemberProperty': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@157
+    classes('KMutableMemberProperty': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@157
+    classes('String': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@157
+    classes('bar': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@157
+    classes('foo': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@157
     classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('invoke': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('kotlin': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@157
+    classes('invoke': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@157
+    classes('kotlin': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@157
     classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    deserializedPackageScope = Empty@167 // through LazyPackageFragmentScopeForJavaPackage@157
+    deserializedPackageScope = Empty@166 // through LazyPackageFragmentScopeForJavaPackage@157
+    functions('A': Name@156) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@157
+    functions('bar': Name@162) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@157
+    functions('foo': Name@163) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@157
+    functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@157
+    functions('invoke': Name@164) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@157
+    functions('kotlin': Name@167) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@157
+    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@157
     memberIndex = computeMemberIndex$1@168 // through LazyPackageFragmentScopeForJavaPackage@157
 }
 
 LazyJavaPackageFragment@137['io'] {
-    _functions('A': Name@156) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('bar': Name@158) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('foo': Name@159) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('invoke': Name@160) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@169
     classes('A': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('Int': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('String': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('bar': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('foo': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('Int': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('String': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('bar': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('foo': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@169
     classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('invoke': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('invoke': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@169
     classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@169
     deserializedPackageScope = DeserializedPackageMemberScope@170 // through LazyPackageFragmentScopeForJavaPackage@169
     functions('A': Name@156) = EmptyList@17[empty] // through DeserializedPackageMemberScope@170
-    functions('bar': Name@158) = EmptyList@17[empty] // through DeserializedPackageMemberScope@170
-    functions('foo': Name@159) = EmptyList@17[empty] // through DeserializedPackageMemberScope@170
+    functions('A': Name@156) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('bar': Name@162) = EmptyList@17[empty] // through DeserializedPackageMemberScope@170
+    functions('bar': Name@162) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('foo': Name@163) = EmptyList@17[empty] // through DeserializedPackageMemberScope@170
+    functions('foo': Name@163) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@169
     functions('get': Name@16) = EmptyList@17[empty] // through DeserializedPackageMemberScope@170
-    functions('invoke': Name@160) = EmptyList@17[empty] // through DeserializedPackageMemberScope@170
+    functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('invoke': Name@164) = EmptyList@17[empty] // through DeserializedPackageMemberScope@170
+    functions('invoke': Name@164) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@169
     functions('set': Name@19) = EmptyList@17[empty] // through DeserializedPackageMemberScope@170
+    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@169
     memberIndex = computeMemberIndex$1@171 // through LazyPackageFragmentScopeForJavaPackage@169
     membersProtos = HashMap@172 // through DeserializedPackageMemberScope@170
     properties('A': Name@156) = EmptyList@17[empty] // through DeserializedPackageMemberScope@170
-    properties('bar': Name@158) = EmptyList@17[empty] // through DeserializedPackageMemberScope@170
-    properties('foo': Name@159) = EmptyList@17[empty] // through DeserializedPackageMemberScope@170
+    properties('bar': Name@162) = EmptyList@17[empty] // through DeserializedPackageMemberScope@170
+    properties('foo': Name@163) = EmptyList@17[empty] // through DeserializedPackageMemberScope@170
     properties('get': Name@16) = EmptyList@17[empty] // through DeserializedPackageMemberScope@170
     properties('set': Name@19) = EmptyList@17[empty] // through DeserializedPackageMemberScope@170
 }
 
 LazyJavaPackageFragment@122['java'] {
-    _functions('lang': Name@173) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('lang': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    deserializedPackageScope = Empty@167 // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('lang': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    deserializedPackageScope = Empty@166 // through LazyPackageFragmentScopeForJavaPackage@174
+    functions('lang': Name@175) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@174
     memberIndex = computeMemberIndex$1@176 // through LazyPackageFragmentScopeForJavaPackage@174
 }
 
 LazyJavaPackageFragment@144['jvm'] {
-    _functions('A': Name@156) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@177
-    _functions('bar': Name@158) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@177
-    _functions('foo': Name@159) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@177
-    _functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@177
-    _functions('invoke': Name@160) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@177
-    _functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@177
     classes('A': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@177
-    classes('Int': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@177
-    classes('String': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@177
-    classes('bar': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@177
-    classes('foo': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@177
+    classes('Int': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@177
+    classes('String': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@177
+    classes('bar': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@177
+    classes('foo': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@177
     classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@177
-    classes('invoke': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@177
+    classes('invoke': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@177
     classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@177
-    deserializedPackageScope = Empty@167 // through LazyPackageFragmentScopeForJavaPackage@177
+    deserializedPackageScope = Empty@166 // through LazyPackageFragmentScopeForJavaPackage@177
+    functions('A': Name@156) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@177
+    functions('bar': Name@162) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@177
+    functions('foo': Name@163) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@177
+    functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@177
+    functions('invoke': Name@164) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@177
+    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@177
     memberIndex = computeMemberIndex$1@178 // through LazyPackageFragmentScopeForJavaPackage@177
 }
 
 LazyJavaPackageFragment@41['kotlin'] {
-    _functions('A': Name@156) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    _functions('bar': Name@158) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    _functions('foo': Name@159) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    _functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    _functions('invoke': Name@160) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    _functions('io': Name@180) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    _functions('jvm': Name@181) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    _functions('reflect': Name@182) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    _functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
     classes('A': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('Any': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('CharSequence': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('Int': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('MutableMap': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('String': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('Unit': Name@186) = DeserializedClassDescriptor@12['Unit'] // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('bar': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('foo': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('Any': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('CharSequence': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('Int': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('MutableMap': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('String': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('Unit': Name@183) = DeserializedClassDescriptor@12['Unit'] // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('bar': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('foo': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@179
     classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('invoke': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('io': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('jvm': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('reflect': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('invoke': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('io': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('jvm': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('reflect': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@179
     classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    deserializedPackageScope = DeserializedPackageMemberScope@190 // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('A': Name@156) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    functions('bar': Name@158) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    functions('foo': Name@159) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    functions('get': Name@16) = ArrayList@191[2] { DeserializedSimpleFunctionDescriptor@192['get'], DeserializedSimpleFunctionDescriptor@193['get'] } // through DeserializedPackageMemberScope@190
-    functions('invoke': Name@160) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    functions('io': Name@180) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    functions('jvm': Name@181) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    functions('reflect': Name@182) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    functions('set': Name@19) = ArrayList@194[1] { DeserializedSimpleFunctionDescriptor@195['set'] } // through DeserializedPackageMemberScope@190
+    deserializedPackageScope = DeserializedPackageMemberScope@187 // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('A': Name@156) = EmptyList@17[empty] // through DeserializedPackageMemberScope@187
+    functions('A': Name@156) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('bar': Name@162) = EmptyList@17[empty] // through DeserializedPackageMemberScope@187
+    functions('bar': Name@162) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('foo': Name@163) = EmptyList@17[empty] // through DeserializedPackageMemberScope@187
+    functions('foo': Name@163) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('get': Name@16) = ArrayList@188[2] { DeserializedSimpleFunctionDescriptor@189['get'], DeserializedSimpleFunctionDescriptor@190['get'] } // through DeserializedPackageMemberScope@187
+    functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('invoke': Name@164) = EmptyList@17[empty] // through DeserializedPackageMemberScope@187
+    functions('invoke': Name@164) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('io': Name@191) = EmptyList@17[empty] // through DeserializedPackageMemberScope@187
+    functions('io': Name@191) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('jvm': Name@192) = EmptyList@17[empty] // through DeserializedPackageMemberScope@187
+    functions('jvm': Name@192) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('reflect': Name@193) = EmptyList@17[empty] // through DeserializedPackageMemberScope@187
+    functions('reflect': Name@193) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('set': Name@19) = ArrayList@194[1] { DeserializedSimpleFunctionDescriptor@195['set'] } // through DeserializedPackageMemberScope@187
+    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
     memberIndex = computeMemberIndex$1@196 // through LazyPackageFragmentScopeForJavaPackage@179
-    membersProtos = HashMap@197 // through DeserializedPackageMemberScope@190
-    properties('A': Name@156) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    properties('bar': Name@158) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    properties('foo': Name@159) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    properties('get': Name@16) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    properties('io': Name@180) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    properties('jvm': Name@181) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    properties('reflect': Name@182) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    properties('set': Name@19) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
+    membersProtos = HashMap@197 // through DeserializedPackageMemberScope@187
+    properties('A': Name@156) = EmptyList@17[empty] // through DeserializedPackageMemberScope@187
+    properties('bar': Name@162) = EmptyList@17[empty] // through DeserializedPackageMemberScope@187
+    properties('foo': Name@163) = EmptyList@17[empty] // through DeserializedPackageMemberScope@187
+    properties('get': Name@16) = EmptyList@17[empty] // through DeserializedPackageMemberScope@187
+    properties('io': Name@191) = EmptyList@17[empty] // through DeserializedPackageMemberScope@187
+    properties('jvm': Name@192) = EmptyList@17[empty] // through DeserializedPackageMemberScope@187
+    properties('reflect': Name@193) = EmptyList@17[empty] // through DeserializedPackageMemberScope@187
+    properties('set': Name@19) = EmptyList@17[empty] // through DeserializedPackageMemberScope@187
 }
 
 LazyJavaPackageFragment@124['lang'] {
-    _functions('A': Name@156) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    _functions('bar': Name@158) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    _functions('foo': Name@159) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    _functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    _functions('invoke': Name@160) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    _functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@198
     classes('A': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@198
-    classes('bar': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@198
-    classes('foo': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@198
+    classes('bar': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@198
+    classes('foo': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@198
     classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@198
-    classes('invoke': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@198
+    classes('invoke': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@198
     classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@198
-    deserializedPackageScope = Empty@167 // through LazyPackageFragmentScopeForJavaPackage@198
+    deserializedPackageScope = Empty@166 // through LazyPackageFragmentScopeForJavaPackage@198
+    functions('A': Name@156) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@198
+    functions('bar': Name@162) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@198
+    functions('foo': Name@163) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@198
+    functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@198
+    functions('invoke': Name@164) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@198
+    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@198
     memberIndex = computeMemberIndex$1@199 // through LazyPackageFragmentScopeForJavaPackage@198
 }
 
 LazyJavaPackageFragment@15['reflect'] {
-    _functions('A': Name@156) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    _functions('bar': Name@158) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    _functions('foo': Name@159) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    _functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    _functions('invoke': Name@160) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    _functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
     classes('A': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('Int': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('Int': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@200
     classes('KCallable': Name@201) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@200
     classes('KMemberProperty': Name@202) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('KMutableMemberProperty': Name@164) = DeserializedClassDescriptor@6['KMutableMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('KMutableMemberProperty': Name@160) = DeserializedClassDescriptor@6['KMutableMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@200
     classes('KMutableProperty': Name@203) = DeserializedClassDescriptor@8['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@200
     classes('KProperty': Name@204) = DeserializedClassDescriptor@10['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('String': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('bar': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('foo': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('String': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('bar': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('foo': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@200
     classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('invoke': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('invoke': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@200
     classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    deserializedPackageScope = Empty@167 // through LazyPackageFragmentScopeForJavaPackage@200
+    deserializedPackageScope = Empty@166 // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('A': Name@156) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('bar': Name@162) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('foo': Name@163) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('invoke': Name@164) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
     memberIndex = computeMemberIndex$1@205 // through LazyPackageFragmentScopeForJavaPackage@200
 }
 
 NestedClassDescriptors@206 {
-    findClass('get': Name@28) = null
-    findClass('set': Name@32) = null
+    findClass('get': Name@16) = null
+    findClass('set': Name@19) = null
 }
 
 NestedClassDescriptors@207 {
-    findClass('get': Name@16) = null
-    findClass('set': Name@19) = null
+    findClass('get': Name@28) = null
+    findClass('set': Name@32) = null
 }
 
 TypeDeserializer@208 {

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

@@ -179,57 +179,57 @@ DeserializedType@129['K in kotlin'] {
 }
 
 DeserializedType@130['R in kotlin.reflect.KMutableProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@117
-}
-
-DeserializedType@131['R in kotlin.reflect.KMutableTopLevelProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@121
-}
-
-DeserializedType@132['R in kotlin.reflect.KMutableTopLevelProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@121
-}
-
-DeserializedType@133['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@109
-}
-
-DeserializedType@134['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@109
-}
-
-DeserializedType@135['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@109
-}
-
-DeserializedType@136['R in kotlin.reflect.KMutableVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@98
-}
-
-DeserializedType@137['R in kotlin.reflect.KMutableVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@98
-}
-
-DeserializedType@138['R in kotlin.reflect.KMutableVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@98
-}
-
-DeserializedType@139['R in kotlin.reflect.KProperty'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@105
 }
 
-DeserializedType@140['R in kotlin.reflect.KTopLevelProperty'] {
+DeserializedType@131['R in kotlin.reflect.KMutableTopLevelProperty'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@113
 }
 
-DeserializedType@141['R in kotlin.reflect.KTopLevelVariable'] {
+DeserializedType@132['R in kotlin.reflect.KMutableTopLevelProperty'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@113
+}
+
+DeserializedType@133['R in kotlin.reflect.KMutableTopLevelVariable'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@117
+}
+
+DeserializedType@134['R in kotlin.reflect.KMutableTopLevelVariable'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@117
+}
+
+DeserializedType@135['R in kotlin.reflect.KMutableTopLevelVariable'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@117
+}
+
+DeserializedType@136['R in kotlin.reflect.KMutableVariable'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
-DeserializedType@142['R in kotlin.reflect.KTopLevelVariable'] {
+DeserializedType@137['R in kotlin.reflect.KMutableVariable'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
+DeserializedType@138['R in kotlin.reflect.KMutableVariable'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@88
+}
+
+DeserializedType@139['R in kotlin.reflect.KProperty'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@109
+}
+
+DeserializedType@140['R in kotlin.reflect.KTopLevelProperty'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@121
+}
+
+DeserializedType@141['R in kotlin.reflect.KTopLevelVariable'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@98
+}
+
+DeserializedType@142['R in kotlin.reflect.KTopLevelVariable'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@98
+}
+
 DeserializedType@143['R in kotlin.reflect.KVariable'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@103
 }
@@ -250,27 +250,7 @@ DeserializedType@147['V in kotlin'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@125
 }
 
-DeserializedType@107['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
-}
-
-DeserializedType@85['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
-}
-
-DeserializedType@111['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
-}
-
-DeserializedType@127['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
-}
-
-DeserializedType@90['kotlin.Any'] {
+DeserializedType@95['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@148
     memberScope = DeserializedClassMemberScope@149
 }
@@ -280,12 +260,37 @@ DeserializedType@150['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@149
 }
 
+DeserializedType@90['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@148
+    memberScope = DeserializedClassMemberScope@149
+}
+
+DeserializedType@127['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@148
+    memberScope = DeserializedClassMemberScope@149
+}
+
+DeserializedType@100['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@148
+    memberScope = DeserializedClassMemberScope@149
+}
+
+DeserializedType@107['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@148
+    memberScope = DeserializedClassMemberScope@149
+}
+
 DeserializedType@123['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@148
     memberScope = DeserializedClassMemberScope@149
 }
 
-DeserializedType@95['kotlin.Any'] {
+DeserializedType@111['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@148
+    memberScope = DeserializedClassMemberScope@149
+}
+
+DeserializedType@85['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@148
     memberScope = DeserializedClassMemberScope@149
 }
@@ -300,11 +305,6 @@ DeserializedType@119['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@149
 }
 
-DeserializedType@100['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
-}
-
 DeserializedType@151['kotlin.MutableMap'] {
     constructor = DeserializedClassTypeConstructor@152
     memberScope = SubstitutingScope@153
@@ -386,252 +386,252 @@ DeserializedType@192['kotlin.reflect.KVariable'] {
 }
 
 LazyJavaPackageFragmentProvider@194 {
-    _packageFragments('<root>': FqName@195) = LazyJavaPackageFragment@196['<root>']
-    _packageFragments('Int': FqName@197) = null
-    _packageFragments('KCallable': FqName@198) = null
-    _packageFragments('KMutableProperty': FqName@199) = null
-    _packageFragments('KMutableTopLevelProperty': FqName@200) = null
-    _packageFragments('KMutableTopLevelVariable': FqName@201) = null
-    _packageFragments('KMutableVariable': FqName@202) = null
-    _packageFragments('KProperty': FqName@203) = null
-    _packageFragments('KTopLevelProperty': FqName@204) = null
-    _packageFragments('KTopLevelVariable': FqName@205) = null
-    _packageFragments('String': FqName@206) = null
-    _packageFragments('java': FqName@207) = LazyJavaPackageFragment@208['java']
-    _packageFragments('java.lang': FqName@209) = LazyJavaPackageFragment@210['lang']
-    _packageFragments('java.lang.Int': FqName@211) = null
-    _packageFragments('java.lang.KCallable': FqName@212) = null
-    _packageFragments('java.lang.KMutableProperty': FqName@213) = null
-    _packageFragments('java.lang.KMutableTopLevelProperty': FqName@214) = null
-    _packageFragments('java.lang.KMutableTopLevelVariable': FqName@215) = null
-    _packageFragments('java.lang.KMutableVariable': FqName@216) = null
-    _packageFragments('java.lang.KProperty': FqName@217) = null
-    _packageFragments('java.lang.KTopLevelProperty': FqName@218) = null
-    _packageFragments('java.lang.KTopLevelVariable': FqName@219) = null
-    _packageFragments('java.lang.String': FqName@220) = null
-    _packageFragments('kotlin': FqName@221) = LazyJavaPackageFragment@81['kotlin']
-    _packageFragments('kotlin.Int': FqName@222) = null
-    _packageFragments('kotlin.KCallable': FqName@223) = null
-    _packageFragments('kotlin.KMutableProperty': FqName@224) = null
-    _packageFragments('kotlin.KMutableTopLevelProperty': FqName@225) = null
-    _packageFragments('kotlin.KMutableTopLevelVariable': FqName@226) = null
-    _packageFragments('kotlin.KMutableVariable': FqName@227) = null
-    _packageFragments('kotlin.KProperty': FqName@228) = null
-    _packageFragments('kotlin.KTopLevelProperty': FqName@229) = null
-    _packageFragments('kotlin.KTopLevelVariable': FqName@230) = null
-    _packageFragments('kotlin.String': FqName@231) = null
-    _packageFragments('kotlin.io': FqName@232) = LazyJavaPackageFragment@233['io']
-    _packageFragments('kotlin.io.Int': FqName@234) = null
-    _packageFragments('kotlin.io.KCallable': FqName@235) = null
-    _packageFragments('kotlin.io.KMutableProperty': FqName@236) = null
-    _packageFragments('kotlin.io.KMutableTopLevelProperty': FqName@237) = null
-    _packageFragments('kotlin.io.KMutableTopLevelVariable': FqName@238) = null
-    _packageFragments('kotlin.io.KMutableVariable': FqName@239) = null
-    _packageFragments('kotlin.io.KProperty': FqName@240) = null
-    _packageFragments('kotlin.io.KTopLevelProperty': FqName@241) = null
-    _packageFragments('kotlin.io.KTopLevelVariable': FqName@242) = null
-    _packageFragments('kotlin.io.String': FqName@243) = null
-    _packageFragments('kotlin.jvm': FqName@244) = LazyJavaPackageFragment@245['jvm']
-    _packageFragments('kotlin.jvm.Int': FqName@246) = null
-    _packageFragments('kotlin.jvm.KCallable': FqName@247) = null
-    _packageFragments('kotlin.jvm.KMutableProperty': FqName@248) = null
-    _packageFragments('kotlin.jvm.KMutableTopLevelProperty': FqName@249) = null
-    _packageFragments('kotlin.jvm.KMutableTopLevelVariable': FqName@250) = null
-    _packageFragments('kotlin.jvm.KMutableVariable': FqName@251) = null
-    _packageFragments('kotlin.jvm.KProperty': FqName@252) = null
-    _packageFragments('kotlin.jvm.KTopLevelProperty': FqName@253) = null
-    _packageFragments('kotlin.jvm.KTopLevelVariable': FqName@254) = null
-    _packageFragments('kotlin.jvm.String': FqName@255) = null
-    _packageFragments('kotlin.reflect': FqName@256) = LazyJavaPackageFragment@21['reflect']
-    _packageFragments('kotlin.reflect.Int': FqName@257) = null
-    _packageFragments('kotlin.reflect.KCallable': FqName@258) = null
-    _packageFragments('kotlin.reflect.KMutableProperty': FqName@259) = null
-    _packageFragments('kotlin.reflect.KMutableTopLevelProperty': FqName@260) = null
-    _packageFragments('kotlin.reflect.KMutableTopLevelVariable': FqName@261) = null
-    _packageFragments('kotlin.reflect.KMutableVariable': FqName@262) = null
-    _packageFragments('kotlin.reflect.KProperty': FqName@263) = null
-    _packageFragments('kotlin.reflect.KTopLevelProperty': FqName@264) = null
-    _packageFragments('kotlin.reflect.KTopLevelVariable': FqName@265) = null
-    _packageFragments('kotlin.reflect.String': FqName@266) = null
-    _packageFragments('x': FqName@267) = null
-    _packageFragments('y': FqName@268) = null
+    packageFragments('<root>': FqName@195) = LazyJavaPackageFragment@196['<root>']
+    packageFragments('Int': FqName@197) = null
+    packageFragments('KCallable': FqName@198) = null
+    packageFragments('KMutableProperty': FqName@199) = null
+    packageFragments('KMutableTopLevelProperty': FqName@200) = null
+    packageFragments('KMutableTopLevelVariable': FqName@201) = null
+    packageFragments('KMutableVariable': FqName@202) = null
+    packageFragments('KProperty': FqName@203) = null
+    packageFragments('KTopLevelProperty': FqName@204) = null
+    packageFragments('KTopLevelVariable': FqName@205) = null
+    packageFragments('String': FqName@206) = null
+    packageFragments('java': FqName@207) = LazyJavaPackageFragment@208['java']
+    packageFragments('java.lang': FqName@209) = LazyJavaPackageFragment@210['lang']
+    packageFragments('java.lang.Int': FqName@211) = null
+    packageFragments('java.lang.KCallable': FqName@212) = null
+    packageFragments('java.lang.KMutableProperty': FqName@213) = null
+    packageFragments('java.lang.KMutableTopLevelProperty': FqName@214) = null
+    packageFragments('java.lang.KMutableTopLevelVariable': FqName@215) = null
+    packageFragments('java.lang.KMutableVariable': FqName@216) = null
+    packageFragments('java.lang.KProperty': FqName@217) = null
+    packageFragments('java.lang.KTopLevelProperty': FqName@218) = null
+    packageFragments('java.lang.KTopLevelVariable': FqName@219) = null
+    packageFragments('java.lang.String': FqName@220) = null
+    packageFragments('kotlin': FqName@221) = LazyJavaPackageFragment@81['kotlin']
+    packageFragments('kotlin.Int': FqName@222) = null
+    packageFragments('kotlin.KCallable': FqName@223) = null
+    packageFragments('kotlin.KMutableProperty': FqName@224) = null
+    packageFragments('kotlin.KMutableTopLevelProperty': FqName@225) = null
+    packageFragments('kotlin.KMutableTopLevelVariable': FqName@226) = null
+    packageFragments('kotlin.KMutableVariable': FqName@227) = null
+    packageFragments('kotlin.KProperty': FqName@228) = null
+    packageFragments('kotlin.KTopLevelProperty': FqName@229) = null
+    packageFragments('kotlin.KTopLevelVariable': FqName@230) = null
+    packageFragments('kotlin.String': FqName@231) = null
+    packageFragments('kotlin.io': FqName@232) = LazyJavaPackageFragment@233['io']
+    packageFragments('kotlin.io.Int': FqName@234) = null
+    packageFragments('kotlin.io.KCallable': FqName@235) = null
+    packageFragments('kotlin.io.KMutableProperty': FqName@236) = null
+    packageFragments('kotlin.io.KMutableTopLevelProperty': FqName@237) = null
+    packageFragments('kotlin.io.KMutableTopLevelVariable': FqName@238) = null
+    packageFragments('kotlin.io.KMutableVariable': FqName@239) = null
+    packageFragments('kotlin.io.KProperty': FqName@240) = null
+    packageFragments('kotlin.io.KTopLevelProperty': FqName@241) = null
+    packageFragments('kotlin.io.KTopLevelVariable': FqName@242) = null
+    packageFragments('kotlin.io.String': FqName@243) = null
+    packageFragments('kotlin.jvm': FqName@244) = LazyJavaPackageFragment@245['jvm']
+    packageFragments('kotlin.jvm.Int': FqName@246) = null
+    packageFragments('kotlin.jvm.KCallable': FqName@247) = null
+    packageFragments('kotlin.jvm.KMutableProperty': FqName@248) = null
+    packageFragments('kotlin.jvm.KMutableTopLevelProperty': FqName@249) = null
+    packageFragments('kotlin.jvm.KMutableTopLevelVariable': FqName@250) = null
+    packageFragments('kotlin.jvm.KMutableVariable': FqName@251) = null
+    packageFragments('kotlin.jvm.KProperty': FqName@252) = null
+    packageFragments('kotlin.jvm.KTopLevelProperty': FqName@253) = null
+    packageFragments('kotlin.jvm.KTopLevelVariable': FqName@254) = null
+    packageFragments('kotlin.jvm.String': FqName@255) = null
+    packageFragments('kotlin.reflect': FqName@256) = LazyJavaPackageFragment@21['reflect']
+    packageFragments('kotlin.reflect.Int': FqName@257) = null
+    packageFragments('kotlin.reflect.KCallable': FqName@258) = null
+    packageFragments('kotlin.reflect.KMutableProperty': FqName@259) = null
+    packageFragments('kotlin.reflect.KMutableTopLevelProperty': FqName@260) = null
+    packageFragments('kotlin.reflect.KMutableTopLevelVariable': FqName@261) = null
+    packageFragments('kotlin.reflect.KMutableVariable': FqName@262) = null
+    packageFragments('kotlin.reflect.KProperty': FqName@263) = null
+    packageFragments('kotlin.reflect.KTopLevelProperty': FqName@264) = null
+    packageFragments('kotlin.reflect.KTopLevelVariable': FqName@265) = null
+    packageFragments('kotlin.reflect.String': FqName@266) = null
+    packageFragments('x': FqName@267) = null
+    packageFragments('y': FqName@268) = null
 }
 
 LazyJavaPackageFragment@196['<root>'] {
-    _functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@269
-    _functions('invoke': Name@270) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@269
-    _functions('kotlin': Name@271) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@269
-    _functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@269
-    _functions('x': Name@272) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@269
-    _functions('y': Name@273) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@269
-    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@269
-    classes('KCallable': Name@275) = null // through LazyPackageFragmentScopeForJavaPackage@269
-    classes('KMutableProperty': Name@276) = null // through LazyPackageFragmentScopeForJavaPackage@269
-    classes('KMutableTopLevelProperty': Name@277) = null // through LazyPackageFragmentScopeForJavaPackage@269
-    classes('KMutableTopLevelVariable': Name@278) = null // through LazyPackageFragmentScopeForJavaPackage@269
-    classes('KMutableVariable': Name@279) = null // through LazyPackageFragmentScopeForJavaPackage@269
-    classes('KProperty': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@269
-    classes('KTopLevelProperty': Name@281) = null // through LazyPackageFragmentScopeForJavaPackage@269
-    classes('KTopLevelVariable': Name@282) = null // through LazyPackageFragmentScopeForJavaPackage@269
-    classes('String': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@269
-    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@269
-    classes('invoke': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@269
-    classes('kotlin': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@269
-    classes('set': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@269
-    classes('x': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@269
-    classes('y': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@269
-    deserializedPackageScope = Empty@285 // through LazyPackageFragmentScopeForJavaPackage@269
-    memberIndex = computeMemberIndex$1@286 // through LazyPackageFragmentScopeForJavaPackage@269
+    classes('Int': Name@269) = null // through LazyPackageFragmentScopeForJavaPackage@270
+    classes('KCallable': Name@271) = null // through LazyPackageFragmentScopeForJavaPackage@270
+    classes('KMutableProperty': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@270
+    classes('KMutableTopLevelProperty': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@270
+    classes('KMutableTopLevelVariable': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@270
+    classes('KMutableVariable': Name@275) = null // through LazyPackageFragmentScopeForJavaPackage@270
+    classes('KProperty': Name@276) = null // through LazyPackageFragmentScopeForJavaPackage@270
+    classes('KTopLevelProperty': Name@277) = null // through LazyPackageFragmentScopeForJavaPackage@270
+    classes('KTopLevelVariable': Name@278) = null // through LazyPackageFragmentScopeForJavaPackage@270
+    classes('String': Name@279) = null // through LazyPackageFragmentScopeForJavaPackage@270
+    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@270
+    classes('invoke': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@270
+    classes('kotlin': Name@281) = null // through LazyPackageFragmentScopeForJavaPackage@270
+    classes('set': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@270
+    classes('x': Name@282) = null // through LazyPackageFragmentScopeForJavaPackage@270
+    classes('y': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@270
+    deserializedPackageScope = Empty@284 // through LazyPackageFragmentScopeForJavaPackage@270
+    functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@270
+    functions('invoke': Name@280) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@270
+    functions('kotlin': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@270
+    functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@270
+    functions('x': Name@282) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@270
+    functions('y': Name@283) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@270
+    memberIndex = computeMemberIndex$1@286 // through LazyPackageFragmentScopeForJavaPackage@270
 }
 
 LazyJavaPackageFragment@233['io'] {
-    _functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@287
-    _functions('invoke': Name@270) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@287
-    _functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@287
-    _functions('x': Name@272) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@287
-    _functions('y': Name@273) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@287
-    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@287
-    classes('String': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@287
+    classes('Int': Name@269) = null // through LazyPackageFragmentScopeForJavaPackage@287
+    classes('String': Name@279) = null // through LazyPackageFragmentScopeForJavaPackage@287
     classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@287
-    classes('invoke': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@287
+    classes('invoke': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@287
     classes('set': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@287
-    classes('x': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@287
-    classes('y': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@287
+    classes('x': Name@282) = null // through LazyPackageFragmentScopeForJavaPackage@287
+    classes('y': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@287
     deserializedPackageScope = DeserializedPackageMemberScope@288 // through LazyPackageFragmentScopeForJavaPackage@287
     functions('get': Name@23) = EmptyList@24[empty] // through DeserializedPackageMemberScope@288
-    functions('invoke': Name@270) = EmptyList@24[empty] // through DeserializedPackageMemberScope@288
+    functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@287
+    functions('invoke': Name@280) = EmptyList@24[empty] // through DeserializedPackageMemberScope@288
+    functions('invoke': Name@280) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@287
     functions('set': Name@26) = EmptyList@24[empty] // through DeserializedPackageMemberScope@288
-    functions('x': Name@272) = EmptyList@24[empty] // through DeserializedPackageMemberScope@288
-    functions('y': Name@273) = EmptyList@24[empty] // through DeserializedPackageMemberScope@288
+    functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@287
+    functions('x': Name@282) = EmptyList@24[empty] // through DeserializedPackageMemberScope@288
+    functions('x': Name@282) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@287
+    functions('y': Name@283) = EmptyList@24[empty] // through DeserializedPackageMemberScope@288
+    functions('y': Name@283) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@287
     memberIndex = computeMemberIndex$1@289 // through LazyPackageFragmentScopeForJavaPackage@287
     membersProtos = HashMap@290 // through DeserializedPackageMemberScope@288
     properties('get': Name@23) = EmptyList@24[empty] // through DeserializedPackageMemberScope@288
     properties('name': Name@28) = ArrayList@291[1] { DeserializedPropertyDescriptor@292['name'] } // through DeserializedPackageMemberScope@288
     properties('set': Name@26) = EmptyList@24[empty] // through DeserializedPackageMemberScope@288
-    properties('x': Name@272) = EmptyList@24[empty] // through DeserializedPackageMemberScope@288
-    properties('y': Name@273) = EmptyList@24[empty] // through DeserializedPackageMemberScope@288
+    properties('x': Name@282) = EmptyList@24[empty] // through DeserializedPackageMemberScope@288
+    properties('y': Name@283) = EmptyList@24[empty] // through DeserializedPackageMemberScope@288
 }
 
 LazyJavaPackageFragment@208['java'] {
-    _functions('lang': Name@293) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@294
-    classes('lang': Name@295) = null // through LazyPackageFragmentScopeForJavaPackage@294
-    deserializedPackageScope = Empty@285 // through LazyPackageFragmentScopeForJavaPackage@294
+    classes('lang': Name@293) = null // through LazyPackageFragmentScopeForJavaPackage@294
+    deserializedPackageScope = Empty@284 // through LazyPackageFragmentScopeForJavaPackage@294
+    functions('lang': Name@295) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@294
     memberIndex = computeMemberIndex$1@296 // through LazyPackageFragmentScopeForJavaPackage@294
 }
 
 LazyJavaPackageFragment@245['jvm'] {
-    _functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@297
-    _functions('invoke': Name@270) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@297
-    _functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@297
-    _functions('x': Name@272) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@297
-    _functions('y': Name@273) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@297
-    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@297
-    classes('String': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@297
+    classes('Int': Name@269) = null // through LazyPackageFragmentScopeForJavaPackage@297
+    classes('String': Name@279) = null // through LazyPackageFragmentScopeForJavaPackage@297
     classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@297
-    classes('invoke': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@297
+    classes('invoke': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@297
     classes('set': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@297
-    classes('x': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@297
-    classes('y': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@297
-    deserializedPackageScope = Empty@285 // through LazyPackageFragmentScopeForJavaPackage@297
+    classes('x': Name@282) = null // through LazyPackageFragmentScopeForJavaPackage@297
+    classes('y': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@297
+    deserializedPackageScope = Empty@284 // through LazyPackageFragmentScopeForJavaPackage@297
+    functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@297
+    functions('invoke': Name@280) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@297
+    functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@297
+    functions('x': Name@282) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@297
+    functions('y': Name@283) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@297
     memberIndex = computeMemberIndex$1@298 // through LazyPackageFragmentScopeForJavaPackage@297
 }
 
 LazyJavaPackageFragment@81['kotlin'] {
-    _functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@299
-    _functions('invoke': Name@270) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@299
-    _functions('io': Name@300) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@299
-    _functions('jvm': Name@301) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@299
-    _functions('reflect': Name@302) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@299
-    _functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@299
-    _functions('x': Name@272) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@299
-    _functions('y': Name@273) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@299
-    classes('Any': Name@303) = null // through LazyPackageFragmentScopeForJavaPackage@299
-    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@299
-    classes('MutableMap': Name@304) = null // through LazyPackageFragmentScopeForJavaPackage@299
-    classes('String': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@299
-    classes('Unit': Name@305) = DeserializedClassDescriptor@20['Unit'] // through LazyPackageFragmentScopeForJavaPackage@299
-    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@299
-    classes('invoke': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@299
-    classes('io': Name@306) = null // through LazyPackageFragmentScopeForJavaPackage@299
-    classes('jvm': Name@307) = null // through LazyPackageFragmentScopeForJavaPackage@299
-    classes('reflect': Name@308) = null // through LazyPackageFragmentScopeForJavaPackage@299
-    classes('set': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@299
-    classes('x': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@299
-    classes('y': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@299
-    deserializedPackageScope = DeserializedPackageMemberScope@309 // through LazyPackageFragmentScopeForJavaPackage@299
-    functions('get': Name@23) = ArrayList@310[2] { DeserializedSimpleFunctionDescriptor@311['get'], DeserializedSimpleFunctionDescriptor@312['get'] } // through DeserializedPackageMemberScope@309
-    functions('invoke': Name@270) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    functions('io': Name@300) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    functions('jvm': Name@301) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    functions('reflect': Name@302) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    functions('set': Name@26) = ArrayList@313[1] { DeserializedSimpleFunctionDescriptor@314['set'] } // through DeserializedPackageMemberScope@309
-    functions('x': Name@272) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    functions('y': Name@273) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    memberIndex = computeMemberIndex$1@315 // through LazyPackageFragmentScopeForJavaPackage@299
-    membersProtos = HashMap@316 // through DeserializedPackageMemberScope@309
-    properties('get': Name@23) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    properties('io': Name@300) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    properties('jvm': Name@301) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    properties('name': Name@28) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    properties('reflect': Name@302) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    properties('set': Name@26) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    properties('x': Name@272) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    properties('y': Name@273) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
+    classes('Any': Name@299) = null // through LazyPackageFragmentScopeForJavaPackage@300
+    classes('Int': Name@269) = null // through LazyPackageFragmentScopeForJavaPackage@300
+    classes('MutableMap': Name@301) = null // through LazyPackageFragmentScopeForJavaPackage@300
+    classes('String': Name@279) = null // through LazyPackageFragmentScopeForJavaPackage@300
+    classes('Unit': Name@302) = DeserializedClassDescriptor@20['Unit'] // through LazyPackageFragmentScopeForJavaPackage@300
+    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@300
+    classes('invoke': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@300
+    classes('io': Name@303) = null // through LazyPackageFragmentScopeForJavaPackage@300
+    classes('jvm': Name@304) = null // through LazyPackageFragmentScopeForJavaPackage@300
+    classes('reflect': Name@305) = null // through LazyPackageFragmentScopeForJavaPackage@300
+    classes('set': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@300
+    classes('x': Name@282) = null // through LazyPackageFragmentScopeForJavaPackage@300
+    classes('y': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@300
+    deserializedPackageScope = DeserializedPackageMemberScope@306 // through LazyPackageFragmentScopeForJavaPackage@300
+    functions('get': Name@23) = ArrayList@307[2] { DeserializedSimpleFunctionDescriptor@308['get'], DeserializedSimpleFunctionDescriptor@309['get'] } // through DeserializedPackageMemberScope@306
+    functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@300
+    functions('invoke': Name@280) = EmptyList@24[empty] // through DeserializedPackageMemberScope@306
+    functions('invoke': Name@280) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@300
+    functions('io': Name@310) = EmptyList@24[empty] // through DeserializedPackageMemberScope@306
+    functions('io': Name@310) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@300
+    functions('jvm': Name@311) = EmptyList@24[empty] // through DeserializedPackageMemberScope@306
+    functions('jvm': Name@311) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@300
+    functions('reflect': Name@312) = EmptyList@24[empty] // through DeserializedPackageMemberScope@306
+    functions('reflect': Name@312) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@300
+    functions('set': Name@26) = ArrayList@313[1] { DeserializedSimpleFunctionDescriptor@314['set'] } // through DeserializedPackageMemberScope@306
+    functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@300
+    functions('x': Name@282) = EmptyList@24[empty] // through DeserializedPackageMemberScope@306
+    functions('x': Name@282) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@300
+    functions('y': Name@283) = EmptyList@24[empty] // through DeserializedPackageMemberScope@306
+    functions('y': Name@283) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@300
+    memberIndex = computeMemberIndex$1@315 // through LazyPackageFragmentScopeForJavaPackage@300
+    membersProtos = HashMap@316 // through DeserializedPackageMemberScope@306
+    properties('get': Name@23) = EmptyList@24[empty] // through DeserializedPackageMemberScope@306
+    properties('io': Name@310) = EmptyList@24[empty] // through DeserializedPackageMemberScope@306
+    properties('jvm': Name@311) = EmptyList@24[empty] // through DeserializedPackageMemberScope@306
+    properties('name': Name@28) = EmptyList@24[empty] // through DeserializedPackageMemberScope@306
+    properties('reflect': Name@312) = EmptyList@24[empty] // through DeserializedPackageMemberScope@306
+    properties('set': Name@26) = EmptyList@24[empty] // through DeserializedPackageMemberScope@306
+    properties('x': Name@282) = EmptyList@24[empty] // through DeserializedPackageMemberScope@306
+    properties('y': Name@283) = EmptyList@24[empty] // through DeserializedPackageMemberScope@306
 }
 
 LazyJavaPackageFragment@210['lang'] {
-    _functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@317
-    _functions('invoke': Name@270) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@317
-    _functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@317
-    _functions('x': Name@272) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@317
-    _functions('y': Name@273) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@317
     classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('invoke': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('invoke': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@317
     classes('set': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('x': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('y': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    deserializedPackageScope = Empty@285 // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('x': Name@282) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('y': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    deserializedPackageScope = Empty@284 // through LazyPackageFragmentScopeForJavaPackage@317
+    functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@317
+    functions('invoke': Name@280) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@317
+    functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@317
+    functions('x': Name@282) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@317
+    functions('y': Name@283) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@317
     memberIndex = computeMemberIndex$1@318 // through LazyPackageFragmentScopeForJavaPackage@317
 }
 
 LazyJavaPackageFragment@21['reflect'] {
-    _functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    _functions('invoke': Name@270) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    _functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    _functions('x': Name@272) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    _functions('y': Name@273) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('Int': Name@269) = null // through LazyPackageFragmentScopeForJavaPackage@319
     classes('KCallable': Name@320) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@319
     classes('KMutableProperty': Name@321) = DeserializedClassDescriptor@4['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('KMutableTopLevelProperty': Name@277) = DeserializedClassDescriptor@6['KMutableTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('KMutableTopLevelProperty': Name@273) = DeserializedClassDescriptor@6['KMutableTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@319
     classes('KMutableTopLevelVariable': Name@322) = DeserializedClassDescriptor@8['KMutableTopLevelVariable'] // through LazyPackageFragmentScopeForJavaPackage@319
     classes('KMutableVariable': Name@323) = DeserializedClassDescriptor@10['KMutableVariable'] // through LazyPackageFragmentScopeForJavaPackage@319
     classes('KProperty': Name@324) = DeserializedClassDescriptor@12['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@319
     classes('KTopLevelProperty': Name@325) = DeserializedClassDescriptor@14['KTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@319
     classes('KTopLevelVariable': Name@326) = DeserializedClassDescriptor@16['KTopLevelVariable'] // through LazyPackageFragmentScopeForJavaPackage@319
     classes('KVariable': Name@327) = DeserializedClassDescriptor@18['KVariable'] // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('String': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('String': Name@279) = null // through LazyPackageFragmentScopeForJavaPackage@319
     classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('invoke': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('invoke': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@319
     classes('set': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('x': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('y': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    deserializedPackageScope = Empty@285 // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('x': Name@282) = null // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('y': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@319
+    deserializedPackageScope = Empty@284 // through LazyPackageFragmentScopeForJavaPackage@319
+    functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@319
+    functions('invoke': Name@280) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@319
+    functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@319
+    functions('x': Name@282) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@319
+    functions('y': Name@283) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@319
     memberIndex = computeMemberIndex$1@328 // through LazyPackageFragmentScopeForJavaPackage@319
 }
 
 NestedClassDescriptors@329 {
-    findClass('get': Name@330) = null
-    findClass('name': Name@331) = null
-    findClass('set': Name@332) = null
-}
-
-NestedClassDescriptors@333 {
     findClass('get': Name@23) = null
     findClass('name': Name@28) = null
     findClass('set': Name@26) = null
 }
 
+NestedClassDescriptors@330 {
+    findClass('get': Name@331) = null
+    findClass('name': Name@332) = null
+    findClass('set': Name@333) = null
+}
+
 TypeDeserializer@334 {
     classDescriptors('102': Integer@335) = DeserializedClassDescriptor@336['MutableMap']
     classDescriptors('2': Integer@337) = DeserializedClassDescriptor@338['Any']

compiler/testData/diagnostics/testsWithStdLib/callableReference/unused.lazy.log

@@ -67,104 +67,104 @@ DeserializedType@29['kotlin.Function0'] {
 }
 
 LazyJavaPackageFragmentProvider@31 {
-    _packageFragments('<root>': FqName@32) = LazyJavaPackageFragment@33['<root>']
-    _packageFragments('A': FqName@34) = null
-    _packageFragments('java': FqName@35) = LazyJavaPackageFragment@36['java']
-    _packageFragments('java.lang': FqName@37) = LazyJavaPackageFragment@38['lang']
-    _packageFragments('java.lang.A': FqName@39) = null
-    _packageFragments('kotlin': FqName@40) = LazyJavaPackageFragment@11['kotlin']
-    _packageFragments('kotlin.A': FqName@41) = null
-    _packageFragments('kotlin.io': FqName@42) = LazyJavaPackageFragment@43['io']
-    _packageFragments('kotlin.io.A': FqName@44) = null
-    _packageFragments('kotlin.jvm': FqName@45) = LazyJavaPackageFragment@46['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@47) = null
-    _packageFragments('kotlin.reflect': FqName@48) = LazyJavaPackageFragment@12['reflect']
+    packageFragments('<root>': FqName@32) = LazyJavaPackageFragment@33['<root>']
+    packageFragments('A': FqName@34) = null
+    packageFragments('java': FqName@35) = LazyJavaPackageFragment@36['java']
+    packageFragments('java.lang': FqName@37) = LazyJavaPackageFragment@38['lang']
+    packageFragments('java.lang.A': FqName@39) = null
+    packageFragments('kotlin': FqName@40) = LazyJavaPackageFragment@11['kotlin']
+    packageFragments('kotlin.A': FqName@41) = null
+    packageFragments('kotlin.io': FqName@42) = LazyJavaPackageFragment@43['io']
+    packageFragments('kotlin.io.A': FqName@44) = null
+    packageFragments('kotlin.jvm': FqName@45) = LazyJavaPackageFragment@46['jvm']
+    packageFragments('kotlin.jvm.A': FqName@47) = null
+    packageFragments('kotlin.reflect': FqName@48) = LazyJavaPackageFragment@12['reflect']
 }
 
 LazyJavaPackageFragment@33['<root>'] {
-    _functions('A': Name@49) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    _functions('bar': Name@52) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    _functions('foo': Name@53) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('A': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('bar': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('foo': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('A': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('bar': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('foo': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('A': Name@49) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('bar': Name@51) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('foo': Name@52) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@50
 }
 
 LazyJavaPackageFragment@43['io'] {
-    _functions('A': Name@49) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    _functions('bar': Name@52) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    _functions('foo': Name@53) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
     classes('A': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('bar': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('foo': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('bar': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('foo': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@56
     deserializedPackageScope = DeserializedPackageMemberScope@57 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('A': Name@49) = EmptyList@50[empty] // through DeserializedPackageMemberScope@57
-    functions('bar': Name@52) = EmptyList@50[empty] // through DeserializedPackageMemberScope@57
-    functions('foo': Name@53) = EmptyList@50[empty] // through DeserializedPackageMemberScope@57
+    functions('A': Name@49) = EmptyList@54[empty] // through DeserializedPackageMemberScope@57
+    functions('A': Name@49) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('bar': Name@51) = EmptyList@54[empty] // through DeserializedPackageMemberScope@57
+    functions('bar': Name@51) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('foo': Name@52) = EmptyList@54[empty] // through DeserializedPackageMemberScope@57
+    functions('foo': Name@52) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@56
     memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@56
     membersProtos = HashMap@59 // through DeserializedPackageMemberScope@57
-    properties('A': Name@49) = EmptyList@50[empty] // through DeserializedPackageMemberScope@57
-    properties('bar': Name@52) = EmptyList@50[empty] // through DeserializedPackageMemberScope@57
-    properties('foo': Name@53) = EmptyList@50[empty] // through DeserializedPackageMemberScope@57
+    properties('A': Name@49) = EmptyList@54[empty] // through DeserializedPackageMemberScope@57
+    properties('bar': Name@51) = EmptyList@54[empty] // through DeserializedPackageMemberScope@57
+    properties('foo': Name@52) = EmptyList@54[empty] // through DeserializedPackageMemberScope@57
 }
 
 LazyJavaPackageFragment@36['java'] {
-    _functions('lang': Name@60) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('lang': Name@62) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@61
     memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
 }
 
 LazyJavaPackageFragment@46['jvm'] {
-    _functions('A': Name@49) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    _functions('bar': Name@52) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    _functions('foo': Name@53) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@64
     classes('A': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('bar': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('foo': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('bar': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('foo': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('A': Name@49) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('bar': Name@51) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('foo': Name@52) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@64
     memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
 LazyJavaPackageFragment@11['kotlin'] {
-    _functions('A': Name@49) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('bar': Name@52) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('foo': Name@53) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('io': Name@67) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('jvm': Name@68) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@66
     classes('A': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Any': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('ExtensionFunction0': Name@70) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Function0': Name@71) = DeserializedClassDescriptor@4['Function0'] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('bar': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('foo': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('io': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('jvm': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = DeserializedPackageMemberScope@74 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('A': Name@49) = EmptyList@50[empty] // through DeserializedPackageMemberScope@74
-    functions('bar': Name@52) = EmptyList@50[empty] // through DeserializedPackageMemberScope@74
-    functions('foo': Name@53) = EmptyList@50[empty] // through DeserializedPackageMemberScope@74
-    functions('io': Name@67) = EmptyList@50[empty] // through DeserializedPackageMemberScope@74
-    functions('jvm': Name@68) = EmptyList@50[empty] // through DeserializedPackageMemberScope@74
+    classes('Any': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('ExtensionFunction0': Name@68) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('Function0': Name@69) = DeserializedClassDescriptor@4['Function0'] // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('bar': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('foo': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('io': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('jvm': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    deserializedPackageScope = DeserializedPackageMemberScope@72 // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('A': Name@49) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
+    functions('A': Name@49) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('bar': Name@51) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
+    functions('bar': Name@51) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('foo': Name@52) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
+    functions('foo': Name@52) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('io': Name@73) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
+    functions('io': Name@73) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('jvm': Name@74) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
+    functions('jvm': Name@74) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@66
     memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@66
-    membersProtos = HashMap@76 // through DeserializedPackageMemberScope@74
-    properties('A': Name@49) = EmptyList@50[empty] // through DeserializedPackageMemberScope@74
-    properties('bar': Name@52) = EmptyList@50[empty] // through DeserializedPackageMemberScope@74
-    properties('foo': Name@53) = EmptyList@50[empty] // through DeserializedPackageMemberScope@74
-    properties('io': Name@67) = EmptyList@50[empty] // through DeserializedPackageMemberScope@74
-    properties('jvm': Name@68) = EmptyList@50[empty] // through DeserializedPackageMemberScope@74
+    membersProtos = HashMap@76 // through DeserializedPackageMemberScope@72
+    properties('A': Name@49) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
+    properties('bar': Name@51) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
+    properties('foo': Name@52) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
+    properties('io': Name@73) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
+    properties('jvm': Name@74) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
 }
 
 LazyJavaPackageFragment@38['lang'] {
-    _functions('A': Name@49) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    _functions('bar': Name@52) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    _functions('foo': Name@53) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@77
     classes('A': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('bar': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('foo': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('bar': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('foo': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('A': Name@49) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('bar': Name@51) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('foo': Name@52) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@77
     memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
 }