Fix test data after changes to renderer and descriptors

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

@@ -65,7 +65,7 @@ LazyJavaPackageFragment@26['io'] {
     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
+    membersProtos = LinkedHashMap@41 // 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
@@ -115,7 +115,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     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@53
+    membersProtos = LinkedHashMap@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

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

@@ -54,7 +54,7 @@ LazyJavaPackageFragment@25['io'] {
     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
+    membersProtos = LinkedHashMap@45 // through DeserializedPackageMemberScope@43
     properties('foo': Name@38) = EmptyList@40[empty] // through DeserializedPackageMemberScope@43
 }
 
@@ -90,7 +90,7 @@ LazyJavaPackageFragment@6['kotlin'] {
     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@55
+    membersProtos = LinkedHashMap@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

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

@@ -11,14 +11,14 @@ DeserializedClassDescriptor@2['ExtensionFunction0'] {
     containingDeclaration = LazyJavaPackageFragment@7['kotlin']
     defaultType = JetTypeImpl@8['ExtensionFunction0<2>']
     functions('invoke': Name@9) = ArrayList@10[1] { DeserializedSimpleFunctionDescriptor@11['invoke'] } // through DeserializedClassMemberScope@12
-    membersProtos = HashMap@13 // through DeserializedClassMemberScope@12
+    membersProtos = LinkedHashMap@13 // through DeserializedClassMemberScope@12
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@14['<this>']
 }
 
 DeserializedClassDescriptor@4['KMemberFunction0'] {
     containingDeclaration = LazyJavaPackageFragment@15['reflect']
     functions('invoke': Name@9) = ArrayList@16[1] { DeserializedSimpleFunctionDescriptor@17['invoke'] } // through DeserializedClassMemberScope@18
-    membersProtos = HashMap@19 // through DeserializedClassMemberScope@18
+    membersProtos = LinkedHashMap@19 // through DeserializedClassMemberScope@18
 }
 
 DeserializedTypeParameterDescriptor@20['R'] {
@@ -71,93 +71,97 @@ DeserializedType@39['kotlin.ExtensionFunction0'] {
     memberScope = SubstitutingScope@41
 }
 
-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']
+EnumEntryClassDescriptors@42 {
+    findEnumEntry('invoke': Name@9) = null
 }
 
-LazyJavaPackageFragment@44['<root>'] {
-    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
+LazyJavaPackageFragmentProvider@43 {
+    packageFragments('<root>': FqName@44) = LazyJavaPackageFragment@45['<root>']
+    packageFragments('A': FqName@46) = null
+    packageFragments('java': FqName@47) = LazyJavaPackageFragment@48['java']
+    packageFragments('java.lang': FqName@49) = LazyJavaPackageFragment@50['lang']
+    packageFragments('java.lang.A': FqName@51) = null
+    packageFragments('kotlin': FqName@52) = LazyJavaPackageFragment@7['kotlin']
+    packageFragments('kotlin.A': FqName@53) = null
+    packageFragments('kotlin.io': FqName@54) = LazyJavaPackageFragment@55['io']
+    packageFragments('kotlin.io.A': FqName@56) = null
+    packageFragments('kotlin.jvm': FqName@57) = LazyJavaPackageFragment@58['jvm']
+    packageFragments('kotlin.jvm.A': FqName@59) = null
+    packageFragments('kotlin.reflect': FqName@60) = LazyJavaPackageFragment@15['reflect']
 }
 
-LazyJavaPackageFragment@54['io'] {
-    classes('foo': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = DeserializedPackageMemberScope@66 // through LazyPackageFragmentScopeForJavaPackage@65
-    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@63[empty] // through DeserializedPackageMemberScope@66
-    properties('foo': Name@60) = EmptyList@63[empty] // through DeserializedPackageMemberScope@66
+LazyJavaPackageFragment@45['<root>'] {
+    classes('foo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('foo': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
-LazyJavaPackageFragment@47['java'] {
-    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@55['io'] {
+    classes('foo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    deserializedPackageScope = DeserializedPackageMemberScope@67 // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('foo': Name@61) = EmptyList@64[empty] // through DeserializedPackageMemberScope@67
+    functions('foo': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@66
+    membersProtos = LinkedHashMap@69 // through DeserializedPackageMemberScope@67
+    properties('A': Name@70) = EmptyList@64[empty] // through DeserializedPackageMemberScope@67
+    properties('foo': Name@61) = EmptyList@64[empty] // through DeserializedPackageMemberScope@67
 }
 
-LazyJavaPackageFragment@57['jvm'] {
-    classes('foo': Name@60) = null // 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@48['java'] {
+    classes('lang': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('lang': Name@73) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
+}
+
+LazyJavaPackageFragment@58['jvm'] {
+    classes('foo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('foo': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    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
+    classes('Any': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('ExtensionFunction0': Name@79) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('foo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('io': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('jvm': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    deserializedPackageScope = DeserializedPackageMemberScope@82 // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('foo': Name@61) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
+    functions('foo': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('io': Name@83) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
+    functions('io': Name@83) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('jvm': Name@84) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
+    functions('jvm': Name@84) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@78
+    membersProtos = LinkedHashMap@86 // through DeserializedPackageMemberScope@82
+    properties('A': Name@70) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
+    properties('foo': Name@61) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
+    properties('io': Name@83) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
+    properties('jvm': Name@84) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
 }
 
-LazyJavaPackageFragment@49['lang'] {
-    classes('foo': Name@60) = null // 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
+LazyJavaPackageFragment@50['lang'] {
+    classes('foo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('foo': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
 LazyJavaPackageFragment@15['reflect'] {
-    classes('KMemberFunction0': Name@88) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('KMemberFunction0': Name@89) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@90
 }
 
-NestedClassDescriptors@90 {
-    findClass('invoke': Name@9) = null
+NestedClassDescriptors@91 {
+    findNestedClass('invoke': Name@9) = null
 }
 
-TypeDeserializer@91 {
-    classDescriptors('2': Integer@92) = DeserializedClassDescriptor@93['Any']
+TypeDeserializer@92 {
+    classDescriptors('2': Integer@93) = DeserializedClassDescriptor@94['Any']
 }
 
-TypeDeserializer@94 {
-    classDescriptors('4': Integer@95) = DeserializedClassDescriptor@2['ExtensionFunction0']
+TypeDeserializer@95 {
+    classDescriptors('4': Integer@96) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }

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

@@ -67,7 +67,7 @@ LazyJavaPackageFragment@32['io'] {
     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
+    membersProtos = LinkedHashMap@52 // through DeserializedPackageMemberScope@50
     properties('A': Name@41) = EmptyList@46[empty] // through DeserializedPackageMemberScope@50
     properties('x': Name@53) = EmptyList@46[empty] // through DeserializedPackageMemberScope@50
 }
@@ -103,7 +103,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     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@66
+    membersProtos = LinkedHashMap@71 // through DeserializedPackageMemberScope@66
     properties('A': Name@41) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
     properties('io': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
     properties('jvm': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66

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

@@ -76,7 +76,7 @@ LazyJavaPackageFragment@34['io'] {
     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
+    membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
     properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
     properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
     properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
@@ -119,7 +119,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     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@72
+    membersProtos = LinkedHashMap@77 // through DeserializedPackageMemberScope@72
     properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
     properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
     properties('io': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72

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

@@ -76,7 +76,7 @@ LazyJavaPackageFragment@34['io'] {
     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
+    membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
     properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
     properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
     properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
@@ -119,7 +119,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     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@72
+    membersProtos = LinkedHashMap@77 // through DeserializedPackageMemberScope@72
     properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
     properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
     properties('io': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72

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

@@ -66,7 +66,7 @@ LazyJavaPackageFragment@31['io'] {
     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
+    membersProtos = LinkedHashMap@51 // through DeserializedPackageMemberScope@49
     properties('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@49
 }
 
@@ -101,7 +101,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     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@64
+    membersProtos = LinkedHashMap@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

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

@@ -58,12 +58,17 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-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
+}
+
+DeserializedType@34['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -73,12 +78,7 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -176,7 +176,7 @@ LazyJavaPackageFragment@74['io'] {
     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
+    membersProtos = LinkedHashMap@115 // through DeserializedPackageMemberScope@112
     properties('bar': Name@108) = EmptyList@113[empty] // through DeserializedPackageMemberScope@112
     properties('baz': Name@109) = EmptyList@113[empty] // through DeserializedPackageMemberScope@112
     properties('foo': Name@111) = EmptyList@113[empty] // through DeserializedPackageMemberScope@112
@@ -232,7 +232,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     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
+    membersProtos = LinkedHashMap@135 // through DeserializedPackageMemberScope@130
     properties('bar': Name@108) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
     properties('baz': Name@109) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
     properties('foo': Name@111) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130

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

@@ -97,7 +97,7 @@ LazyJavaPackageFragment@44['io'] {
     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
+    membersProtos = LinkedHashMap@69 // through DeserializedPackageMemberScope@66
     properties('bar': Name@62) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
     properties('baz': Name@63) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
     properties('foo': Name@65) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
@@ -148,7 +148,7 @@ LazyJavaPackageFragment@7['kotlin'] {
     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
+    membersProtos = LinkedHashMap@88 // through DeserializedPackageMemberScope@83
     properties('bar': Name@62) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
     properties('baz': Name@63) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
     properties('foo': Name@65) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83

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

@@ -147,7 +147,7 @@ LazyJavaPackageFragment@65['io'] {
     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
+    membersProtos = LinkedHashMap@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
@@ -201,7 +201,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     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
+    membersProtos = LinkedHashMap@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

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

@@ -28,7 +28,7 @@ LazyJavaPackageFragment@10['kotlin'] {
     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@27
+    membersProtos = LinkedHashMap@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

@@ -63,12 +63,7 @@ DeserializedType@30['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,7 +73,12 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@34['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -182,7 +182,7 @@ LazyJavaPackageFragment@71['io'] {
     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
+    membersProtos = LinkedHashMap@110 // through DeserializedPackageMemberScope@108
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
@@ -239,7 +239,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     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
+    membersProtos = LinkedHashMap@132 // through DeserializedPackageMemberScope@127
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127

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

@@ -63,12 +63,12 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,7 +78,7 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -182,7 +182,7 @@ LazyJavaPackageFragment@71['io'] {
     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
+    membersProtos = LinkedHashMap@110 // through DeserializedPackageMemberScope@108
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
@@ -239,7 +239,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     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
+    membersProtos = LinkedHashMap@132 // through DeserializedPackageMemberScope@127
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127

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

@@ -63,7 +63,7 @@ DeserializedType@22['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,7 +78,7 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -188,7 +188,7 @@ LazyJavaPackageFragment@74['io'] {
     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
+    membersProtos = LinkedHashMap@116 // 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
@@ -245,7 +245,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     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
+    membersProtos = LinkedHashMap@138 // through DeserializedPackageMemberScope@133
     properties('bar': Name@105) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
     properties('baz': Name@106) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
     properties('foo': Name@107) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133

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

@@ -63,26 +63,26 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
 DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
+DeserializedType@34['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
 DeserializedType@30['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
 }
@@ -182,7 +182,7 @@ LazyJavaPackageFragment@71['io'] {
     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
+    membersProtos = LinkedHashMap@110 // through DeserializedPackageMemberScope@108
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
@@ -236,7 +236,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     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
+    membersProtos = LinkedHashMap@129 // through DeserializedPackageMemberScope@124
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124

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

@@ -49,7 +49,7 @@ LazyJavaPackageFragment@22['io'] {
     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
+    membersProtos = LinkedHashMap@42 // through DeserializedPackageMemberScope@40
     properties('extA': Name@34) = EmptyList@37[empty] // through DeserializedPackageMemberScope@40
     properties('extInt': Name@35) = EmptyList@37[empty] // through DeserializedPackageMemberScope@40
     properties('x': Name@43) = EmptyList@37[empty] // through DeserializedPackageMemberScope@40
@@ -90,7 +90,7 @@ LazyJavaPackageFragment@17['kotlin'] {
     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@53
+    membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@53
     properties('extA': Name@34) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
     properties('extInt': Name@35) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
     properties('io': Name@54) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53

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

@@ -48,11 +48,6 @@ DeserializedTypeParameterDescriptor@26['T'] {
     upperBoundsAsType = DeserializedType@29['kotlin.Any']
 }
 
-DeserializedType@21['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@30
-    memberScope = DeserializedClassMemberScope@31
-}
-
 DeserializedType@29['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@30
     memberScope = DeserializedClassMemberScope@31
@@ -63,6 +58,11 @@ DeserializedType@17['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@31
 }
 
+DeserializedType@21['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@30
+    memberScope = DeserializedClassMemberScope@31
+}
+
 DeserializedType@25['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@30
     memberScope = DeserializedClassMemberScope@31
@@ -139,7 +139,7 @@ LazyJavaPackageFragment@60['io'] {
     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
+    membersProtos = LinkedHashMap@89 // through DeserializedPackageMemberScope@87
     properties('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@87
 }
 
@@ -176,7 +176,7 @@ LazyJavaPackageFragment@12['kotlin'] {
     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
+    membersProtos = LinkedHashMap@107 // through DeserializedPackageMemberScope@102
     properties('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
     properties('io': Name@103) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
     properties('jvm': Name@104) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102

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

@@ -22,12 +22,12 @@ DeserializedTypeParameterDescriptor@11['T'] {
     upperBoundsAsType = DeserializedType@14['kotlin.Any']
 }
 
-DeserializedType@14['kotlin.Any'] {
+DeserializedType@10['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@15
     memberScope = DeserializedClassMemberScope@16
 }
 
-DeserializedType@10['kotlin.Any'] {
+DeserializedType@14['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@15
     memberScope = DeserializedClassMemberScope@16
 }
@@ -91,7 +91,7 @@ LazyJavaPackageFragment@41['io'] {
     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
+    membersProtos = LinkedHashMap@67 // through DeserializedPackageMemberScope@65
     properties('foo': Name@57) = EmptyList@61[empty] // through DeserializedPackageMemberScope@65
     properties('t': Name@59) = EmptyList@61[empty] // through DeserializedPackageMemberScope@65
 }
@@ -131,7 +131,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     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
+    membersProtos = LinkedHashMap@85 // through DeserializedPackageMemberScope@80
     properties('foo': Name@57) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80
     properties('io': Name@81) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80
     properties('jvm': Name@82) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80

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

@@ -23,7 +23,7 @@ LazyJavaPackageFragment@11['io'] {
     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
+    membersProtos = LinkedHashMap@24 // through DeserializedPackageMemberScope@22
     properties('Inner': Name@19) = EmptyList@18[empty] // through DeserializedPackageMemberScope@22
 }
 
@@ -53,7 +53,7 @@ LazyJavaPackageFragment@9['kotlin'] {
     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@34
+    membersProtos = LinkedHashMap@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

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

@@ -22,12 +22,12 @@ DeserializedTypeParameterDescriptor@11['T'] {
     upperBoundsAsType = DeserializedType@14['kotlin.Any']
 }
 
-DeserializedType@14['kotlin.Any'] {
+DeserializedType@10['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@15
     memberScope = DeserializedClassMemberScope@16
 }
 
-DeserializedType@10['kotlin.Any'] {
+DeserializedType@14['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@15
     memberScope = DeserializedClassMemberScope@16
 }
@@ -83,7 +83,7 @@ LazyJavaPackageFragment@39['io'] {
     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
+    membersProtos = LinkedHashMap@61 // through DeserializedPackageMemberScope@59
     properties('Inner': Name@50) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
     properties('x': Name@62) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
     properties('y': Name@63) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
@@ -120,7 +120,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     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
+    membersProtos = LinkedHashMap@81 // through DeserializedPackageMemberScope@76
     properties('Inner': Name@50) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
     properties('io': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
     properties('jvm': Name@78) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76

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

@@ -22,12 +22,12 @@ DeserializedTypeParameterDescriptor@11['T'] {
     upperBoundsAsType = DeserializedType@14['kotlin.Any']
 }
 
-DeserializedType@14['kotlin.Any'] {
+DeserializedType@10['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@15
     memberScope = DeserializedClassMemberScope@16
 }
 
-DeserializedType@10['kotlin.Any'] {
+DeserializedType@14['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@15
     memberScope = DeserializedClassMemberScope@16
 }
@@ -84,7 +84,7 @@ LazyJavaPackageFragment@38['io'] {
     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
+    membersProtos = LinkedHashMap@61 // through DeserializedPackageMemberScope@59
     properties('Inner': Name@49) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
     properties('x': Name@62) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
     properties('y': Name@63) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
@@ -123,7 +123,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     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
+    membersProtos = LinkedHashMap@81 // through DeserializedPackageMemberScope@76
     properties('Inner': Name@49) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
     properties('io': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
     properties('jvm': Name@78) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76

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

@@ -77,7 +77,7 @@ LazyJavaPackageFragment@35['io'] {
     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
+    membersProtos = LinkedHashMap@55 // through DeserializedPackageMemberScope@53
     properties('Inner': Name@44) = EmptyList@49[empty] // through DeserializedPackageMemberScope@53
 }
 
@@ -112,7 +112,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     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
+    membersProtos = LinkedHashMap@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

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

@@ -8,14 +8,14 @@ DeserializedClassDescriptor@2['Function1'] {
     containingDeclaration = LazyJavaPackageFragment@7['kotlin']
     defaultType = JetTypeImpl@8['Function1<2>']
     functions('invoke': Name@9) = ArrayList@10[1] { DeserializedSimpleFunctionDescriptor@11['invoke'] } // through DeserializedClassMemberScope@12
-    membersProtos = HashMap@13 // through DeserializedClassMemberScope@12
+    membersProtos = LinkedHashMap@13 // through DeserializedClassMemberScope@12
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@14['<this>']
 }
 
 DeserializedClassDescriptor@4['KFunction1'] {
     containingDeclaration = LazyJavaPackageFragment@15['reflect']
     functions('invoke': Name@9) = ArrayList@16[1] { DeserializedSimpleFunctionDescriptor@17['invoke'] } // through DeserializedClassMemberScope@18
-    membersProtos = HashMap@19 // through DeserializedClassMemberScope@18
+    membersProtos = LinkedHashMap@19 // through DeserializedClassMemberScope@18
 }
 
 DeserializedClassDescriptor@6['Unit'] {
@@ -61,11 +61,6 @@ DeserializedType@39['R in kotlin.reflect.KFunction1'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@33
 }
 
-DeserializedType@28['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@40
-    memberScope = DeserializedClassMemberScope@41
-}
-
 DeserializedType@35['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@40
     memberScope = DeserializedClassMemberScope@41
@@ -76,6 +71,11 @@ DeserializedType@42['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@41
 }
 
+DeserializedType@28['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@40
+    memberScope = DeserializedClassMemberScope@41
+}
+
 DeserializedType@43['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@40
 }
@@ -89,201 +89,205 @@ DeserializedType@44['kotlin.Function1'] {
     memberScope = SubstitutingScope@46
 }
 
-LazyJavaClassDescriptor@47['A'] {
-    enumEntryIndex = LinkedHashMap@48 // through LazyJavaClassMemberScope@49
+EnumEntryClassDescriptors@47 {
+    findEnumEntry('invoke': Name@9) = null
+}
+
+LazyJavaClassDescriptor@48['A'] {
+    enumEntryIndex = LinkedHashMap@49 // through LazyJavaClassMemberScope@50
     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']
+    functions('main': Name@51) = ArrayList@52[1] { JavaMethodDescriptor@53['main'] } // through LazyJavaStaticClassScope@54
+    memberIndex = computeMemberIndex$1@55 // through LazyJavaStaticClassScope@54
+    nestedClassIndex = LinkedHashMap@56 // through LazyJavaClassMemberScope@50
+    nestedClasses('main': Name@51) = null // through LazyJavaClassMemberScope@50
+    properties('main': Name@51) = EmptyList@57[empty] // through LazyJavaStaticClassScope@54
+    typeConstructor = LazyJavaClassTypeConstructor@58['A']
 }
 
-LazyJavaClassTypeConstructor@57['A'] {
-    parameters = ArrayList@58[empty]
+LazyJavaClassTypeConstructor@58['A'] {
+    parameters = ArrayList@59[empty]
 }
 
-LazyJavaClassifierType@59['String'] {
-    arguments = ArrayList@60[empty]
-    classifier = JavaClassImpl@61['String']
-    nullable = 'false': Boolean@62
-    typeConstructor = DeserializedClassTypeConstructor@63
+LazyJavaClassifierType@60['String'] {
+    arguments = ArrayList@61[empty]
+    classifier = JavaClassImpl@62['String']
+    nullable = 'false': Boolean@63
+    typeConstructor = DeserializedClassTypeConstructor@64
 }
 
-LazyJavaClassifierType@64['String'] {
-    arguments = ArrayList@65[empty]
-    classifier = JavaClassImpl@61['String']
-    nullable = 'true': Boolean@66
-    typeConstructor = DeserializedClassTypeConstructor@63
+LazyJavaClassifierType@65['String'] {
+    arguments = ArrayList@66[empty]
+    classifier = JavaClassImpl@62['String']
+    nullable = 'true': Boolean@67
+    typeConstructor = DeserializedClassTypeConstructor@64
 }
 
-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
-    topLevelClasses(JavaClassImpl@113['A']) = LazyJavaClassDescriptor@47['A']
+LazyJavaPackageFragmentProvider@68 {
+    packageFragments('<root>': FqName@69) = LazyJavaPackageFragment@70['<root>']
+    packageFragments('A': FqName@71) = null
+    packageFragments('Array': FqName@72) = null
+    packageFragments('KFunction1': FqName@73) = null
+    packageFragments('String': FqName@74) = null
+    packageFragments('Unit': 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.Array': FqName@81) = null
+    packageFragments('java.lang.KFunction1': FqName@82) = null
+    packageFragments('java.lang.String': FqName@83) = null
+    packageFragments('java.lang.Unit': FqName@84) = null
+    packageFragments('kotlin': FqName@85) = LazyJavaPackageFragment@7['kotlin']
+    packageFragments('kotlin.A': FqName@86) = null
+    packageFragments('kotlin.Array': FqName@87) = null
+    packageFragments('kotlin.KFunction1': FqName@88) = null
+    packageFragments('kotlin.String': FqName@89) = null
+    packageFragments('kotlin.Unit': FqName@90) = null
+    packageFragments('kotlin.io': FqName@91) = LazyJavaPackageFragment@92['io']
+    packageFragments('kotlin.io.A': FqName@93) = null
+    packageFragments('kotlin.io.Array': FqName@94) = null
+    packageFragments('kotlin.io.KFunction1': FqName@95) = null
+    packageFragments('kotlin.io.String': FqName@96) = null
+    packageFragments('kotlin.io.Unit': FqName@97) = null
+    packageFragments('kotlin.jvm': FqName@98) = LazyJavaPackageFragment@99['jvm']
+    packageFragments('kotlin.jvm.A': FqName@100) = null
+    packageFragments('kotlin.jvm.Array': FqName@101) = null
+    packageFragments('kotlin.jvm.KFunction1': FqName@102) = null
+    packageFragments('kotlin.jvm.String': FqName@103) = null
+    packageFragments('kotlin.jvm.Unit': FqName@104) = null
+    packageFragments('kotlin.reflect': FqName@105) = LazyJavaPackageFragment@15['reflect']
+    packageFragments('kotlin.reflect.A': FqName@106) = null
+    packageFragments('kotlin.reflect.Array': FqName@107) = null
+    packageFragments('kotlin.reflect.KFunction1': FqName@108) = null
+    packageFragments('kotlin.reflect.String': FqName@109) = null
+    packageFragments('kotlin.reflect.Unit': FqName@110) = null
+    packageFragments('test': FqName@111) = LazyJavaPackageFragment@112['test']
+    packageFragments('test.A': FqName@113) = null
+    topLevelClasses(JavaClassImpl@114['A']) = LazyJavaClassDescriptor@48['A']
 }
 
-LazyJavaPackageFragment@69['<root>'] {
-    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@70['<root>'] {
+    classes('A': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('Array': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('KFunction1': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('Unit': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('kotlin': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('test': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('invoke': Name@9) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('kotlin': Name@125) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('test': Name@126) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@116
 }
 
-LazyJavaPackageFragment@91['io'] {
-    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@121) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    deserializedPackageScope = DeserializedPackageMemberScope@128 // through LazyPackageFragmentScopeForJavaPackage@127
-    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@92['io'] {
+    classes('Array': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@128
+    classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@128
+    classes('Unit': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@128
+    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@128
+    classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@128
+    deserializedPackageScope = DeserializedPackageMemberScope@129 // through LazyPackageFragmentScopeForJavaPackage@128
+    functions('invoke': Name@9) = EmptyList@57[empty] // through DeserializedPackageMemberScope@129
+    functions('invoke': Name@9) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@128
+    functions('main2': Name@122) = EmptyList@57[empty] // through DeserializedPackageMemberScope@129
+    functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@128
+    memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@128
+    membersProtos = LinkedHashMap@131 // through DeserializedPackageMemberScope@129
 }
 
-LazyJavaPackageFragment@76['java'] {
-    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@77['java'] {
+    classes('lang': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@133
+    functions('lang': Name@134) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@133
+    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@133
 }
 
-LazyJavaPackageFragment@98['jvm'] {
-    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@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@99['jvm'] {
+    classes('Array': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('Unit': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('invoke': Name@9) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@136
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    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
+    classes('Any': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@139
+    classes('Array': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@139
+    classes('Function1': Name@140) = DeserializedClassDescriptor@2['Function1'] // through LazyPackageFragmentScopeForJavaPackage@139
+    classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@139
+    classes('Unit': Name@120) = DeserializedClassDescriptor@6['Unit'] // through LazyPackageFragmentScopeForJavaPackage@139
+    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@139
+    classes('io': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@139
+    classes('jvm': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@139
+    classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@139
+    classes('reflect': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@139
+    deserializedPackageScope = DeserializedPackageMemberScope@144 // through LazyPackageFragmentScopeForJavaPackage@139
+    functions('invoke': Name@9) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
+    functions('invoke': Name@9) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@139
+    functions('io': Name@145) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
+    functions('io': Name@145) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@139
+    functions('jvm': Name@146) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
+    functions('jvm': Name@146) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@139
+    functions('main2': Name@122) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
+    functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@139
+    functions('reflect': Name@147) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
+    functions('reflect': Name@147) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@139
+    memberIndex = computeMemberIndex$1@148 // through LazyPackageFragmentScopeForJavaPackage@139
+    membersProtos = LinkedHashMap@149 // through DeserializedPackageMemberScope@144
+    properties('io': Name@145) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
+    properties('jvm': Name@146) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
+    properties('reflect': Name@147) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
 }
 
-LazyJavaPackageFragment@78['lang'] {
-    classes('invoke': Name@9) = null // 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@79['lang'] {
+    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@150
+    classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@150
+    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@150
+    functions('invoke': Name@9) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@150
+    functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@150
+    memberIndex = computeMemberIndex$1@151 // through LazyPackageFragmentScopeForJavaPackage@150
 }
 
 LazyJavaPackageFragment@15['reflect'] {
-    classes('Array': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('KFunction1': Name@152) = DeserializedClassDescriptor@4['KFunction1'] // 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@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
+    classes('Array': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('KFunction1': Name@153) = DeserializedClassDescriptor@4['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('Unit': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@152
+    functions('invoke': Name@9) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@152
+    functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@152
+    memberIndex = computeMemberIndex$1@154 // through LazyPackageFragmentScopeForJavaPackage@152
 }
 
-LazyJavaPackageFragment@111['test'] {
-    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
+LazyJavaPackageFragment@112['test'] {
+    classes('A': Name@155) = LazyJavaClassDescriptor@48['A'] // through LazyPackageFragmentScopeForJavaPackage@156
+    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@156
+    functions('A': Name@157) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@156
+    memberIndex = computeMemberIndex$1@158 // through LazyPackageFragmentScopeForJavaPackage@156
 }
 
-NestedClassDescriptors@158 {
-    findClass('invoke': Name@9) = null
+NestedClassDescriptors@159 {
+    findNestedClass('invoke': Name@9) = null
 }
 
-TypeDeserializer@159 {
-    classDescriptors('2': Integer@160) = DeserializedClassDescriptor@161['Any']
-}
-
-TypeDeserializer@162 {
-    classDescriptors('2': Integer@160) = DeserializedClassDescriptor@161['Any']
+TypeDeserializer@160 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
 }
 
 TypeDeserializer@163 {
-    classDescriptors('3': Integer@164) = DeserializedClassDescriptor@161['Any']
-    classDescriptors('4': Integer@165) = DeserializedClassDescriptor@2['Function1']
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@164 {
+    classDescriptors('3': Integer@165) = DeserializedClassDescriptor@162['Any']
+    classDescriptors('4': Integer@166) = DeserializedClassDescriptor@2['Function1']
 }

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

@@ -59,7 +59,7 @@ LazyJavaPackageFragment@20['kotlin'] {
     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
+    membersProtos = LinkedHashMap@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

@@ -66,7 +66,7 @@ LazyJavaPackageFragment@31['io'] {
     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
+    membersProtos = LinkedHashMap@51 // through DeserializedPackageMemberScope@49
     properties('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@49
 }
 
@@ -101,7 +101,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     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@64
+    membersProtos = LinkedHashMap@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

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

@@ -73,7 +73,7 @@ LazyJavaPackageFragment@34['io'] {
     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
+    membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
     properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
     properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
 }
@@ -111,7 +111,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     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@71
+    membersProtos = LinkedHashMap@76 // through DeserializedPackageMemberScope@71
     properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
     properties('io': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
     properties('jvm': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71

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

@@ -72,7 +72,7 @@ LazyJavaPackageFragment@33['io'] {
     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
+    membersProtos = LinkedHashMap@54 // through DeserializedPackageMemberScope@52
     properties('A': Name@42) = EmptyList@48[empty] // through DeserializedPackageMemberScope@52
     properties('x': Name@46) = EmptyList@48[empty] // through DeserializedPackageMemberScope@52
 }
@@ -110,7 +110,7 @@ LazyJavaPackageFragment@7['kotlin'] {
     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@67
+    membersProtos = LinkedHashMap@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

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

@@ -73,7 +73,7 @@ LazyJavaPackageFragment@34['io'] {
     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
+    membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
     properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
     properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
 }
@@ -111,7 +111,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     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@71
+    membersProtos = LinkedHashMap@76 // through DeserializedPackageMemberScope@71
     properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
     properties('io': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
     properties('jvm': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71

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

@@ -46,7 +46,7 @@ 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
 }
@@ -56,7 +56,7 @@ DeserializedType@22['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -154,7 +154,7 @@ LazyJavaPackageFragment@60['io'] {
     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
+    membersProtos = LinkedHashMap@96 // 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
@@ -208,7 +208,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     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
+    membersProtos = LinkedHashMap@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

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

@@ -46,6 +46,11 @@ DeserializedTypeParameterDescriptor@23['R'] {
     upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
 }
 
+DeserializedType@22['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@27
+    memberScope = DeserializedClassMemberScope@28
+}
+
 DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
@@ -56,11 +61,6 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
 DeserializedType@29['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
 }
@@ -160,7 +160,7 @@ LazyJavaPackageFragment@63['io'] {
     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
+    membersProtos = LinkedHashMap@102 // 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
@@ -217,7 +217,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     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
+    membersProtos = LinkedHashMap@124 // through DeserializedPackageMemberScope@119
     properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
     properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
     properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119

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

@@ -166,7 +166,7 @@ LazyJavaPackageFragment@64['io'] {
     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
+    membersProtos = LinkedHashMap@103 // 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
@@ -229,7 +229,7 @@ LazyJavaPackageFragment@17['kotlin'] {
     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
+    membersProtos = LinkedHashMap@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

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

@@ -51,12 +51,12 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -160,7 +160,7 @@ LazyJavaPackageFragment@63['io'] {
     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
+    membersProtos = LinkedHashMap@102 // 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
@@ -217,7 +217,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     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
+    membersProtos = LinkedHashMap@124 // through DeserializedPackageMemberScope@119
     properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
     properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
     properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119

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

@@ -89,7 +89,7 @@ LazyJavaPackageFragment@41['io'] {
     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
+    membersProtos = LinkedHashMap@63 // through DeserializedPackageMemberScope@61
     properties('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@61
 }
 
@@ -128,7 +128,7 @@ LazyJavaPackageFragment@7['kotlin'] {
     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
+    membersProtos = LinkedHashMap@81 // through DeserializedPackageMemberScope@76
     properties('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
     properties('io': Name@77) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
     properties('jvm': Name@78) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76

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

@@ -38,7 +38,12 @@ DeserializedTypeParameterDescriptor@21['T'] {
     upperBoundsAsType = DeserializedType@24['kotlin.Any']
 }
 
-DeserializedType@20['kotlin.Any'] {
+DeserializedType@16['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@25
+    memberScope = DeserializedClassMemberScope@26
+}
+
+DeserializedType@24['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@25
     memberScope = DeserializedClassMemberScope@26
 }
@@ -48,12 +53,7 @@ DeserializedType@12['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@26
 }
 
-DeserializedType@16['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@25
-    memberScope = DeserializedClassMemberScope@26
-}
-
-DeserializedType@24['kotlin.Any'] {
+DeserializedType@20['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@25
     memberScope = DeserializedClassMemberScope@26
 }
@@ -130,7 +130,7 @@ LazyJavaPackageFragment@60['io'] {
     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
+    membersProtos = LinkedHashMap@89 // through DeserializedPackageMemberScope@87
     properties('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@87
 }
 
@@ -171,7 +171,7 @@ LazyJavaPackageFragment@7['kotlin'] {
     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
+    membersProtos = LinkedHashMap@107 // through DeserializedPackageMemberScope@102
     properties('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
     properties('io': Name@103) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
     properties('jvm': Name@104) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102

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

@@ -58,12 +58,12 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@34['kotlin.Any'] {
+DeserializedType@18['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@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -182,7 +182,7 @@ LazyJavaPackageFragment@71['io'] {
     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
+    membersProtos = LinkedHashMap@110 // through DeserializedPackageMemberScope@108
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
@@ -239,7 +239,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     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
+    membersProtos = LinkedHashMap@132 // through DeserializedPackageMemberScope@127
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127

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

@@ -58,6 +58,16 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
+DeserializedType@18['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@30['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
 DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
@@ -68,21 +78,11 @@ DeserializedType@34['kotlin.Any'] {
     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
 }
@@ -182,7 +182,7 @@ LazyJavaPackageFragment@71['io'] {
     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
+    membersProtos = LinkedHashMap@110 // through DeserializedPackageMemberScope@108
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
@@ -239,7 +239,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     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
+    membersProtos = LinkedHashMap@132 // through DeserializedPackageMemberScope@127
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127

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

@@ -58,11 +58,21 @@ 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
 }
 
+DeserializedType@18['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
 DeserializedType@34['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
@@ -73,16 +83,6 @@ DeserializedType@30['kotlin.Any'] {
     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
 }
@@ -183,7 +183,7 @@ LazyJavaPackageFragment@72['io'] {
     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
+    membersProtos = LinkedHashMap@111 // 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
@@ -240,7 +240,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     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
+    membersProtos = LinkedHashMap@133 // through DeserializedPackageMemberScope@128
     properties('bar': Name@100) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
     properties('baz': Name@101) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
     properties('foo': Name@102) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128

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

@@ -58,12 +58,7 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -73,7 +68,7 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -83,6 +78,11 @@ DeserializedType@18['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
+DeserializedType@26['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
 DeserializedType@37['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
 }
@@ -182,7 +182,7 @@ LazyJavaPackageFragment@71['io'] {
     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
+    membersProtos = LinkedHashMap@110 // through DeserializedPackageMemberScope@108
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
@@ -236,7 +236,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     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
+    membersProtos = LinkedHashMap@129 // through DeserializedPackageMemberScope@124
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124

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

@@ -72,7 +72,7 @@ LazyJavaPackageFragment@35['io'] {
     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
+    membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
     properties('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
     properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
     properties('y': Name@59) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
@@ -109,7 +109,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     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
+    membersProtos = LinkedHashMap@77 // through DeserializedPackageMemberScope@72
     properties('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
     properties('io': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
     properties('jvm': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72

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

@@ -73,7 +73,7 @@ LazyJavaPackageFragment@34['io'] {
     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
+    membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
     properties('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
     properties('y': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
 }
@@ -111,7 +111,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     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
+    membersProtos = LinkedHashMap@76 // through DeserializedPackageMemberScope@71
     properties('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
     properties('io': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
     properties('jvm': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71

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

@@ -79,7 +79,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     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@57
+    membersProtos = LinkedHashMap@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

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

@@ -51,7 +51,7 @@ LazyJavaPackageFragment@24['io'] {
     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
+    membersProtos = LinkedHashMap@36 // through DeserializedPackageMemberScope@34
     properties('bar': Name@28) = EmptyList@31[empty] // through DeserializedPackageMemberScope@34
 }
 
@@ -83,7 +83,7 @@ LazyJavaPackageFragment@7['kotlin'] {
     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
+    membersProtos = LinkedHashMap@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

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

@@ -88,7 +88,7 @@ LazyJavaPackageFragment@40['io'] {
     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
+    membersProtos = LinkedHashMap@63 // through DeserializedPackageMemberScope@61
     properties('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@61
 }
 
@@ -125,7 +125,7 @@ LazyJavaPackageFragment@7['kotlin'] {
     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
+    membersProtos = LinkedHashMap@81 // through DeserializedPackageMemberScope@76
     properties('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
     properties('io': Name@77) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
     properties('jvm': Name@78) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76

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

@@ -27,12 +27,12 @@ DeserializedTypeParameterDescriptor@13['T'] {
     upperBoundsAsType = DeserializedType@16['kotlin.Any']
 }
 
-DeserializedType@16['kotlin.Any'] {
+DeserializedType@12['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@17
     memberScope = DeserializedClassMemberScope@18
 }
 
-DeserializedType@12['kotlin.Any'] {
+DeserializedType@16['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@17
     memberScope = DeserializedClassMemberScope@18
 }
@@ -93,7 +93,7 @@ LazyJavaPackageFragment@41['io'] {
     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
+    membersProtos = LinkedHashMap@64 // through DeserializedPackageMemberScope@62
     properties('foo': Name@55) = EmptyList@58[empty] // through DeserializedPackageMemberScope@62
     properties('x': Name@65) = EmptyList@58[empty] // through DeserializedPackageMemberScope@62
 }
@@ -131,7 +131,7 @@ LazyJavaPackageFragment@7['kotlin'] {
     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
+    membersProtos = LinkedHashMap@83 // through DeserializedPackageMemberScope@78
     properties('foo': Name@55) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78
     properties('io': Name@79) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78
     properties('jvm': Name@80) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78

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

@@ -78,12 +78,7 @@ DeserializedType@22['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@44
 }
 
-DeserializedType@42['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@43
-    memberScope = DeserializedClassMemberScope@44
-}
-
-DeserializedType@34['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@43
     memberScope = DeserializedClassMemberScope@44
 }
@@ -93,12 +88,17 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@44
 }
 
-DeserializedType@38['kotlin.Any'] {
+DeserializedType@34['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@43
     memberScope = DeserializedClassMemberScope@44
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@42['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@43
+    memberScope = DeserializedClassMemberScope@44
+}
+
+DeserializedType@38['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@43
     memberScope = DeserializedClassMemberScope@44
 }
@@ -230,7 +230,7 @@ LazyJavaPackageFragment@88['io'] {
     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
+    membersProtos = LinkedHashMap@142 // through DeserializedPackageMemberScope@140
     properties('bar': Name@128) = EmptyList@134[empty] // through DeserializedPackageMemberScope@140
     properties('bazbaz': Name@129) = EmptyList@134[empty] // through DeserializedPackageMemberScope@140
     properties('foofoo': Name@130) = EmptyList@134[empty] // through DeserializedPackageMemberScope@140
@@ -285,7 +285,7 @@ LazyJavaPackageFragment@17['kotlin'] {
     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
+    membersProtos = LinkedHashMap@162 // through DeserializedPackageMemberScope@157
     properties('bar': Name@128) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
     properties('bazbaz': Name@129) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
     properties('foofoo': Name@130) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157

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

@@ -155,7 +155,7 @@ LazyJavaPackageFragment@61['io'] {
     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
+    membersProtos = LinkedHashMap@97 // 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
@@ -212,7 +212,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     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
+    membersProtos = LinkedHashMap@119 // through DeserializedPackageMemberScope@114
     properties('bar': Name@86) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
     properties('baz': Name@87) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
     properties('foo': Name@88) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.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
 }
@@ -160,7 +160,7 @@ LazyJavaPackageFragment@63['io'] {
     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
+    membersProtos = LinkedHashMap@102 // 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
@@ -217,7 +217,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     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
+    membersProtos = LinkedHashMap@124 // through DeserializedPackageMemberScope@119
     properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
     properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
     properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119

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@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
 DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
@@ -61,6 +56,11 @@ DeserializedType@18['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
+DeserializedType@26['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@27
+    memberScope = DeserializedClassMemberScope@28
+}
+
 DeserializedType@29['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
 }
@@ -161,7 +161,7 @@ LazyJavaPackageFragment@64['io'] {
     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
+    membersProtos = LinkedHashMap@103 // 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
@@ -218,7 +218,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     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
+    membersProtos = LinkedHashMap@125 // through DeserializedPackageMemberScope@120
     properties('bar': Name@92) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
     properties('baz': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
     properties('foo': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.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@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
@@ -56,11 +61,6 @@ DeserializedType@22['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
 DeserializedType@29['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
 }
@@ -154,7 +154,7 @@ LazyJavaPackageFragment@60['io'] {
     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
+    membersProtos = LinkedHashMap@96 // 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
@@ -208,7 +208,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     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
+    membersProtos = LinkedHashMap@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

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

@@ -63,7 +63,7 @@ LazyJavaPackageFragment@28['io'] {
     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
+    membersProtos = LinkedHashMap@46 // through DeserializedPackageMemberScope@44
     properties('bar': Name@38) = EmptyList@41[empty] // through DeserializedPackageMemberScope@44
     properties('foo': Name@39) = EmptyList@41[empty] // through DeserializedPackageMemberScope@44
 }
@@ -103,7 +103,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     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
+    membersProtos = LinkedHashMap@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

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

@@ -13,7 +13,7 @@ DescriptorResolver@7 {
 DeserializedClassDescriptor@2['KCallable'] {
     containingDeclaration = LazyJavaPackageFragment@11['reflect']
     functions('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@14
-    membersProtos = HashMap@15 // through DeserializedClassMemberScope@14
+    membersProtos = LinkedHashMap@15 // through DeserializedClassMemberScope@14
     properties('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@14
 }
 
@@ -21,7 +21,7 @@ DeserializedClassDescriptor@4['KMemberProperty'] {
     containingDeclaration = LazyJavaPackageFragment@11['reflect']
     defaultType = JetTypeImpl@16['KMemberProperty<2>']
     functions('get': Name@12) = ArrayList@17[1] { DeserializedSimpleFunctionDescriptor@18['get'] } // through DeserializedClassMemberScope@19
-    membersProtos = HashMap@20 // through DeserializedClassMemberScope@19
+    membersProtos = LinkedHashMap@20 // through DeserializedClassMemberScope@19
     properties('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@19
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@21['<this>']
 }
@@ -29,7 +29,7 @@ DeserializedClassDescriptor@4['KMemberProperty'] {
 DeserializedClassDescriptor@6['KProperty'] {
     containingDeclaration = LazyJavaPackageFragment@11['reflect']
     functions('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@22
-    membersProtos = HashMap@23 // through DeserializedClassMemberScope@22
+    membersProtos = LinkedHashMap@23 // through DeserializedClassMemberScope@22
     properties('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@22
 }
 
@@ -66,12 +66,12 @@ DeserializedType@28['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@41
 }
 
-DeserializedType@37['kotlin.Any'] {
+DeserializedType@42['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@40
     memberScope = DeserializedClassMemberScope@41
 }
 
-DeserializedType@42['kotlin.Any'] {
+DeserializedType@37['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@40
     memberScope = DeserializedClassMemberScope@41
 }
@@ -102,238 +102,242 @@ DeserializedType@52['kotlin.reflect.KProperty'] {
     memberScope = SubstitutingScope@54
 }
 
-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
+EnumEntryClassDescriptors@55 {
+    findEnumEntry('get': Name@12) = null
 }
 
-LazyJavaPackageFragment@57['<root>'] {
-    classes('A': Name@111) = 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@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
+LazyJavaPackageFragmentProvider@56 {
+    packageFragments('<root>': FqName@57) = LazyJavaPackageFragment@58['<root>']
+    packageFragments('A': FqName@59) = null
+    packageFragments('Any': FqName@60) = null
+    packageFragments('B': FqName@61) = null
+    packageFragments('Base': FqName@62) = null
+    packageFragments('C': FqName@63) = null
+    packageFragments('Int': FqName@64) = null
+    packageFragments('KMemberProperty': FqName@65) = null
+    packageFragments('Number': FqName@66) = null
+    packageFragments('String': FqName@67) = null
+    packageFragments('java': FqName@68) = LazyJavaPackageFragment@69['java']
+    packageFragments('java.lang': FqName@70) = LazyJavaPackageFragment@71['lang']
+    packageFragments('java.lang.A': FqName@72) = null
+    packageFragments('java.lang.Any': FqName@73) = null
+    packageFragments('java.lang.B': FqName@74) = null
+    packageFragments('java.lang.Base': FqName@75) = null
+    packageFragments('java.lang.Int': FqName@76) = null
+    packageFragments('java.lang.KMemberProperty': FqName@77) = null
+    packageFragments('java.lang.Number': FqName@78) = null
+    packageFragments('java.lang.String': FqName@79) = null
+    packageFragments('kotlin': FqName@80) = LazyJavaPackageFragment@81['kotlin']
+    packageFragments('kotlin.A': FqName@82) = null
+    packageFragments('kotlin.Any': FqName@83) = null
+    packageFragments('kotlin.B': FqName@84) = null
+    packageFragments('kotlin.Base': FqName@85) = null
+    packageFragments('kotlin.Int': FqName@86) = null
+    packageFragments('kotlin.KMemberProperty': FqName@87) = null
+    packageFragments('kotlin.Number': FqName@88) = null
+    packageFragments('kotlin.String': FqName@89) = null
+    packageFragments('kotlin.io': FqName@90) = LazyJavaPackageFragment@91['io']
+    packageFragments('kotlin.io.A': FqName@92) = null
+    packageFragments('kotlin.io.Any': FqName@93) = null
+    packageFragments('kotlin.io.B': FqName@94) = null
+    packageFragments('kotlin.io.Base': FqName@95) = null
+    packageFragments('kotlin.io.Int': FqName@96) = null
+    packageFragments('kotlin.io.KMemberProperty': FqName@97) = null
+    packageFragments('kotlin.io.Number': FqName@98) = null
+    packageFragments('kotlin.io.String': FqName@99) = null
+    packageFragments('kotlin.jvm': FqName@100) = LazyJavaPackageFragment@101['jvm']
+    packageFragments('kotlin.jvm.A': FqName@102) = null
+    packageFragments('kotlin.jvm.Any': FqName@103) = null
+    packageFragments('kotlin.jvm.B': FqName@104) = null
+    packageFragments('kotlin.jvm.Base': FqName@105) = null
+    packageFragments('kotlin.jvm.Int': FqName@106) = null
+    packageFragments('kotlin.jvm.KMemberProperty': FqName@107) = null
+    packageFragments('kotlin.jvm.Number': FqName@108) = null
+    packageFragments('kotlin.jvm.String': FqName@109) = null
+    packageFragments('kotlin.reflect': FqName@110) = LazyJavaPackageFragment@11['reflect']
+    packageFragments('kotlin.reflect.KMemberProperty': FqName@111) = null
 }
 
-LazyJavaPackageFragment@90['io'] {
-    classes('A': Name@111) = 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@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('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('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@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@122) = EmptyList@13[empty] // through DeserializedPackageMemberScope@127
+LazyJavaPackageFragment@58['<root>'] {
+    classes('A': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('Any': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('B': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('C': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('Int': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('KMemberProperty': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('Number': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('String': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('invoke': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('kotlin': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('x': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('A': Name@112) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('B': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('C': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('invoke': Name@121) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('kotlin': Name@125) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('x': Name@123) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    memberIndex = computeMemberIndex$1@126 // through LazyPackageFragmentScopeForJavaPackage@113
 }
 
-LazyJavaPackageFragment@68['java'] {
-    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@91['io'] {
+    classes('A': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('Any': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('B': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('C': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('Int': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('Number': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('String': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('invoke': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('x': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@127
+    deserializedPackageScope = DeserializedPackageMemberScope@128 // through LazyPackageFragmentScopeForJavaPackage@127
+    functions('A': Name@112) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
+    functions('A': Name@112) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@127
+    functions('B': Name@115) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
+    functions('B': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@127
+    functions('C': Name@116) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
+    functions('C': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@127
+    functions('get': Name@12) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
+    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@127
+    functions('invoke': Name@121) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
+    functions('invoke': Name@121) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@127
+    functions('x': Name@123) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
+    functions('x': Name@123) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@127
+    memberIndex = computeMemberIndex$1@129 // through LazyPackageFragmentScopeForJavaPackage@127
+    membersProtos = LinkedHashMap@130 // through DeserializedPackageMemberScope@128
+    properties('A': Name@112) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
+    properties('B': Name@115) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
+    properties('C': Name@116) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
+    properties('get': Name@12) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
+    properties('x': Name@123) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
 }
 
-LazyJavaPackageFragment@100['jvm'] {
-    classes('A': Name@111) = 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@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@69['java'] {
+    classes('lang': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('lang': Name@133) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@132
 }
 
-LazyJavaPackageFragment@80['kotlin'] {
-    classes('A': Name@111) = 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@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@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@101['jvm'] {
+    classes('A': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('Any': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('B': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('C': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('Int': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('Number': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('String': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('invoke': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('x': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@135
+    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@135
+    functions('A': Name@112) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@135
+    functions('B': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@135
+    functions('C': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@135
+    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@135
+    functions('invoke': Name@121) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@135
+    functions('x': Name@123) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@135
+    memberIndex = computeMemberIndex$1@136 // through LazyPackageFragmentScopeForJavaPackage@135
 }
 
-LazyJavaPackageFragment@70['lang'] {
-    classes('A': Name@111) = 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@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@81['kotlin'] {
+    classes('A': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('Any': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('B': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('C': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('CharSequence': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('Int': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('Number': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('String': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('invoke': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('io': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('jvm': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('reflect': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('x': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    deserializedPackageScope = DeserializedPackageMemberScope@142 // through LazyPackageFragmentScopeForJavaPackage@137
+    functions('A': Name@112) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
+    functions('A': Name@112) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@137
+    functions('B': Name@115) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
+    functions('B': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@137
+    functions('C': Name@116) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
+    functions('C': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@137
+    functions('get': Name@12) = ArrayList@143[2] { DeserializedSimpleFunctionDescriptor@144['get'], DeserializedSimpleFunctionDescriptor@145['get'] } // through DeserializedPackageMemberScope@142
+    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@137
+    functions('invoke': Name@121) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
+    functions('invoke': Name@121) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@137
+    functions('io': Name@146) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
+    functions('io': Name@146) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@137
+    functions('jvm': Name@147) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
+    functions('jvm': Name@147) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@137
+    functions('reflect': Name@148) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
+    functions('reflect': Name@148) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@137
+    functions('x': Name@123) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
+    functions('x': Name@123) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@137
+    memberIndex = computeMemberIndex$1@149 // through LazyPackageFragmentScopeForJavaPackage@137
+    membersProtos = LinkedHashMap@150 // through DeserializedPackageMemberScope@142
+    properties('A': Name@112) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
+    properties('B': Name@115) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
+    properties('C': Name@116) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
+    properties('get': Name@12) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
+    properties('io': Name@146) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
+    properties('jvm': Name@147) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
+    properties('reflect': Name@148) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
+    properties('x': Name@123) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
+}
+
+LazyJavaPackageFragment@71['lang'] {
+    classes('A': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@151
+    classes('B': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@151
+    classes('C': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@151
+    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@151
+    classes('invoke': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@151
+    classes('x': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@151
+    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@151
+    functions('A': Name@112) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@151
+    functions('B': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@151
+    functions('C': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@151
+    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@151
+    functions('invoke': Name@121) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@151
+    functions('x': Name@123) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@151
+    memberIndex = computeMemberIndex$1@152 // through LazyPackageFragmentScopeForJavaPackage@151
 }
 
 LazyJavaPackageFragment@11['reflect'] {
-    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
+    classes('KCallable': Name@153) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@154
+    classes('KMemberProperty': Name@155) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@154
+    classes('KProperty': Name@156) = DeserializedClassDescriptor@6['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@154
+    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@154
+    functions('KMemberProperty': Name@157) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@154
+    memberIndex = computeMemberIndex$1@158 // through LazyPackageFragmentScopeForJavaPackage@154
 }
 
-NestedClassDescriptors@158 {
-    findClass('get': Name@12) = null
+NestedClassDescriptors@159 {
+    findNestedClass('get': Name@12) = null
 }
 
-TypeDeserializer@159 {
-    classDescriptors('20': Integer@160) = DeserializedClassDescriptor@161['Int']
-    classDescriptors('59': Integer@162) = DeserializedClassDescriptor@163['CharSequence']
-}
-
-TypeDeserializer@164 {
-    classDescriptors('20': Integer@160) = DeserializedClassDescriptor@161['Int']
-    classDescriptors('59': Integer@162) = DeserializedClassDescriptor@163['CharSequence']
+TypeDeserializer@160 {
+    classDescriptors('22': Integer@161) = DeserializedClassDescriptor@162['Int']
+    classDescriptors('40': Integer@163) = DeserializedClassDescriptor@164['CharSequence']
 }
 
 TypeDeserializer@165 {
-    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@167['Any']
-    classDescriptors('4': Integer@168) = DeserializedClassDescriptor@6['KProperty']
+    classDescriptors('22': Integer@161) = DeserializedClassDescriptor@162['Int']
+    classDescriptors('40': Integer@163) = DeserializedClassDescriptor@164['CharSequence']
 }
 
-TypeDeserializer@169 {
-    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@167['Any']
+TypeDeserializer@166 {
+    classDescriptors('3': Integer@167) = DeserializedClassDescriptor@168['Any']
+    classDescriptors('4': Integer@169) = DeserializedClassDescriptor@6['KProperty']
 }
 
 TypeDeserializer@170 {
-    classDescriptors('4': Integer@168) = DeserializedClassDescriptor@2['KCallable']
+    classDescriptors('3': Integer@167) = DeserializedClassDescriptor@168['Any']
+}
+
+TypeDeserializer@171 {
+    classDescriptors('4': Integer@169) = DeserializedClassDescriptor@2['KCallable']
 }

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

@@ -11,7 +11,7 @@ DescriptorResolver@7 {
 DeserializedClassDescriptor@2['KCallable'] {
     containingDeclaration = LazyJavaPackageFragment@9['reflect']
     functions('get': Name@10) = EmptyList@11[empty] // through DeserializedClassMemberScope@12
-    membersProtos = HashMap@13 // through DeserializedClassMemberScope@12
+    membersProtos = LinkedHashMap@13 // through DeserializedClassMemberScope@12
     properties('get': Name@10) = EmptyList@11[empty] // through DeserializedClassMemberScope@12
 }
 
@@ -19,7 +19,7 @@ DeserializedClassDescriptor@4['KMemberProperty'] {
     containingDeclaration = LazyJavaPackageFragment@9['reflect']
     defaultType = JetTypeImpl@14['KMemberProperty<2>']
     functions('get': Name@10) = ArrayList@15[1] { DeserializedSimpleFunctionDescriptor@16['get'] } // through DeserializedClassMemberScope@17
-    membersProtos = HashMap@18 // through DeserializedClassMemberScope@17
+    membersProtos = LinkedHashMap@18 // through DeserializedClassMemberScope@17
     properties('get': Name@10) = EmptyList@11[empty] // through DeserializedClassMemberScope@17
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
 }
@@ -27,7 +27,7 @@ DeserializedClassDescriptor@4['KMemberProperty'] {
 DeserializedClassDescriptor@6['KProperty'] {
     containingDeclaration = LazyJavaPackageFragment@9['reflect']
     functions('get': Name@10) = EmptyList@11[empty] // through DeserializedClassMemberScope@20
-    membersProtos = HashMap@21 // through DeserializedClassMemberScope@20
+    membersProtos = LinkedHashMap@21 // through DeserializedClassMemberScope@20
     properties('get': Name@10) = EmptyList@11[empty] // through DeserializedClassMemberScope@20
 }
 
@@ -59,19 +59,19 @@ DeserializedType@37['T in kotlin.reflect.KMemberProperty'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@33
 }
 
-DeserializedType@35['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@38
-    memberScope = DeserializedClassMemberScope@39
-}
-
-DeserializedType@40['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@38
-    memberScope = DeserializedClassMemberScope@39
+DeserializedType@38['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@39
+    memberScope = DeserializedClassMemberScope@40
 }
 
 DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@38
-    memberScope = DeserializedClassMemberScope@39
+    constructor = DeserializedClassTypeConstructor@39
+    memberScope = DeserializedClassMemberScope@40
+}
+
+DeserializedType@35['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@39
+    memberScope = DeserializedClassMemberScope@40
 }
 
 DeserializedType@41['kotlin.reflect.KCallable'] {
@@ -84,163 +84,167 @@ DeserializedType@44['kotlin.reflect.KProperty'] {
     memberScope = SubstitutingScope@46
 }
 
-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
+EnumEntryClassDescriptors@47 {
+    findEnumEntry('get': Name@10) = null
 }
 
-LazyJavaPackageFragment@49['<root>'] {
-    classes('Derived': Name@78) = 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@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
+LazyJavaPackageFragmentProvider@48 {
+    packageFragments('<root>': FqName@49) = LazyJavaPackageFragment@50['<root>']
+    packageFragments('Base': FqName@51) = null
+    packageFragments('Derived': FqName@52) = null
+    packageFragments('Int': FqName@53) = null
+    packageFragments('KMemberProperty': FqName@54) = null
+    packageFragments('java': FqName@55) = LazyJavaPackageFragment@56['java']
+    packageFragments('java.lang': FqName@57) = LazyJavaPackageFragment@58['lang']
+    packageFragments('java.lang.Base': FqName@59) = null
+    packageFragments('java.lang.Int': FqName@60) = null
+    packageFragments('java.lang.KMemberProperty': FqName@61) = null
+    packageFragments('kotlin': FqName@62) = LazyJavaPackageFragment@63['kotlin']
+    packageFragments('kotlin.Base': FqName@64) = null
+    packageFragments('kotlin.Int': FqName@65) = null
+    packageFragments('kotlin.KMemberProperty': FqName@66) = null
+    packageFragments('kotlin.io': FqName@67) = LazyJavaPackageFragment@68['io']
+    packageFragments('kotlin.io.Base': FqName@69) = null
+    packageFragments('kotlin.io.Int': FqName@70) = null
+    packageFragments('kotlin.io.KMemberProperty': FqName@71) = null
+    packageFragments('kotlin.jvm': FqName@72) = LazyJavaPackageFragment@73['jvm']
+    packageFragments('kotlin.jvm.Base': FqName@74) = null
+    packageFragments('kotlin.jvm.Int': FqName@75) = null
+    packageFragments('kotlin.jvm.KMemberProperty': FqName@76) = null
+    packageFragments('kotlin.reflect': FqName@77) = LazyJavaPackageFragment@9['reflect']
+    packageFragments('kotlin.reflect.KMemberProperty': FqName@78) = null
 }
 
-LazyJavaPackageFragment@67['io'] {
-    classes('Derived': Name@78) = 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@83) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = DeserializedPackageMemberScope@89 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('Derived': Name@78) = 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('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@82) = EmptyList@11[empty] // through DeserializedPackageMemberScope@89
-    properties('get': Name@10) = EmptyList@11[empty] // through DeserializedPackageMemberScope@89
+LazyJavaPackageFragment@50['<root>'] {
+    classes('Derived': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('Int': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('KMemberProperty': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('get': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('invoke': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('kotlin': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('Derived': Name@79) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('foo': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('get': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('invoke': Name@84) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('kotlin': Name@87) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@80
 }
 
-LazyJavaPackageFragment@55['java'] {
-    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@68['io'] {
+    classes('Derived': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('Int': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('get': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('invoke': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    deserializedPackageScope = DeserializedPackageMemberScope@90 // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('Derived': Name@79) = EmptyList@11[empty] // through DeserializedPackageMemberScope@90
+    functions('Derived': Name@79) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('foo': Name@83) = EmptyList@11[empty] // through DeserializedPackageMemberScope@90
+    functions('foo': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('get': Name@10) = EmptyList@11[empty] // through DeserializedPackageMemberScope@90
+    functions('get': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('invoke': Name@84) = EmptyList@11[empty] // through DeserializedPackageMemberScope@90
+    functions('invoke': Name@84) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@89
+    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@89
+    membersProtos = LinkedHashMap@92 // through DeserializedPackageMemberScope@90
+    properties('Derived': Name@79) = EmptyList@11[empty] // through DeserializedPackageMemberScope@90
+    properties('foo': Name@83) = EmptyList@11[empty] // through DeserializedPackageMemberScope@90
+    properties('get': Name@10) = EmptyList@11[empty] // through DeserializedPackageMemberScope@90
 }
 
-LazyJavaPackageFragment@72['jvm'] {
-    classes('Derived': Name@78) = 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@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@56['java'] {
+    classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('lang': Name@95) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
 }
 
-LazyJavaPackageFragment@62['kotlin'] {
-    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@73['jvm'] {
+    classes('Derived': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('Int': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('get': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('invoke': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@97
+    functions('Derived': Name@79) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@97
+    functions('foo': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@97
+    functions('get': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@97
+    functions('invoke': Name@84) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@97
+    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@97
 }
 
-LazyJavaPackageFragment@57['lang'] {
-    classes('Derived': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('foo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('get': Name@10) = null // 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@63['kotlin'] {
+    classes('Any': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('Derived': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('Int': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('get': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('invoke': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('io': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('jvm': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('reflect': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    deserializedPackageScope = DeserializedPackageMemberScope@104 // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('Derived': Name@79) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
+    functions('Derived': Name@79) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('foo': Name@83) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
+    functions('foo': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('get': Name@10) = ArrayList@105[2] { DeserializedSimpleFunctionDescriptor@106['get'], DeserializedSimpleFunctionDescriptor@107['get'] } // through DeserializedPackageMemberScope@104
+    functions('get': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('invoke': Name@84) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
+    functions('invoke': Name@84) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('io': Name@108) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
+    functions('io': Name@108) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('jvm': Name@109) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
+    functions('jvm': Name@109) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('reflect': Name@110) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
+    functions('reflect': Name@110) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@100
+    membersProtos = LinkedHashMap@112 // through DeserializedPackageMemberScope@104
+    properties('Derived': Name@79) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
+    properties('foo': Name@83) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
+    properties('get': Name@10) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
+    properties('io': Name@108) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
+    properties('jvm': Name@109) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
+    properties('reflect': Name@110) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
+}
+
+LazyJavaPackageFragment@58['lang'] {
+    classes('Derived': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('get': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('invoke': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('Derived': Name@79) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('foo': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('get': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('invoke': Name@84) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@113
 }
 
 LazyJavaPackageFragment@9['reflect'] {
-    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
+    classes('KCallable': Name@115) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('KMemberProperty': Name@117) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('KProperty': Name@118) = DeserializedClassDescriptor@6['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@116
+    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('KMemberProperty': Name@119) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@116
 }
 
-NestedClassDescriptors@120 {
-    findClass('get': Name@10) = null
+NestedClassDescriptors@121 {
+    findNestedClass('get': Name@10) = null
 }
 
-TypeDeserializer@121 {
-    classDescriptors('3': Integer@122) = DeserializedClassDescriptor@123['Any']
-    classDescriptors('4': Integer@124) = DeserializedClassDescriptor@6['KProperty']
-}
-
-TypeDeserializer@125 {
-    classDescriptors('3': Integer@122) = DeserializedClassDescriptor@123['Any']
+TypeDeserializer@122 {
+    classDescriptors('3': Integer@123) = DeserializedClassDescriptor@124['Any']
+    classDescriptors('4': Integer@125) = DeserializedClassDescriptor@6['KProperty']
 }
 
 TypeDeserializer@126 {
-    classDescriptors('4': Integer@124) = DeserializedClassDescriptor@2['KCallable']
+    classDescriptors('3': Integer@123) = DeserializedClassDescriptor@124['Any']
+}
+
+TypeDeserializer@127 {
+    classDescriptors('4': Integer@125) = DeserializedClassDescriptor@2['KCallable']
 }

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

@@ -118,7 +118,7 @@ LazyJavaPackageFragment@48['io'] {
     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
+    membersProtos = LinkedHashMap@79 // through DeserializedPackageMemberScope@77
     properties('f': Name@68) = EmptyList@73[empty] // through DeserializedPackageMemberScope@77
     properties('g': Name@69) = EmptyList@73[empty] // through DeserializedPackageMemberScope@77
 }
@@ -165,7 +165,7 @@ LazyJavaPackageFragment@42['kotlin'] {
     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
+    membersProtos = LinkedHashMap@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

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

@@ -78,11 +78,11 @@ DeserializedTypeParameterDescriptor@40['T'] {
 }
 
 DeserializedType@42['R in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@27
+    constructor = AbstractLazyTypeParameterDescriptor$1@29
 }
 
 DeserializedType@43['R in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@29
+    constructor = AbstractLazyTypeParameterDescriptor$1@27
 }
 
 DeserializedType@44['T in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
@@ -93,12 +93,12 @@ DeserializedType@45['T in kotlin.reflect.KTopLevelExtensionProperty'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@39
 }
 
-DeserializedType@25['kotlin.Any'] {
+DeserializedType@33['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@46
     memberScope = DeserializedClassMemberScope@47
 }
 
-DeserializedType@33['kotlin.Any'] {
+DeserializedType@25['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@46
     memberScope = DeserializedClassMemberScope@47
 }
@@ -224,7 +224,7 @@ LazyJavaPackageFragment@93['io'] {
     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
+    membersProtos = LinkedHashMap@128 // through DeserializedPackageMemberScope@126
     properties('bar': Name@117) = EmptyList@122[empty] // through DeserializedPackageMemberScope@126
     properties('foo': Name@118) = EmptyList@122[empty] // through DeserializedPackageMemberScope@126
 }
@@ -273,7 +273,7 @@ LazyJavaPackageFragment@86['kotlin'] {
     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
+    membersProtos = LinkedHashMap@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

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

@@ -15,7 +15,7 @@ DeserializedClassDescriptor@2['KCallable'] {
     containingDeclaration = LazyJavaPackageFragment@21['reflect']
     functions('get': Name@22) = EmptyList@23[empty] // through DeserializedClassMemberScope@24
     functions('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@24
-    membersProtos = HashMap@26 // through DeserializedClassMemberScope@24
+    membersProtos = LinkedHashMap@26 // through DeserializedClassMemberScope@24
     properties('get': Name@22) = EmptyList@23[empty] // through DeserializedClassMemberScope@24
     properties('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@24
 }
@@ -25,7 +25,7 @@ DeserializedClassDescriptor@4['KExtensionProperty'] {
     defaultType = JetTypeImpl@27['KExtensionProperty<2>']
     functions('get': Name@22) = ArrayList@28[1] { DeserializedSimpleFunctionDescriptor@29['get'] } // through DeserializedClassMemberScope@30
     functions('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@30
-    membersProtos = HashMap@31 // through DeserializedClassMemberScope@30
+    membersProtos = LinkedHashMap@31 // through DeserializedClassMemberScope@30
     properties('get': Name@22) = EmptyList@23[empty] // through DeserializedClassMemberScope@30
     properties('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@30
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@32['<this>']
@@ -36,7 +36,7 @@ DeserializedClassDescriptor@6['KMutableExtensionProperty'] {
     defaultType = JetTypeImpl@33['KMutableExtensionProperty<2>']
     functions('get': Name@34) = ArrayList@35[1] { DeserializedSimpleFunctionDescriptor@36['get'] } // through DeserializedClassMemberScope@37
     functions('set': Name@38) = ArrayList@39[1] { DeserializedSimpleFunctionDescriptor@40['set'] } // through DeserializedClassMemberScope@37
-    membersProtos = HashMap@41 // through DeserializedClassMemberScope@37
+    membersProtos = LinkedHashMap@41 // through DeserializedClassMemberScope@37
     properties('get': Name@34) = EmptyList@23[empty] // through DeserializedClassMemberScope@37
     properties('set': Name@38) = EmptyList@23[empty] // through DeserializedClassMemberScope@37
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@42['<this>']
@@ -46,7 +46,7 @@ DeserializedClassDescriptor@8['KMutableProperty'] {
     containingDeclaration = LazyJavaPackageFragment@21['reflect']
     functions('get': Name@34) = EmptyList@23[empty] // through DeserializedClassMemberScope@43
     functions('set': Name@38) = EmptyList@23[empty] // through DeserializedClassMemberScope@43
-    membersProtos = HashMap@44 // through DeserializedClassMemberScope@43
+    membersProtos = LinkedHashMap@44 // through DeserializedClassMemberScope@43
     properties('get': Name@34) = EmptyList@23[empty] // through DeserializedClassMemberScope@43
     properties('set': Name@38) = EmptyList@23[empty] // through DeserializedClassMemberScope@43
 }
@@ -55,7 +55,7 @@ DeserializedClassDescriptor@10['KMutableTopLevelExtensionProperty'] {
     containingDeclaration = LazyJavaPackageFragment@21['reflect']
     functions('get': Name@34) = ArrayList@45[1] { DeserializedSimpleFunctionDescriptor@46['get'] } // through DeserializedClassMemberScope@47
     functions('set': Name@38) = ArrayList@48[1] { DeserializedSimpleFunctionDescriptor@49['set'] } // through DeserializedClassMemberScope@47
-    membersProtos = HashMap@50 // through DeserializedClassMemberScope@47
+    membersProtos = LinkedHashMap@50 // through DeserializedClassMemberScope@47
     properties('get': Name@34) = EmptyList@23[empty] // through DeserializedClassMemberScope@47
     properties('set': Name@38) = EmptyList@23[empty] // through DeserializedClassMemberScope@47
 }
@@ -64,7 +64,7 @@ DeserializedClassDescriptor@12['KMutableTopLevelProperty'] {
     containingDeclaration = LazyJavaPackageFragment@21['reflect']
     functions('get': Name@34) = EmptyList@23[empty] // through DeserializedClassMemberScope@51
     functions('set': Name@38) = EmptyList@23[empty] // through DeserializedClassMemberScope@51
-    membersProtos = HashMap@52 // through DeserializedClassMemberScope@51
+    membersProtos = LinkedHashMap@52 // through DeserializedClassMemberScope@51
     properties('get': Name@34) = EmptyList@23[empty] // through DeserializedClassMemberScope@51
     properties('set': Name@38) = EmptyList@23[empty] // through DeserializedClassMemberScope@51
 }
@@ -73,7 +73,7 @@ DeserializedClassDescriptor@14['KProperty'] {
     containingDeclaration = LazyJavaPackageFragment@21['reflect']
     functions('get': Name@22) = EmptyList@23[empty] // through DeserializedClassMemberScope@53
     functions('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@53
-    membersProtos = HashMap@54 // through DeserializedClassMemberScope@53
+    membersProtos = LinkedHashMap@54 // through DeserializedClassMemberScope@53
     properties('get': Name@22) = EmptyList@23[empty] // through DeserializedClassMemberScope@53
     properties('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@53
 }
@@ -83,7 +83,7 @@ DeserializedClassDescriptor@16['KTopLevelExtensionProperty'] {
     defaultType = JetTypeImpl@55['KTopLevelExtensionProperty<2>']
     functions('get': Name@22) = ArrayList@56[1] { DeserializedSimpleFunctionDescriptor@57['get'] } // through DeserializedClassMemberScope@58
     functions('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@58
-    membersProtos = HashMap@59 // through DeserializedClassMemberScope@58
+    membersProtos = LinkedHashMap@59 // through DeserializedClassMemberScope@58
     properties('get': Name@22) = EmptyList@23[empty] // through DeserializedClassMemberScope@58
     properties('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@58
 }
@@ -92,7 +92,7 @@ DeserializedClassDescriptor@18['KTopLevelProperty'] {
     containingDeclaration = LazyJavaPackageFragment@21['reflect']
     functions('get': Name@22) = EmptyList@23[empty] // through DeserializedClassMemberScope@60
     functions('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@60
-    membersProtos = HashMap@61 // through DeserializedClassMemberScope@60
+    membersProtos = LinkedHashMap@61 // through DeserializedClassMemberScope@60
     properties('get': Name@22) = EmptyList@23[empty] // through DeserializedClassMemberScope@60
     properties('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@60
 }
@@ -186,19 +186,19 @@ DeserializedType@120['K in kotlin'] {
 }
 
 DeserializedType@121['R in kotlin.reflect.KExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@74
+    constructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
 DeserializedType@122['R in kotlin.reflect.KMutableExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@79
+    constructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 DeserializedType@123['R in kotlin.reflect.KMutableExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@79
+    constructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 DeserializedType@124['R in kotlin.reflect.KMutableExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@79
+    constructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 DeserializedType@125['R in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
@@ -210,11 +210,11 @@ DeserializedType@126['R in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
 }
 
 DeserializedType@127['R in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@69
+    constructor = AbstractLazyTypeParameterDescriptor$1@79
 }
 
 DeserializedType@128['R in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@69
+    constructor = AbstractLazyTypeParameterDescriptor$1@79
 }
 
 DeserializedType@129['T in kotlin.reflect.KExtensionProperty'] {
@@ -222,11 +222,11 @@ DeserializedType@129['T in kotlin.reflect.KExtensionProperty'] {
 }
 
 DeserializedType@130['T in kotlin.reflect.KMutableExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@103
+    constructor = AbstractLazyTypeParameterDescriptor$1@98
 }
 
 DeserializedType@131['T in kotlin.reflect.KMutableExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@103
+    constructor = AbstractLazyTypeParameterDescriptor$1@98
 }
 
 DeserializedType@132['T in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
@@ -238,7 +238,7 @@ DeserializedType@133['T in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
 }
 
 DeserializedType@134['T in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@98
+    constructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 DeserializedType@135['V in kotlin'] {
@@ -253,27 +253,12 @@ DeserializedType@137['V in kotlin'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@116
 }
 
-DeserializedType@110['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
 DeserializedType@105['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
 }
 
-DeserializedType@118['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@81['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@66['kotlin.Any'] {
+DeserializedType@114['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
 }
@@ -283,11 +268,6 @@ DeserializedType@76['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@139
 }
 
-DeserializedType@114['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
 DeserializedType@140['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
@@ -298,7 +278,12 @@ DeserializedType@85['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@139
 }
 
-DeserializedType@71['kotlin.Any'] {
+DeserializedType@81['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@138
+    memberScope = DeserializedClassMemberScope@139
+}
+
+DeserializedType@66['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
 }
@@ -308,6 +293,21 @@ DeserializedType@100['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@139
 }
 
+DeserializedType@118['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@141['kotlin.MutableMap'] {
     constructor = DeserializedClassTypeConstructor@142
     memberScope = SubstitutingScope@143
@@ -383,290 +383,300 @@ DeserializedType@179['kotlin.reflect.KTopLevelProperty'] {
     memberScope = SubstitutingScope@180
 }
 
-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
+EnumEntryClassDescriptors@181 {
+    findEnumEntry('get': Name@22) = null
+    findEnumEntry('set': Name@25) = null
 }
 
-LazyJavaPackageFragment@183['<root>'] {
-    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@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@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
+EnumEntryClassDescriptors@182 {
+    findEnumEntry('get': Name@34) = null
+    findEnumEntry('set': Name@38) = null
 }
 
-LazyJavaPackageFragment@212['io'] {
-    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@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@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('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@246) = EmptyList@23[empty] // through DeserializedPackageMemberScope@255
-    properties('get': Name@22) = 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
+LazyJavaPackageFragmentProvider@183 {
+    packageFragments('<root>': FqName@184) = LazyJavaPackageFragment@185['<root>']
+    packageFragments('Int': FqName@186) = null
+    packageFragments('KExtensionProperty': FqName@187) = null
+    packageFragments('KMutableExtensionProperty': FqName@188) = null
+    packageFragments('KMutableTopLevelExtensionProperty': FqName@189) = null
+    packageFragments('KTopLevelExtensionProperty': FqName@190) = null
+    packageFragments('Long': FqName@191) = null
+    packageFragments('String': FqName@192) = null
+    packageFragments('countCharacters': FqName@193) = null
+    packageFragments('java': FqName@194) = LazyJavaPackageFragment@195['java']
+    packageFragments('java.lang': FqName@196) = LazyJavaPackageFragment@197['lang']
+    packageFragments('java.lang.Int': FqName@198) = null
+    packageFragments('java.lang.KExtensionProperty': FqName@199) = null
+    packageFragments('java.lang.KMutableExtensionProperty': FqName@200) = null
+    packageFragments('java.lang.KMutableTopLevelExtensionProperty': FqName@201) = null
+    packageFragments('java.lang.KTopLevelExtensionProperty': FqName@202) = null
+    packageFragments('java.lang.Long': FqName@203) = null
+    packageFragments('java.lang.String': FqName@204) = null
+    packageFragments('kotlin': FqName@205) = LazyJavaPackageFragment@62['kotlin']
+    packageFragments('kotlin.Int': FqName@206) = null
+    packageFragments('kotlin.KExtensionProperty': FqName@207) = null
+    packageFragments('kotlin.KMutableExtensionProperty': FqName@208) = null
+    packageFragments('kotlin.KMutableTopLevelExtensionProperty': FqName@209) = null
+    packageFragments('kotlin.KTopLevelExtensionProperty': FqName@210) = null
+    packageFragments('kotlin.Long': FqName@211) = null
+    packageFragments('kotlin.String': FqName@212) = null
+    packageFragments('kotlin.io': FqName@213) = LazyJavaPackageFragment@214['io']
+    packageFragments('kotlin.io.Int': FqName@215) = null
+    packageFragments('kotlin.io.KExtensionProperty': FqName@216) = null
+    packageFragments('kotlin.io.KMutableExtensionProperty': FqName@217) = null
+    packageFragments('kotlin.io.KMutableTopLevelExtensionProperty': FqName@218) = null
+    packageFragments('kotlin.io.KTopLevelExtensionProperty': FqName@219) = null
+    packageFragments('kotlin.io.Long': FqName@220) = null
+    packageFragments('kotlin.io.String': FqName@221) = null
+    packageFragments('kotlin.jvm': FqName@222) = LazyJavaPackageFragment@223['jvm']
+    packageFragments('kotlin.jvm.Int': FqName@224) = null
+    packageFragments('kotlin.jvm.KExtensionProperty': FqName@225) = null
+    packageFragments('kotlin.jvm.KMutableExtensionProperty': FqName@226) = null
+    packageFragments('kotlin.jvm.KMutableTopLevelExtensionProperty': FqName@227) = null
+    packageFragments('kotlin.jvm.KTopLevelExtensionProperty': FqName@228) = null
+    packageFragments('kotlin.jvm.Long': FqName@229) = null
+    packageFragments('kotlin.jvm.String': FqName@230) = null
+    packageFragments('kotlin.reflect': FqName@231) = LazyJavaPackageFragment@21['reflect']
+    packageFragments('kotlin.reflect.Int': FqName@232) = null
+    packageFragments('kotlin.reflect.KExtensionProperty': FqName@233) = null
+    packageFragments('kotlin.reflect.KMutableExtensionProperty': FqName@234) = null
+    packageFragments('kotlin.reflect.KMutableTopLevelExtensionProperty': FqName@235) = null
+    packageFragments('kotlin.reflect.KTopLevelExtensionProperty': FqName@236) = null
+    packageFragments('kotlin.reflect.Long': FqName@237) = null
+    packageFragments('kotlin.reflect.String': FqName@238) = null
+    packageFragments('meaning': FqName@239) = null
 }
 
-LazyJavaPackageFragment@193['java'] {
-    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@185['<root>'] {
+    classes('Int': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@241
+    classes('KExtensionProperty': Name@242) = null // through LazyPackageFragmentScopeForJavaPackage@241
+    classes('KMutableExtensionProperty': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@241
+    classes('KMutableTopLevelExtensionProperty': Name@244) = null // through LazyPackageFragmentScopeForJavaPackage@241
+    classes('KTopLevelExtensionProperty': Name@245) = null // through LazyPackageFragmentScopeForJavaPackage@241
+    classes('Long': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@241
+    classes('String': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@241
+    classes('countCharacters': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@241
+    classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@241
+    classes('invoke': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@241
+    classes('kotlin': Name@250) = null // through LazyPackageFragmentScopeForJavaPackage@241
+    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@241
+    classes('meaning': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@241
+    classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@241
+    deserializedPackageScope = Empty@253 // through LazyPackageFragmentScopeForJavaPackage@241
+    functions('countCharacters': Name@248) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@241
+    functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@241
+    functions('invoke': Name@249) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@241
+    functions('kotlin': Name@254) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@241
+    functions('meaning': Name@252) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@241
+    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@241
+    memberIndex = computeMemberIndex$1@255 // through LazyPackageFragmentScopeForJavaPackage@241
 }
 
-LazyJavaPackageFragment@221['jvm'] {
-    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@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@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@214['io'] {
+    classes('Int': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@256
+    classes('Long': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@256
+    classes('String': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@256
+    classes('countCharacters': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@256
+    classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@256
+    classes('invoke': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@256
+    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@256
+    classes('meaning': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@256
+    classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@256
+    deserializedPackageScope = DeserializedPackageMemberScope@257 // through LazyPackageFragmentScopeForJavaPackage@256
+    functions('countCharacters': Name@248) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
+    functions('countCharacters': Name@248) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@256
+    functions('get': Name@22) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
+    functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@256
+    functions('invoke': Name@249) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
+    functions('invoke': Name@249) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@256
+    functions('meaning': Name@252) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
+    functions('meaning': Name@252) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@256
+    functions('set': Name@25) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
+    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@256
+    memberIndex = computeMemberIndex$1@258 // through LazyPackageFragmentScopeForJavaPackage@256
+    membersProtos = LinkedHashMap@259 // through DeserializedPackageMemberScope@257
+    properties('countCharacters': Name@248) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
+    properties('get': Name@22) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
+    properties('length': Name@251) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
+    properties('meaning': Name@252) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
+    properties('set': Name@25) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
+}
+
+LazyJavaPackageFragment@195['java'] {
+    classes('lang': Name@260) = null // through LazyPackageFragmentScopeForJavaPackage@261
+    deserializedPackageScope = Empty@253 // through LazyPackageFragmentScopeForJavaPackage@261
+    functions('lang': Name@262) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@261
+    memberIndex = computeMemberIndex$1@263 // through LazyPackageFragmentScopeForJavaPackage@261
+}
+
+LazyJavaPackageFragment@223['jvm'] {
+    classes('Int': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@264
+    classes('Long': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@264
+    classes('String': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@264
+    classes('countCharacters': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@264
+    classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@264
+    classes('invoke': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@264
+    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@264
+    classes('meaning': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@264
+    classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@264
+    deserializedPackageScope = Empty@253 // through LazyPackageFragmentScopeForJavaPackage@264
+    functions('countCharacters': Name@248) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
+    functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
+    functions('invoke': Name@249) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
+    functions('meaning': Name@252) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
+    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
+    memberIndex = computeMemberIndex$1@265 // through LazyPackageFragmentScopeForJavaPackage@264
 }
 
 LazyJavaPackageFragment@62['kotlin'] {
-    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
+    classes('Any': Name@266) = null // through LazyPackageFragmentScopeForJavaPackage@267
+    classes('Int': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@267
+    classes('Long': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@267
+    classes('MutableMap': Name@268) = null // through LazyPackageFragmentScopeForJavaPackage@267
+    classes('String': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@267
+    classes('Unit': Name@269) = DeserializedClassDescriptor@20['Unit'] // through LazyPackageFragmentScopeForJavaPackage@267
+    classes('countCharacters': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@267
+    classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@267
+    classes('invoke': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@267
+    classes('io': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@267
+    classes('jvm': Name@271) = null // through LazyPackageFragmentScopeForJavaPackage@267
+    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@267
+    classes('meaning': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@267
+    classes('reflect': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@267
+    classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@267
+    deserializedPackageScope = DeserializedPackageMemberScope@273 // through LazyPackageFragmentScopeForJavaPackage@267
+    functions('countCharacters': Name@248) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
+    functions('countCharacters': Name@248) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
+    functions('get': Name@22) = ArrayList@274[2] { DeserializedSimpleFunctionDescriptor@275['get'], DeserializedSimpleFunctionDescriptor@276['get'] } // through DeserializedPackageMemberScope@273
+    functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
+    functions('invoke': Name@249) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
+    functions('invoke': Name@249) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
+    functions('io': Name@277) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
+    functions('io': Name@277) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
+    functions('jvm': Name@278) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
+    functions('jvm': Name@278) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
+    functions('meaning': Name@252) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
+    functions('meaning': Name@252) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
+    functions('reflect': Name@279) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
+    functions('reflect': Name@279) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
+    functions('set': Name@25) = ArrayList@280[1] { DeserializedSimpleFunctionDescriptor@281['set'] } // through DeserializedPackageMemberScope@273
+    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
+    memberIndex = computeMemberIndex$1@282 // through LazyPackageFragmentScopeForJavaPackage@267
+    membersProtos = LinkedHashMap@283 // through DeserializedPackageMemberScope@273
+    properties('countCharacters': Name@248) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
+    properties('get': Name@22) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
+    properties('io': Name@277) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
+    properties('jvm': Name@278) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
+    properties('length': Name@251) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
+    properties('meaning': Name@252) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
+    properties('reflect': Name@279) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
+    properties('set': Name@25) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
 }
 
-LazyJavaPackageFragment@195['lang'] {
-    classes('countCharacters': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@282
-    classes('get': Name@22) = 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@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@197['lang'] {
+    classes('countCharacters': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@284
+    classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@284
+    classes('invoke': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@284
+    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@284
+    classes('meaning': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@284
+    classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@284
+    deserializedPackageScope = Empty@253 // through LazyPackageFragmentScopeForJavaPackage@284
+    functions('countCharacters': Name@248) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@284
+    functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@284
+    functions('invoke': Name@249) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@284
+    functions('meaning': Name@252) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@284
+    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@284
+    memberIndex = computeMemberIndex$1@285 // through LazyPackageFragmentScopeForJavaPackage@284
 }
 
 LazyJavaPackageFragment@21['reflect'] {
-    classes('Int': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@284
-    classes('KCallable': Name@285) = DeserializedClassDescriptor@2['KCallable'] // 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@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@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@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
+    classes('Int': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@286
+    classes('KCallable': Name@287) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@286
+    classes('KExtensionProperty': Name@242) = DeserializedClassDescriptor@4['KExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@286
+    classes('KMutableExtensionProperty': Name@243) = DeserializedClassDescriptor@6['KMutableExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@286
+    classes('KMutableProperty': Name@288) = DeserializedClassDescriptor@8['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@286
+    classes('KMutableTopLevelExtensionProperty': Name@289) = DeserializedClassDescriptor@10['KMutableTopLevelExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@286
+    classes('KMutableTopLevelProperty': Name@290) = DeserializedClassDescriptor@12['KMutableTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@286
+    classes('KProperty': Name@291) = DeserializedClassDescriptor@14['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@286
+    classes('KTopLevelExtensionProperty': Name@292) = DeserializedClassDescriptor@16['KTopLevelExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@286
+    classes('KTopLevelProperty': Name@293) = DeserializedClassDescriptor@18['KTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@286
+    classes('Long': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@286
+    classes('String': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@286
+    classes('countCharacters': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@286
+    classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@286
+    classes('invoke': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@286
+    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@286
+    classes('meaning': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@286
+    classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@286
+    deserializedPackageScope = Empty@253 // through LazyPackageFragmentScopeForJavaPackage@286
+    functions('countCharacters': Name@248) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@286
+    functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@286
+    functions('invoke': Name@249) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@286
+    functions('meaning': Name@252) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@286
+    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@286
+    memberIndex = computeMemberIndex$1@294 // through LazyPackageFragmentScopeForJavaPackage@286
 }
 
-NestedClassDescriptors@293 {
-    findClass('get': Name@34) = null
-    findClass('set': Name@38) = null
+NestedClassDescriptors@295 {
+    findNestedClass('get': Name@34) = null
+    findNestedClass('set': Name@38) = null
 }
 
-NestedClassDescriptors@294 {
-    findClass('get': Name@22) = null
-    findClass('set': Name@25) = null
+NestedClassDescriptors@296 {
+    findNestedClass('get': Name@22) = null
+    findNestedClass('set': Name@25) = null
 }
 
-TypeDeserializer@295 {
-    classDescriptors('102': Integer@296) = DeserializedClassDescriptor@297['MutableMap']
-    classDescriptors('2': Integer@298) = DeserializedClassDescriptor@299['Any']
+TypeDeserializer@297 {
+    classDescriptors('129': Integer@298) = DeserializedClassDescriptor@299['MutableMap']
+    classDescriptors('9': Integer@300) = DeserializedClassDescriptor@301['Any']
 }
 
-TypeDeserializer@300 {
-    classDescriptors('3': Integer@301) = DeserializedClassDescriptor@299['Any']
-    classDescriptors('4': Integer@302) = DeserializedClassDescriptor@4['KExtensionProperty']
-    classDescriptors('5': Integer@303) = DeserializedClassDescriptor@8['KMutableProperty']
-}
-
-TypeDeserializer@304 {
-    classDescriptors('3': Integer@301) = DeserializedClassDescriptor@299['Any']
-    classDescriptors('4': Integer@302) = DeserializedClassDescriptor@4['KExtensionProperty']
-    classDescriptors('5': Integer@303) = DeserializedClassDescriptor@18['KTopLevelProperty']
-}
-
-TypeDeserializer@305 {
-    classDescriptors('3': Integer@301) = DeserializedClassDescriptor@299['Any']
-    classDescriptors('4': Integer@302) = DeserializedClassDescriptor@14['KProperty']
+TypeDeserializer@302 {
+    classDescriptors('3': Integer@303) = DeserializedClassDescriptor@301['Any']
+    classDescriptors('4': Integer@304) = DeserializedClassDescriptor@4['KExtensionProperty']
+    classDescriptors('5': Integer@305) = DeserializedClassDescriptor@8['KMutableProperty']
 }
 
 TypeDeserializer@306 {
-    classDescriptors('3': Integer@301) = DeserializedClassDescriptor@299['Any']
-    classDescriptors('4': Integer@302) = DeserializedClassDescriptor@16['KTopLevelExtensionProperty']
-    classDescriptors('5': Integer@303) = DeserializedClassDescriptor@6['KMutableExtensionProperty']
-    classDescriptors('6': Integer@307) = DeserializedClassDescriptor@12['KMutableTopLevelProperty']
+    classDescriptors('3': Integer@303) = DeserializedClassDescriptor@301['Any']
+    classDescriptors('4': Integer@304) = DeserializedClassDescriptor@4['KExtensionProperty']
+    classDescriptors('5': Integer@305) = DeserializedClassDescriptor@18['KTopLevelProperty']
+}
+
+TypeDeserializer@307 {
+    classDescriptors('3': Integer@303) = DeserializedClassDescriptor@301['Any']
+    classDescriptors('4': Integer@304) = DeserializedClassDescriptor@14['KProperty']
 }
 
 TypeDeserializer@308 {
-    classDescriptors('3': Integer@301) = DeserializedClassDescriptor@299['Any']
-}
-
-TypeDeserializer@309 {
-    classDescriptors('4': Integer@302) = DeserializedClassDescriptor@2['KCallable']
+    classDescriptors('3': Integer@303) = DeserializedClassDescriptor@301['Any']
+    classDescriptors('4': Integer@304) = DeserializedClassDescriptor@16['KTopLevelExtensionProperty']
+    classDescriptors('5': Integer@305) = DeserializedClassDescriptor@6['KMutableExtensionProperty']
+    classDescriptors('6': Integer@309) = DeserializedClassDescriptor@12['KMutableTopLevelProperty']
 }
 
 TypeDeserializer@310 {
-    classDescriptors('4': Integer@302) = DeserializedClassDescriptor@14['KProperty']
+    classDescriptors('3': Integer@303) = DeserializedClassDescriptor@301['Any']
 }
 
 TypeDeserializer@311 {
-    classDescriptors('4': Integer@302) = DeserializedClassDescriptor@14['KProperty']
+    classDescriptors('4': Integer@304) = DeserializedClassDescriptor@2['KCallable']
 }
 
 TypeDeserializer@312 {
-    classDescriptors('4': Integer@302) = DeserializedClassDescriptor@18['KTopLevelProperty']
-    classDescriptors('5': Integer@303) = DeserializedClassDescriptor@8['KMutableProperty']
+    classDescriptors('4': Integer@304) = DeserializedClassDescriptor@14['KProperty']
 }
 
 TypeDeserializer@313 {
-    classDescriptors('6': Integer@307) = DeserializedClassDescriptor@20['Unit']
+    classDescriptors('4': Integer@304) = DeserializedClassDescriptor@14['KProperty']
+}
+
+TypeDeserializer@314 {
+    classDescriptors('4': Integer@304) = DeserializedClassDescriptor@18['KTopLevelProperty']
+    classDescriptors('5': Integer@305) = DeserializedClassDescriptor@8['KMutableProperty']
+}
+
+TypeDeserializer@315 {
+    classDescriptors('6': Integer@309) = DeserializedClassDescriptor@20['Unit']
 }

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

@@ -9,7 +9,7 @@ ClassDeserializer@0 {
 DeserializedClassDescriptor@2['KCallable'] {
     containingDeclaration = LazyJavaPackageFragment@11['reflect']
     functions('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@14
-    membersProtos = HashMap@15 // through DeserializedClassMemberScope@14
+    membersProtos = LinkedHashMap@15 // through DeserializedClassMemberScope@14
     properties('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@14
 }
 
@@ -17,7 +17,7 @@ DeserializedClassDescriptor@4['KExtensionProperty'] {
     containingDeclaration = LazyJavaPackageFragment@11['reflect']
     defaultType = JetTypeImpl@16['KExtensionProperty<2>']
     functions('get': Name@12) = ArrayList@17[1] { DeserializedSimpleFunctionDescriptor@18['get'] } // through DeserializedClassMemberScope@19
-    membersProtos = HashMap@20 // through DeserializedClassMemberScope@19
+    membersProtos = LinkedHashMap@20 // through DeserializedClassMemberScope@19
     properties('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@19
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@21['<this>']
 }
@@ -25,21 +25,21 @@ DeserializedClassDescriptor@4['KExtensionProperty'] {
 DeserializedClassDescriptor@6['KProperty'] {
     containingDeclaration = LazyJavaPackageFragment@11['reflect']
     functions('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@22
-    membersProtos = HashMap@23 // through DeserializedClassMemberScope@22
+    membersProtos = LinkedHashMap@23 // through DeserializedClassMemberScope@22
     properties('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@22
 }
 
 DeserializedClassDescriptor@8['KTopLevelExtensionProperty'] {
     containingDeclaration = LazyJavaPackageFragment@11['reflect']
     functions('get': Name@12) = ArrayList@24[1] { DeserializedSimpleFunctionDescriptor@25['get'] } // through DeserializedClassMemberScope@26
-    membersProtos = HashMap@27 // through DeserializedClassMemberScope@26
+    membersProtos = LinkedHashMap@27 // through DeserializedClassMemberScope@26
     properties('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@26
 }
 
 DeserializedClassDescriptor@10['KTopLevelProperty'] {
     containingDeclaration = LazyJavaPackageFragment@11['reflect']
     functions('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@28
-    membersProtos = HashMap@29 // through DeserializedClassMemberScope@28
+    membersProtos = LinkedHashMap@29 // through DeserializedClassMemberScope@28
     properties('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@28
 }
 
@@ -78,7 +78,7 @@ DeserializedType@46['R in kotlin.reflect.KExtensionProperty'] {
 }
 
 DeserializedType@47['R in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@38
+    constructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
 DeserializedType@48['T in kotlin.reflect.KExtensionProperty'] {
@@ -119,146 +119,150 @@ DeserializedType@64['kotlin.reflect.KTopLevelProperty'] {
     memberScope = SubstitutingScope@66
 }
 
-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
+EnumEntryClassDescriptors@67 {
+    findEnumEntry('get': Name@12) = null
 }
 
-LazyJavaPackageFragment@69['<root>'] {
-    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
+LazyJavaPackageFragmentProvider@68 {
+    packageFragments('<root>': FqName@69) = LazyJavaPackageFragment@70['<root>']
+    packageFragments('Any': FqName@71) = null
+    packageFragments('Int': FqName@72) = null
+    packageFragments('java': FqName@73) = LazyJavaPackageFragment@74['java']
+    packageFragments('java.lang': FqName@75) = LazyJavaPackageFragment@76['lang']
+    packageFragments('java.lang.Any': FqName@77) = null
+    packageFragments('java.lang.Int': FqName@78) = null
+    packageFragments('kotlin': FqName@79) = LazyJavaPackageFragment@80['kotlin']
+    packageFragments('kotlin.Any': FqName@81) = null
+    packageFragments('kotlin.Int': FqName@82) = null
+    packageFragments('kotlin.io': FqName@83) = LazyJavaPackageFragment@84['io']
+    packageFragments('kotlin.io.Any': FqName@85) = null
+    packageFragments('kotlin.io.Int': FqName@86) = null
+    packageFragments('kotlin.jvm': FqName@87) = LazyJavaPackageFragment@88['jvm']
+    packageFragments('kotlin.jvm.Any': FqName@89) = null
+    packageFragments('kotlin.jvm.Int': FqName@90) = null
+    packageFragments('kotlin.reflect': FqName@91) = LazyJavaPackageFragment@11['reflect']
+    packageFragments('meaning': FqName@92) = null
 }
 
-LazyJavaPackageFragment@83['io'] {
-    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@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('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@96) = EmptyList@13[empty] // through DeserializedPackageMemberScope@100
+LazyJavaPackageFragment@70['<root>'] {
+    classes('Any': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('Int': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('invoke': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('meaning': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('invoke': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('meaning': Name@97) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@94
 }
 
-LazyJavaPackageFragment@73['java'] {
-    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@84['io'] {
+    classes('Any': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('Int': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('invoke': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('meaning': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    deserializedPackageScope = DeserializedPackageMemberScope@101 // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('get': Name@12) = EmptyList@13[empty] // through DeserializedPackageMemberScope@101
+    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('invoke': Name@96) = EmptyList@13[empty] // through DeserializedPackageMemberScope@101
+    functions('invoke': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('meaning': Name@97) = EmptyList@13[empty] // through DeserializedPackageMemberScope@101
+    functions('meaning': Name@97) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
+    membersProtos = LinkedHashMap@103 // through DeserializedPackageMemberScope@101
+    properties('get': Name@12) = EmptyList@13[empty] // through DeserializedPackageMemberScope@101
+    properties('meaning': Name@97) = EmptyList@13[empty] // through DeserializedPackageMemberScope@101
 }
 
-LazyJavaPackageFragment@87['jvm'] {
-    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@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@74['java'] {
+    classes('lang': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('lang': Name@106) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@105
 }
 
-LazyJavaPackageFragment@79['kotlin'] {
-    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@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@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@88['jvm'] {
+    classes('Any': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('Int': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('invoke': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('meaning': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@108
+    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@108
+    functions('invoke': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@108
+    functions('meaning': Name@97) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@108
+    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@108
 }
 
-LazyJavaPackageFragment@75['lang'] {
-    classes('get': Name@12) = 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
+LazyJavaPackageFragment@80['kotlin'] {
+    classes('Any': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Int': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('invoke': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('io': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('jvm': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('meaning': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    deserializedPackageScope = DeserializedPackageMemberScope@113 // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('get': Name@12) = ArrayList@114[2] { DeserializedSimpleFunctionDescriptor@115['get'], DeserializedSimpleFunctionDescriptor@116['get'] } // through DeserializedPackageMemberScope@113
+    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('invoke': Name@96) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
+    functions('invoke': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('io': Name@117) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
+    functions('io': Name@117) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('jvm': Name@118) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
+    functions('jvm': Name@118) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('meaning': Name@97) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
+    functions('meaning': Name@97) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@110
+    membersProtos = LinkedHashMap@120 // through DeserializedPackageMemberScope@113
+    properties('get': Name@12) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
+    properties('io': Name@117) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
+    properties('jvm': Name@118) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
+    properties('meaning': Name@97) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
+}
+
+LazyJavaPackageFragment@76['lang'] {
+    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('invoke': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('meaning': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('invoke': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('meaning': Name@97) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    memberIndex = computeMemberIndex$1@122 // through LazyPackageFragmentScopeForJavaPackage@121
 }
 
 LazyJavaPackageFragment@11['reflect'] {
-    classes('KCallable': Name@122) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('KExtensionProperty': Name@124) = DeserializedClassDescriptor@4['KExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('KProperty': Name@125) = DeserializedClassDescriptor@6['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('KTopLevelExtensionProperty': Name@126) = DeserializedClassDescriptor@8['KTopLevelExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('KTopLevelProperty': Name@127) = DeserializedClassDescriptor@10['KTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('KCallable': Name@123) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('KExtensionProperty': Name@125) = DeserializedClassDescriptor@4['KExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('KProperty': Name@126) = DeserializedClassDescriptor@6['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('KTopLevelExtensionProperty': Name@127) = DeserializedClassDescriptor@8['KTopLevelExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('KTopLevelProperty': Name@128) = DeserializedClassDescriptor@10['KTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@124
 }
 
-NestedClassDescriptors@128 {
-    findClass('get': Name@12) = null
+NestedClassDescriptors@129 {
+    findNestedClass('get': Name@12) = null
 }
 
-TypeDeserializer@129 {
-    classDescriptors('3': Integer@130) = DeserializedClassDescriptor@131['Any']
+TypeDeserializer@130 {
+    classDescriptors('3': Integer@131) = DeserializedClassDescriptor@132['Any']
 }
 
-TypeDeserializer@132 {
-    classDescriptors('4': Integer@133) = DeserializedClassDescriptor@2['KCallable']
+TypeDeserializer@133 {
+    classDescriptors('4': Integer@134) = DeserializedClassDescriptor@2['KCallable']
 }
 
-TypeDeserializer@134 {
-    classDescriptors('4': Integer@133) = DeserializedClassDescriptor@4['KExtensionProperty']
-    classDescriptors('5': Integer@135) = DeserializedClassDescriptor@10['KTopLevelProperty']
-}
-
-TypeDeserializer@136 {
-    classDescriptors('4': Integer@133) = DeserializedClassDescriptor@6['KProperty']
+TypeDeserializer@135 {
+    classDescriptors('4': Integer@134) = DeserializedClassDescriptor@4['KExtensionProperty']
+    classDescriptors('5': Integer@136) = DeserializedClassDescriptor@10['KTopLevelProperty']
 }
 
 TypeDeserializer@137 {
-    classDescriptors('4': Integer@133) = DeserializedClassDescriptor@6['KProperty']
+    classDescriptors('4': Integer@134) = DeserializedClassDescriptor@6['KProperty']
+}
+
+TypeDeserializer@138 {
+    classDescriptors('4': Integer@134) = DeserializedClassDescriptor@6['KProperty']
 }

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

@@ -16,12 +16,12 @@ DeserializedTypeParameterDescriptor@8['T'] {
     upperBounds = LinkedHashSet@10[1] { DeserializedType@11['kotlin.Any'] }
 }
 
-DeserializedType@11['kotlin.Any'] {
+DeserializedType@7['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@12
     memberScope = DeserializedClassMemberScope@13
 }
 
-DeserializedType@7['kotlin.Any'] {
+DeserializedType@11['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@12
     memberScope = DeserializedClassMemberScope@13
 }
@@ -89,7 +89,7 @@ LazyJavaPackageFragment@39['io'] {
     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
+    membersProtos = LinkedHashMap@69 // through DeserializedPackageMemberScope@67
     properties('foo': Name@58) = EmptyList@63[empty] // through DeserializedPackageMemberScope@67
     properties('t': Name@61) = EmptyList@63[empty] // through DeserializedPackageMemberScope@67
 }
@@ -134,7 +134,7 @@ LazyJavaPackageFragment@32['kotlin'] {
     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
+    membersProtos = LinkedHashMap@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

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

@@ -36,12 +36,12 @@ DeserializedType@21['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@23
 }
 
-DeserializedType@17['kotlin.Any'] {
+DeserializedType@13['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@22
     memberScope = DeserializedClassMemberScope@23
 }
 
-DeserializedType@13['kotlin.Any'] {
+DeserializedType@17['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@22
     memberScope = DeserializedClassMemberScope@23
 }
@@ -256,7 +256,7 @@ LazyJavaPackageFragment@115['io'] {
     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
+    membersProtos = LinkedHashMap@171 // 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
@@ -336,7 +336,7 @@ LazyJavaPackageFragment@104['kotlin'] {
     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
+    membersProtos = LinkedHashMap@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

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

@@ -83,11 +83,11 @@ DeserializedTypeParameterDescriptor@42['R'] {
 }
 
 DeserializedType@44['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@41
+    constructor = AbstractLazyTypeParameterDescriptor$1@43
 }
 
 DeserializedType@45['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@41
+    constructor = AbstractLazyTypeParameterDescriptor$1@43
 }
 
 DeserializedType@46['R in kotlin.reflect.KMutableVariable'] {
@@ -103,10 +103,10 @@ DeserializedType@48['R in kotlin.reflect.KTopLevelVariable'] {
 }
 
 DeserializedType@49['R in kotlin.reflect.KVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@43
+    constructor = AbstractLazyTypeParameterDescriptor$1@41
 }
 
-DeserializedType@23['kotlin.Any'] {
+DeserializedType@35['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@50
     memberScope = DeserializedClassMemberScope@51
 }
@@ -116,12 +116,12 @@ DeserializedType@31['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@51
 }
 
-DeserializedType@35['kotlin.Any'] {
+DeserializedType@27['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@50
     memberScope = DeserializedClassMemberScope@51
 }
 
-DeserializedType@27['kotlin.Any'] {
+DeserializedType@23['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@50
     memberScope = DeserializedClassMemberScope@51
 }
@@ -427,7 +427,7 @@ LazyJavaPackageFragment@180['io'] {
     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
+    membersProtos = LinkedHashMap@229 // 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
@@ -505,7 +505,7 @@ LazyJavaPackageFragment@168['kotlin'] {
     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
+    membersProtos = LinkedHashMap@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

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

@@ -42,7 +42,7 @@ LazyJavaPackageFragment@13['io'] {
     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
+    membersProtos = LinkedHashMap@30 // through DeserializedPackageMemberScope@28
 }
 
 LazyJavaPackageFragment@5['java'] {
@@ -88,7 +88,7 @@ LazyJavaPackageFragment@10['kotlin'] {
     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@40
+    membersProtos = LinkedHashMap@44 // through DeserializedPackageMemberScope@40
     properties('io': Name@41) = EmptyList@25[empty] // through DeserializedPackageMemberScope@40
     properties('jvm': Name@42) = EmptyList@25[empty] // through DeserializedPackageMemberScope@40
 }

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

@@ -11,7 +11,7 @@ DeserializedClassDescriptor@2['KCallable'] {
     containingDeclaration = LazyJavaPackageFragment@13['reflect']
     functions('get': Name@14) = EmptyList@15[empty] // through DeserializedClassMemberScope@16
     functions('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@16
-    membersProtos = HashMap@18 // through DeserializedClassMemberScope@16
+    membersProtos = LinkedHashMap@18 // through DeserializedClassMemberScope@16
     properties('get': Name@14) = EmptyList@15[empty] // through DeserializedClassMemberScope@16
     properties('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@16
 }
@@ -21,7 +21,7 @@ DeserializedClassDescriptor@4['KMemberProperty'] {
     defaultType = JetTypeImpl@19['KMemberProperty<2>']
     functions('get': Name@14) = ArrayList@20[1] { DeserializedSimpleFunctionDescriptor@21['get'] } // through DeserializedClassMemberScope@22
     functions('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@22
-    membersProtos = HashMap@23 // through DeserializedClassMemberScope@22
+    membersProtos = LinkedHashMap@23 // through DeserializedClassMemberScope@22
     properties('get': Name@14) = EmptyList@15[empty] // through DeserializedClassMemberScope@22
     properties('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@22
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@24['<this>']
@@ -32,7 +32,7 @@ DeserializedClassDescriptor@6['KMutableMemberProperty'] {
     defaultType = JetTypeImpl@25['KMutableMemberProperty<2>']
     functions('get': Name@14) = ArrayList@26[1] { DeserializedSimpleFunctionDescriptor@27['get'] } // through DeserializedClassMemberScope@28
     functions('set': Name@17) = ArrayList@29[1] { DeserializedSimpleFunctionDescriptor@30['set'] } // through DeserializedClassMemberScope@28
-    membersProtos = HashMap@31 // through DeserializedClassMemberScope@28
+    membersProtos = LinkedHashMap@31 // through DeserializedClassMemberScope@28
     properties('get': Name@14) = EmptyList@15[empty] // through DeserializedClassMemberScope@28
     properties('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@28
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@32['<this>']
@@ -42,7 +42,7 @@ DeserializedClassDescriptor@8['KMutableProperty'] {
     containingDeclaration = LazyJavaPackageFragment@13['reflect']
     functions('get': Name@14) = EmptyList@15[empty] // through DeserializedClassMemberScope@33
     functions('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@33
-    membersProtos = HashMap@34 // through DeserializedClassMemberScope@33
+    membersProtos = LinkedHashMap@34 // through DeserializedClassMemberScope@33
     properties('get': Name@14) = EmptyList@15[empty] // through DeserializedClassMemberScope@33
     properties('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@33
 }
@@ -51,7 +51,7 @@ DeserializedClassDescriptor@10['KProperty'] {
     containingDeclaration = LazyJavaPackageFragment@13['reflect']
     functions('get': Name@14) = EmptyList@15[empty] // through DeserializedClassMemberScope@35
     functions('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@35
-    membersProtos = HashMap@36 // through DeserializedClassMemberScope@35
+    membersProtos = LinkedHashMap@36 // through DeserializedClassMemberScope@35
     properties('get': Name@14) = EmptyList@15[empty] // through DeserializedClassMemberScope@35
     properties('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@35
 }
@@ -62,7 +62,7 @@ DeserializedClassDescriptor@12['Unit'] {
     defaultType = JetTypeImpl@39['Unit']
     functions('invoke': Name@40) = EmptyList@15[empty] // through DeserializedClassMemberScope@41
     functions('toString': Name@42) = ArrayList@43[1] { DeserializedSimpleFunctionDescriptor@44['toString'] } // through DeserializedClassMemberScope@41
-    membersProtos = HashMap@45 // through DeserializedClassMemberScope@41
+    membersProtos = LinkedHashMap@45 // through DeserializedClassMemberScope@41
     properties('toString': Name@42) = EmptyList@15[empty] // through DeserializedClassMemberScope@41
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@46['<this>']
 }
@@ -127,11 +127,6 @@ DeserializedType@78['T in kotlin.reflect.KMutableMemberProperty'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@65
 }
 
-DeserializedType@67['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@79
-    memberScope = DeserializedClassMemberScope@80
-}
-
 DeserializedType@56['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@79
     memberScope = DeserializedClassMemberScope@80
@@ -142,7 +137,7 @@ DeserializedType@81['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@80
 }
 
-DeserializedType@82['kotlin.Any'] {
+DeserializedType@67['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@79
     memberScope = DeserializedClassMemberScope@80
 }
@@ -152,6 +147,11 @@ DeserializedType@51['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@80
 }
 
+DeserializedType@82['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@79
+    memberScope = DeserializedClassMemberScope@80
+}
+
 DeserializedType@72['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@79
     memberScope = DeserializedClassMemberScope@80
@@ -191,296 +191,310 @@ DeserializedType@99['kotlin.reflect.KProperty'] {
     memberScope = SubstitutingScope@100
 }
 
-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
+EnumEntryClassDescriptors@101 {
+    findEnumEntry('get': Name@14) = null
+    findEnumEntry('set': Name@17) = null
 }
 
-LazyJavaPackageFragment@103['<root>'] {
-    classes('A': Name@144) = 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@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@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
+EnumEntryClassDescriptors@102 {
+    findEnumEntry('get': Name@103) = null
 }
 
-LazyJavaPackageFragment@125['io'] {
-    classes('A': Name@144) = 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@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('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('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@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@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
-    properties('y': Name@163) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
-    properties('z': Name@164) = EmptyList@15[empty] // through DeserializedPackageMemberScope@158
+EnumEntryClassDescriptors@104 {
+    findEnumEntry('invoke': Name@40) = null
+    findEnumEntry('toString': Name@42) = null
 }
 
-LazyJavaPackageFragment@110['java'] {
-    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
+LazyJavaPackageFragmentProvider@105 {
+    packageFragments('<root>': FqName@106) = LazyJavaPackageFragment@107['<root>']
+    packageFragments('A': FqName@108) = null
+    packageFragments('KMemberProperty': FqName@109) = null
+    packageFragments('KMutableMemberProperty': FqName@110) = null
+    packageFragments('String': FqName@111) = null
+    packageFragments('Unit': FqName@112) = null
+    packageFragments('java': FqName@113) = LazyJavaPackageFragment@114['java']
+    packageFragments('java.lang': FqName@115) = LazyJavaPackageFragment@116['lang']
+    packageFragments('java.lang.A': FqName@117) = null
+    packageFragments('java.lang.KMemberProperty': FqName@118) = null
+    packageFragments('java.lang.KMutableMemberProperty': FqName@119) = null
+    packageFragments('java.lang.String': FqName@120) = null
+    packageFragments('java.lang.Unit': FqName@121) = null
+    packageFragments('kotlin': FqName@122) = LazyJavaPackageFragment@38['kotlin']
+    packageFragments('kotlin.A': FqName@123) = null
+    packageFragments('kotlin.KMemberProperty': FqName@124) = null
+    packageFragments('kotlin.KMutableMemberProperty': FqName@125) = null
+    packageFragments('kotlin.String': FqName@126) = null
+    packageFragments('kotlin.Unit': FqName@127) = null
+    packageFragments('kotlin.io': FqName@128) = LazyJavaPackageFragment@129['io']
+    packageFragments('kotlin.io.A': FqName@130) = null
+    packageFragments('kotlin.io.KMemberProperty': FqName@131) = null
+    packageFragments('kotlin.io.KMutableMemberProperty': FqName@132) = null
+    packageFragments('kotlin.io.String': FqName@133) = null
+    packageFragments('kotlin.io.Unit': FqName@134) = null
+    packageFragments('kotlin.jvm': FqName@135) = LazyJavaPackageFragment@136['jvm']
+    packageFragments('kotlin.jvm.A': FqName@137) = null
+    packageFragments('kotlin.jvm.KMemberProperty': FqName@138) = null
+    packageFragments('kotlin.jvm.KMutableMemberProperty': FqName@139) = null
+    packageFragments('kotlin.jvm.String': FqName@140) = null
+    packageFragments('kotlin.jvm.Unit': FqName@141) = null
+    packageFragments('kotlin.reflect': FqName@142) = LazyJavaPackageFragment@13['reflect']
+    packageFragments('kotlin.reflect.A': FqName@143) = null
+    packageFragments('kotlin.reflect.KMemberProperty': FqName@144) = null
+    packageFragments('kotlin.reflect.KMutableMemberProperty': FqName@145) = null
+    packageFragments('kotlin.reflect.String': FqName@146) = null
+    packageFragments('kotlin.reflect.Unit': FqName@147) = null
 }
 
-LazyJavaPackageFragment@132['jvm'] {
-    classes('A': Name@144) = 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@153) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('toString': Name@42) = null // 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@107['<root>'] {
+    classes('A': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('KMemberProperty': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('KMutableMemberProperty': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('Unit': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('get': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('kotlin': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('toString': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    deserializedPackageScope = Empty@158 // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('kotlin': Name@159) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    memberIndex = computeMemberIndex$1@160 // through LazyPackageFragmentScopeForJavaPackage@149
+}
+
+LazyJavaPackageFragment@129['io'] {
+    classes('A': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('Unit': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('get': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('toString': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    deserializedPackageScope = DeserializedPackageMemberScope@162 // through LazyPackageFragmentScopeForJavaPackage@161
+    functions('A': Name@148) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
+    functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
+    functions('bar': Name@154) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
+    functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
+    functions('foo': Name@155) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
+    functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
+    functions('get': Name@14) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
+    functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
+    functions('invoke': Name@40) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
+    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
+    functions('self': Name@157) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
+    functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
+    functions('set': Name@17) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
+    functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
+    functions('toString': Name@42) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
+    functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
+    memberIndex = computeMemberIndex$1@163 // through LazyPackageFragmentScopeForJavaPackage@161
+    membersProtos = LinkedHashMap@164 // through DeserializedPackageMemberScope@162
+    properties('A': Name@148) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
+    properties('Unit': Name@165) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
+    properties('bar': Name@154) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
+    properties('foo': Name@155) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
+    properties('get': Name@14) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
+    properties('self': Name@157) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
+    properties('set': Name@17) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
+    properties('toString': Name@42) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
+    properties('x': Name@166) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
+    properties('y': Name@167) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
+    properties('z': Name@168) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
+}
+
+LazyJavaPackageFragment@114['java'] {
+    classes('lang': Name@169) = null // through LazyPackageFragmentScopeForJavaPackage@170
+    deserializedPackageScope = Empty@158 // through LazyPackageFragmentScopeForJavaPackage@170
+    functions('lang': Name@171) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@170
+    memberIndex = computeMemberIndex$1@172 // through LazyPackageFragmentScopeForJavaPackage@170
+}
+
+LazyJavaPackageFragment@136['jvm'] {
+    classes('A': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@173
+    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@173
+    classes('Unit': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@173
+    classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@173
+    classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@173
+    classes('get': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@173
+    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@173
+    classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@173
+    classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@173
+    classes('toString': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@173
+    deserializedPackageScope = Empty@158 // through LazyPackageFragmentScopeForJavaPackage@173
+    functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@173
+    functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@173
+    functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@173
+    functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@173
+    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@173
+    functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@173
+    functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@173
+    functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@173
+    memberIndex = computeMemberIndex$1@174 // through LazyPackageFragmentScopeForJavaPackage@173
 }
 
 LazyJavaPackageFragment@38['kotlin'] {
-    classes('A': Name@144) = 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@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@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@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
+    classes('A': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@175
+    classes('Any': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@175
+    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@175
+    classes('Unit': Name@153) = DeserializedClassDescriptor@12['Unit'] // through LazyPackageFragmentScopeForJavaPackage@175
+    classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@175
+    classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@175
+    classes('get': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@175
+    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@175
+    classes('io': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@175
+    classes('jvm': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@175
+    classes('reflect': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@175
+    classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@175
+    classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@175
+    classes('toString': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@175
+    deserializedPackageScope = DeserializedPackageMemberScope@180 // through LazyPackageFragmentScopeForJavaPackage@175
+    functions('A': Name@148) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
+    functions('bar': Name@154) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
+    functions('foo': Name@155) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
+    functions('get': Name@14) = ArrayList@181[2] { DeserializedSimpleFunctionDescriptor@182['get'], DeserializedSimpleFunctionDescriptor@183['get'] } // through DeserializedPackageMemberScope@180
+    functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
+    functions('invoke': Name@40) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
+    functions('io': Name@184) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    functions('io': Name@184) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
+    functions('jvm': Name@185) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    functions('jvm': Name@185) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
+    functions('reflect': Name@186) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    functions('reflect': Name@186) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
+    functions('self': Name@157) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
+    functions('set': Name@17) = ArrayList@187[1] { DeserializedSimpleFunctionDescriptor@188['set'] } // through DeserializedPackageMemberScope@180
+    functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
+    functions('toString': Name@42) = ArrayList@189[3] { DeserializedSimpleFunctionDescriptor@190['toString'], DeserializedSimpleFunctionDescriptor@191['toString'], DeserializedSimpleFunctionDescriptor@192['toString'] } // through DeserializedPackageMemberScope@180
+    functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
+    memberIndex = computeMemberIndex$1@193 // through LazyPackageFragmentScopeForJavaPackage@175
+    membersProtos = LinkedHashMap@194 // through DeserializedPackageMemberScope@180
+    properties('A': Name@148) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    properties('Unit': Name@165) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    properties('bar': Name@154) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    properties('foo': Name@155) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    properties('get': Name@14) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    properties('io': Name@184) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    properties('jvm': Name@185) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    properties('reflect': Name@186) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    properties('self': Name@157) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    properties('set': Name@17) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    properties('toString': Name@42) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    properties('x': Name@166) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    properties('y': Name@167) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    properties('z': Name@168) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
 }
 
-LazyJavaPackageFragment@112['lang'] {
-    classes('A': Name@144) = 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@153) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('toString': Name@42) = null // 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@116['lang'] {
+    classes('A': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@195
+    classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@195
+    classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@195
+    classes('get': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@195
+    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@195
+    classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@195
+    classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@195
+    classes('toString': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@195
+    deserializedPackageScope = Empty@158 // through LazyPackageFragmentScopeForJavaPackage@195
+    functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@195
+    functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@195
+    functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@195
+    functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@195
+    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@195
+    functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@195
+    functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@195
+    functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@195
+    memberIndex = computeMemberIndex$1@196 // through LazyPackageFragmentScopeForJavaPackage@195
 }
 
 LazyJavaPackageFragment@13['reflect'] {
-    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@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@153) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('toString': Name@42) = null // 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
+    classes('A': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('KCallable': Name@198) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('KMemberProperty': Name@199) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('KMutableMemberProperty': Name@200) = DeserializedClassDescriptor@6['KMutableMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('KMutableProperty': Name@201) = DeserializedClassDescriptor@8['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('KProperty': Name@202) = DeserializedClassDescriptor@10['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('Unit': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('get': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('toString': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    deserializedPackageScope = Empty@158 // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    memberIndex = computeMemberIndex$1@203 // through LazyPackageFragmentScopeForJavaPackage@197
 }
 
-NestedClassDescriptors@200 {
-    findClass('get': Name@14) = null
-    findClass('set': Name@17) = null
+NestedClassDescriptors@204 {
+    findNestedClass('get': Name@14) = null
+    findNestedClass('set': Name@17) = null
 }
 
-NestedClassDescriptors@201 {
-    findClass('get': Name@202) = null
+NestedClassDescriptors@205 {
+    findNestedClass('get': Name@103) = null
 }
 
-NestedClassDescriptors@203 {
-    findClass('invoke': Name@40) = null
-    findClass('toString': Name@42) = null
-}
-
-TypeDeserializer@204 {
-    classDescriptors('2': Integer@205) = DeserializedClassDescriptor@206['Any']
+NestedClassDescriptors@206 {
+    findNestedClass('invoke': Name@40) = null
+    findNestedClass('toString': Name@42) = null
 }
 
 TypeDeserializer@207 {
-    classDescriptors('3': Integer@208) = DeserializedClassDescriptor@206['Any']
-    classDescriptors('4': Integer@209) = DeserializedClassDescriptor@4['KMemberProperty']
-    classDescriptors('5': Integer@210) = DeserializedClassDescriptor@8['KMutableProperty']
+    classDescriptors('2': Integer@208) = DeserializedClassDescriptor@209['Any']
 }
 
-TypeDeserializer@211 {
-    classDescriptors('3': Integer@208) = DeserializedClassDescriptor@206['Any']
-    classDescriptors('4': Integer@209) = DeserializedClassDescriptor@10['KProperty']
+TypeDeserializer@210 {
+    classDescriptors('3': Integer@211) = DeserializedClassDescriptor@209['Any']
+    classDescriptors('4': Integer@212) = DeserializedClassDescriptor@4['KMemberProperty']
+    classDescriptors('5': Integer@213) = DeserializedClassDescriptor@8['KMutableProperty']
 }
 
-TypeDeserializer@212 {
-    classDescriptors('3': Integer@208) = DeserializedClassDescriptor@206['Any']
-}
-
-TypeDeserializer@213 {
-    classDescriptors('3': Integer@208) = DeserializedClassDescriptor@214['String']
+TypeDeserializer@214 {
+    classDescriptors('3': Integer@211) = DeserializedClassDescriptor@209['Any']
+    classDescriptors('4': Integer@212) = DeserializedClassDescriptor@10['KProperty']
 }
 
 TypeDeserializer@215 {
-    classDescriptors('4': Integer@209) = DeserializedClassDescriptor@2['KCallable']
+    classDescriptors('3': Integer@211) = DeserializedClassDescriptor@209['Any']
 }
 
 TypeDeserializer@216 {
-    classDescriptors('4': Integer@209) = DeserializedClassDescriptor@10['KProperty']
+    classDescriptors('3': Integer@211) = DeserializedClassDescriptor@217['String']
 }
 
-TypeDeserializer@217 {
-    classDescriptors('6': Integer@218) = DeserializedClassDescriptor@12['Unit']
+TypeDeserializer@218 {
+    classDescriptors('4': Integer@212) = DeserializedClassDescriptor@2['KCallable']
+}
+
+TypeDeserializer@219 {
+    classDescriptors('4': Integer@212) = DeserializedClassDescriptor@10['KProperty']
+}
+
+TypeDeserializer@220 {
+    classDescriptors('6': Integer@221) = DeserializedClassDescriptor@12['Unit']
 }

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

@@ -15,7 +15,7 @@ DeserializedClassDescriptor@2['KCallable'] {
     containingDeclaration = LazyJavaPackageFragment@15['reflect']
     functions('get': Name@16) = EmptyList@17[empty] // through DeserializedClassMemberScope@18
     functions('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@18
-    membersProtos = HashMap@20 // through DeserializedClassMemberScope@18
+    membersProtos = LinkedHashMap@20 // through DeserializedClassMemberScope@18
     properties('get': Name@16) = EmptyList@17[empty] // through DeserializedClassMemberScope@18
     properties('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@18
 }
@@ -25,7 +25,7 @@ DeserializedClassDescriptor@4['KMemberProperty'] {
     defaultType = JetTypeImpl@21['KMemberProperty<2>']
     functions('get': Name@16) = ArrayList@22[1] { DeserializedSimpleFunctionDescriptor@23['get'] } // through DeserializedClassMemberScope@24
     functions('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@24
-    membersProtos = HashMap@25 // through DeserializedClassMemberScope@24
+    membersProtos = LinkedHashMap@25 // through DeserializedClassMemberScope@24
     properties('get': Name@16) = EmptyList@17[empty] // through DeserializedClassMemberScope@24
     properties('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@24
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@26['<this>']
@@ -36,7 +36,7 @@ DeserializedClassDescriptor@6['KMutableMemberProperty'] {
     defaultType = JetTypeImpl@27['KMutableMemberProperty<2>']
     functions('get': Name@28) = ArrayList@29[1] { DeserializedSimpleFunctionDescriptor@30['get'] } // through DeserializedClassMemberScope@31
     functions('set': Name@32) = ArrayList@33[1] { DeserializedSimpleFunctionDescriptor@34['set'] } // through DeserializedClassMemberScope@31
-    membersProtos = HashMap@35 // through DeserializedClassMemberScope@31
+    membersProtos = LinkedHashMap@35 // through DeserializedClassMemberScope@31
     properties('get': Name@28) = EmptyList@17[empty] // through DeserializedClassMemberScope@31
     properties('set': Name@32) = EmptyList@17[empty] // through DeserializedClassMemberScope@31
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@36['<this>']
@@ -46,7 +46,7 @@ DeserializedClassDescriptor@8['KMutableProperty'] {
     containingDeclaration = LazyJavaPackageFragment@15['reflect']
     functions('get': Name@28) = EmptyList@17[empty] // through DeserializedClassMemberScope@37
     functions('set': Name@32) = EmptyList@17[empty] // through DeserializedClassMemberScope@37
-    membersProtos = HashMap@38 // through DeserializedClassMemberScope@37
+    membersProtos = LinkedHashMap@38 // through DeserializedClassMemberScope@37
     properties('get': Name@28) = EmptyList@17[empty] // through DeserializedClassMemberScope@37
     properties('set': Name@32) = EmptyList@17[empty] // through DeserializedClassMemberScope@37
 }
@@ -55,7 +55,7 @@ DeserializedClassDescriptor@10['KProperty'] {
     containingDeclaration = LazyJavaPackageFragment@15['reflect']
     functions('get': Name@16) = EmptyList@17[empty] // through DeserializedClassMemberScope@39
     functions('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@39
-    membersProtos = HashMap@40 // through DeserializedClassMemberScope@39
+    membersProtos = LinkedHashMap@40 // through DeserializedClassMemberScope@39
     properties('get': Name@16) = EmptyList@17[empty] // through DeserializedClassMemberScope@39
     properties('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@39
 }
@@ -119,27 +119,27 @@ DeserializedType@77['K in kotlin'] {
 }
 
 DeserializedType@78['R in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@48
+    constructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 DeserializedType@79['R in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@53
+    constructor = AbstractLazyTypeParameterDescriptor$1@48
 }
 
 DeserializedType@80['R in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@53
+    constructor = AbstractLazyTypeParameterDescriptor$1@48
 }
 
 DeserializedType@81['T in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@69
+    constructor = AbstractLazyTypeParameterDescriptor$1@64
 }
 
 DeserializedType@82['T in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@64
+    constructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
 DeserializedType@83['T in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@64
+    constructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
 DeserializedType@84['V in kotlin'] {
@@ -154,32 +154,32 @@ DeserializedType@86['V in kotlin'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
+DeserializedType@45['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@87
+    memberScope = DeserializedClassMemberScope@88
+}
+
 DeserializedType@71['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@87
     memberScope = DeserializedClassMemberScope@88
 }
 
-DeserializedType@50['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@87
-    memberScope = DeserializedClassMemberScope@88
-}
-
-DeserializedType@55['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@87
-    memberScope = DeserializedClassMemberScope@88
-}
-
-DeserializedType@75['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@87
-    memberScope = DeserializedClassMemberScope@88
-}
-
 DeserializedType@66['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@87
     memberScope = DeserializedClassMemberScope@88
 }
 
-DeserializedType@45['kotlin.Any'] {
+DeserializedType@55['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@87
+    memberScope = DeserializedClassMemberScope@88
+}
+
+DeserializedType@50['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@87
+    memberScope = DeserializedClassMemberScope@88
+}
+
+DeserializedType@75['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@87
     memberScope = DeserializedClassMemberScope@88
 }
@@ -232,260 +232,270 @@ DeserializedType@111['kotlin.reflect.KProperty'] {
     memberScope = SubstitutingScope@112
 }
 
-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
+EnumEntryClassDescriptors@113 {
+    findEnumEntry('get': Name@16) = null
+    findEnumEntry('set': Name@19) = null
 }
 
-LazyJavaPackageFragment@115['<root>'] {
-    classes('A': Name@156) = 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@164) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('kotlin': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('set': Name@19) = null // 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
+EnumEntryClassDescriptors@114 {
+    findEnumEntry('get': Name@28) = null
+    findEnumEntry('set': Name@32) = null
 }
 
-LazyJavaPackageFragment@137['io'] {
-    classes('A': Name@156) = 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@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('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('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@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
+LazyJavaPackageFragmentProvider@115 {
+    packageFragments('<root>': FqName@116) = LazyJavaPackageFragment@117['<root>']
+    packageFragments('A': FqName@118) = null
+    packageFragments('Int': FqName@119) = null
+    packageFragments('KMemberProperty': FqName@120) = null
+    packageFragments('KMutableMemberProperty': FqName@121) = null
+    packageFragments('String': FqName@122) = null
+    packageFragments('java': FqName@123) = LazyJavaPackageFragment@124['java']
+    packageFragments('java.lang': FqName@125) = LazyJavaPackageFragment@126['lang']
+    packageFragments('java.lang.A': FqName@127) = null
+    packageFragments('java.lang.Int': FqName@128) = null
+    packageFragments('java.lang.KMemberProperty': FqName@129) = null
+    packageFragments('java.lang.KMutableMemberProperty': FqName@130) = null
+    packageFragments('java.lang.String': FqName@131) = null
+    packageFragments('kotlin': FqName@132) = LazyJavaPackageFragment@41['kotlin']
+    packageFragments('kotlin.A': FqName@133) = null
+    packageFragments('kotlin.Int': FqName@134) = null
+    packageFragments('kotlin.KMemberProperty': FqName@135) = null
+    packageFragments('kotlin.KMutableMemberProperty': FqName@136) = null
+    packageFragments('kotlin.String': FqName@137) = null
+    packageFragments('kotlin.io': FqName@138) = LazyJavaPackageFragment@139['io']
+    packageFragments('kotlin.io.A': FqName@140) = null
+    packageFragments('kotlin.io.Int': FqName@141) = null
+    packageFragments('kotlin.io.KMemberProperty': FqName@142) = null
+    packageFragments('kotlin.io.KMutableMemberProperty': FqName@143) = null
+    packageFragments('kotlin.io.String': FqName@144) = null
+    packageFragments('kotlin.jvm': FqName@145) = LazyJavaPackageFragment@146['jvm']
+    packageFragments('kotlin.jvm.A': FqName@147) = null
+    packageFragments('kotlin.jvm.Int': FqName@148) = null
+    packageFragments('kotlin.jvm.KMemberProperty': FqName@149) = null
+    packageFragments('kotlin.jvm.KMutableMemberProperty': FqName@150) = null
+    packageFragments('kotlin.jvm.String': FqName@151) = null
+    packageFragments('kotlin.reflect': FqName@152) = LazyJavaPackageFragment@15['reflect']
+    packageFragments('kotlin.reflect.A': FqName@153) = null
+    packageFragments('kotlin.reflect.Int': FqName@154) = null
+    packageFragments('kotlin.reflect.KMemberProperty': FqName@155) = null
+    packageFragments('kotlin.reflect.KMutableMemberProperty': FqName@156) = null
+    packageFragments('kotlin.reflect.String': FqName@157) = null
 }
 
-LazyJavaPackageFragment@122['java'] {
-    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@117['<root>'] {
+    classes('A': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@159
+    classes('Int': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@159
+    classes('KMemberProperty': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@159
+    classes('KMutableMemberProperty': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@159
+    classes('String': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@159
+    classes('bar': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@159
+    classes('foo': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@159
+    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@159
+    classes('invoke': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@159
+    classes('kotlin': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@159
+    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@159
+    deserializedPackageScope = Empty@168 // through LazyPackageFragmentScopeForJavaPackage@159
+    functions('A': Name@158) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@159
+    functions('bar': Name@164) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@159
+    functions('foo': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@159
+    functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@159
+    functions('invoke': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@159
+    functions('kotlin': Name@169) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@159
+    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@159
+    memberIndex = computeMemberIndex$1@170 // through LazyPackageFragmentScopeForJavaPackage@159
 }
 
-LazyJavaPackageFragment@144['jvm'] {
-    classes('A': Name@156) = 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@164) = null // through LazyPackageFragmentScopeForJavaPackage@177
-    classes('set': Name@19) = null // 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@139['io'] {
+    classes('A': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@171
+    classes('Int': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@171
+    classes('String': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@171
+    classes('bar': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@171
+    classes('foo': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@171
+    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@171
+    classes('invoke': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@171
+    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@171
+    deserializedPackageScope = DeserializedPackageMemberScope@172 // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('A': Name@158) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
+    functions('A': Name@158) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('bar': Name@164) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
+    functions('bar': Name@164) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('foo': Name@165) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
+    functions('foo': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('get': Name@16) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
+    functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('invoke': Name@166) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
+    functions('invoke': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('set': Name@19) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
+    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@171
+    memberIndex = computeMemberIndex$1@173 // through LazyPackageFragmentScopeForJavaPackage@171
+    membersProtos = LinkedHashMap@174 // through DeserializedPackageMemberScope@172
+    properties('A': Name@158) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
+    properties('bar': Name@164) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
+    properties('foo': Name@165) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
+    properties('get': Name@16) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
+    properties('set': Name@19) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
+}
+
+LazyJavaPackageFragment@124['java'] {
+    classes('lang': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@176
+    deserializedPackageScope = Empty@168 // through LazyPackageFragmentScopeForJavaPackage@176
+    functions('lang': Name@177) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@176
+    memberIndex = computeMemberIndex$1@178 // through LazyPackageFragmentScopeForJavaPackage@176
+}
+
+LazyJavaPackageFragment@146['jvm'] {
+    classes('A': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('Int': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('String': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('bar': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('foo': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('invoke': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    deserializedPackageScope = Empty@168 // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('A': Name@158) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('bar': Name@164) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('foo': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('invoke': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    memberIndex = computeMemberIndex$1@180 // through LazyPackageFragmentScopeForJavaPackage@179
 }
 
 LazyJavaPackageFragment@41['kotlin'] {
-    classes('A': Name@156) = 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@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@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@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
+    classes('A': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@181
+    classes('Any': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@181
+    classes('CharSequence': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@181
+    classes('Int': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@181
+    classes('MutableMap': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@181
+    classes('String': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@181
+    classes('Unit': Name@185) = DeserializedClassDescriptor@12['Unit'] // through LazyPackageFragmentScopeForJavaPackage@181
+    classes('bar': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@181
+    classes('foo': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@181
+    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@181
+    classes('invoke': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@181
+    classes('io': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@181
+    classes('jvm': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@181
+    classes('reflect': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@181
+    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@181
+    deserializedPackageScope = DeserializedPackageMemberScope@189 // through LazyPackageFragmentScopeForJavaPackage@181
+    functions('A': Name@158) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
+    functions('A': Name@158) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@181
+    functions('bar': Name@164) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
+    functions('bar': Name@164) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@181
+    functions('foo': Name@165) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
+    functions('foo': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@181
+    functions('get': Name@16) = ArrayList@190[2] { DeserializedSimpleFunctionDescriptor@191['get'], DeserializedSimpleFunctionDescriptor@192['get'] } // through DeserializedPackageMemberScope@189
+    functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@181
+    functions('invoke': Name@166) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
+    functions('invoke': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@181
+    functions('io': Name@193) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
+    functions('io': Name@193) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@181
+    functions('jvm': Name@194) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
+    functions('jvm': Name@194) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@181
+    functions('reflect': Name@195) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
+    functions('reflect': Name@195) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@181
+    functions('set': Name@19) = ArrayList@196[1] { DeserializedSimpleFunctionDescriptor@197['set'] } // through DeserializedPackageMemberScope@189
+    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@181
+    memberIndex = computeMemberIndex$1@198 // through LazyPackageFragmentScopeForJavaPackage@181
+    membersProtos = LinkedHashMap@199 // through DeserializedPackageMemberScope@189
+    properties('A': Name@158) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
+    properties('bar': Name@164) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
+    properties('foo': Name@165) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
+    properties('get': Name@16) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
+    properties('io': Name@193) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
+    properties('jvm': Name@194) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
+    properties('reflect': Name@195) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
+    properties('set': Name@19) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
 }
 
-LazyJavaPackageFragment@124['lang'] {
-    classes('A': Name@156) = 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@164) = null // through LazyPackageFragmentScopeForJavaPackage@198
-    classes('set': Name@19) = null // 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@126['lang'] {
+    classes('A': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('bar': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('foo': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('invoke': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    deserializedPackageScope = Empty@168 // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('A': Name@158) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('bar': Name@164) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('foo': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('invoke': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    memberIndex = computeMemberIndex$1@201 // through LazyPackageFragmentScopeForJavaPackage@200
 }
 
 LazyJavaPackageFragment@15['reflect'] {
-    classes('A': Name@156) = 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@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@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@164) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('set': Name@19) = null // 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
+    classes('A': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('Int': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('KCallable': Name@203) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('KMemberProperty': Name@204) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('KMutableMemberProperty': Name@162) = DeserializedClassDescriptor@6['KMutableMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('KMutableProperty': Name@205) = DeserializedClassDescriptor@8['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('KProperty': Name@206) = DeserializedClassDescriptor@10['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('String': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('bar': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('foo': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('invoke': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@202
+    deserializedPackageScope = Empty@168 // through LazyPackageFragmentScopeForJavaPackage@202
+    functions('A': Name@158) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@202
+    functions('bar': Name@164) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@202
+    functions('foo': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@202
+    functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@202
+    functions('invoke': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@202
+    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@202
+    memberIndex = computeMemberIndex$1@207 // through LazyPackageFragmentScopeForJavaPackage@202
 }
 
-NestedClassDescriptors@206 {
-    findClass('get': Name@16) = null
-    findClass('set': Name@19) = null
+NestedClassDescriptors@208 {
+    findNestedClass('get': Name@16) = null
+    findNestedClass('set': Name@19) = null
 }
 
-NestedClassDescriptors@207 {
-    findClass('get': Name@28) = null
-    findClass('set': Name@32) = null
+NestedClassDescriptors@209 {
+    findNestedClass('get': Name@28) = null
+    findNestedClass('set': Name@32) = null
 }
 
-TypeDeserializer@208 {
-    classDescriptors('102': Integer@209) = DeserializedClassDescriptor@210['MutableMap']
-    classDescriptors('2': Integer@211) = DeserializedClassDescriptor@212['Any']
+TypeDeserializer@210 {
+    classDescriptors('129': Integer@211) = DeserializedClassDescriptor@212['MutableMap']
+    classDescriptors('9': Integer@213) = DeserializedClassDescriptor@214['Any']
 }
 
-TypeDeserializer@213 {
-    classDescriptors('3': Integer@214) = DeserializedClassDescriptor@212['Any']
-    classDescriptors('4': Integer@215) = DeserializedClassDescriptor@4['KMemberProperty']
-    classDescriptors('5': Integer@216) = DeserializedClassDescriptor@8['KMutableProperty']
-}
-
-TypeDeserializer@217 {
-    classDescriptors('3': Integer@214) = DeserializedClassDescriptor@212['Any']
-    classDescriptors('4': Integer@215) = DeserializedClassDescriptor@10['KProperty']
-}
-
-TypeDeserializer@218 {
-    classDescriptors('3': Integer@214) = DeserializedClassDescriptor@212['Any']
+TypeDeserializer@215 {
+    classDescriptors('3': Integer@216) = DeserializedClassDescriptor@214['Any']
+    classDescriptors('4': Integer@217) = DeserializedClassDescriptor@4['KMemberProperty']
+    classDescriptors('5': Integer@218) = DeserializedClassDescriptor@8['KMutableProperty']
 }
 
 TypeDeserializer@219 {
-    classDescriptors('4': Integer@215) = DeserializedClassDescriptor@2['KCallable']
+    classDescriptors('3': Integer@216) = DeserializedClassDescriptor@214['Any']
+    classDescriptors('4': Integer@217) = DeserializedClassDescriptor@10['KProperty']
 }
 
 TypeDeserializer@220 {
-    classDescriptors('4': Integer@215) = DeserializedClassDescriptor@10['KProperty']
+    classDescriptors('3': Integer@216) = DeserializedClassDescriptor@214['Any']
 }
 
 TypeDeserializer@221 {
-    classDescriptors('59': Integer@222) = DeserializedClassDescriptor@223['CharSequence']
+    classDescriptors('4': Integer@217) = DeserializedClassDescriptor@2['KCallable']
 }
 
-TypeDeserializer@224 {
-    classDescriptors('59': Integer@222) = DeserializedClassDescriptor@223['CharSequence']
+TypeDeserializer@222 {
+    classDescriptors('4': Integer@217) = DeserializedClassDescriptor@10['KProperty']
 }
 
-TypeDeserializer@225 {
-    classDescriptors('6': Integer@226) = DeserializedClassDescriptor@12['Unit']
+TypeDeserializer@223 {
+    classDescriptors('40': Integer@224) = DeserializedClassDescriptor@225['CharSequence']
+}
+
+TypeDeserializer@226 {
+    classDescriptors('40': Integer@224) = DeserializedClassDescriptor@225['CharSequence']
+}
+
+TypeDeserializer@227 {
+    classDescriptors('6': Integer@228) = DeserializedClassDescriptor@12['Unit']
 }

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

@@ -16,7 +16,7 @@ DeserializedClassDescriptor@2['KCallable'] {
     defaultType = JetTypeImpl@22['KCallable<1>']
     functions('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@25
     functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@25
-    membersProtos = HashMap@27 // through DeserializedClassMemberScope@25
+    membersProtos = LinkedHashMap@27 // through DeserializedClassMemberScope@25
     properties('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@25
     properties('name': Name@28) = ArrayList@29[1] { DeserializedPropertyDescriptor@30['name'] } // through DeserializedClassMemberScope@25
     properties('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@25
@@ -27,7 +27,7 @@ DeserializedClassDescriptor@4['KMutableProperty'] {
     containingDeclaration = LazyJavaPackageFragment@21['reflect']
     functions('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@32
     functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@32
-    membersProtos = HashMap@33 // through DeserializedClassMemberScope@32
+    membersProtos = LinkedHashMap@33 // through DeserializedClassMemberScope@32
     properties('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@32
     properties('name': Name@28) = ArrayList@34[1] { DeserializedPropertyDescriptor@35['name'] } // through DeserializedClassMemberScope@32
     properties('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@32
@@ -37,7 +37,7 @@ DeserializedClassDescriptor@6['KMutableTopLevelProperty'] {
     containingDeclaration = LazyJavaPackageFragment@21['reflect']
     functions('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@36
     functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@36
-    membersProtos = HashMap@37 // through DeserializedClassMemberScope@36
+    membersProtos = LinkedHashMap@37 // through DeserializedClassMemberScope@36
     properties('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@36
     properties('name': Name@28) = ArrayList@38[1] { DeserializedPropertyDescriptor@39['name'] } // through DeserializedClassMemberScope@36
     properties('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@36
@@ -47,7 +47,7 @@ DeserializedClassDescriptor@8['KMutableTopLevelVariable'] {
     containingDeclaration = LazyJavaPackageFragment@21['reflect']
     functions('get': Name@23) = ArrayList@40[1] { DeserializedSimpleFunctionDescriptor@41['get'] } // through DeserializedClassMemberScope@42
     functions('set': Name@26) = ArrayList@43[1] { DeserializedSimpleFunctionDescriptor@44['set'] } // through DeserializedClassMemberScope@42
-    membersProtos = HashMap@45 // through DeserializedClassMemberScope@42
+    membersProtos = LinkedHashMap@45 // through DeserializedClassMemberScope@42
     properties('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@42
     properties('name': Name@28) = ArrayList@46[1] { DeserializedPropertyDescriptor@47['name'] } // through DeserializedClassMemberScope@42
     properties('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@42
@@ -58,7 +58,7 @@ DeserializedClassDescriptor@10['KMutableVariable'] {
     defaultType = JetTypeImpl@48['KMutableVariable<1>']
     functions('get': Name@23) = ArrayList@49[1] { DeserializedSimpleFunctionDescriptor@50['get'] } // through DeserializedClassMemberScope@51
     functions('set': Name@26) = ArrayList@52[1] { DeserializedSimpleFunctionDescriptor@53['set'] } // through DeserializedClassMemberScope@51
-    membersProtos = HashMap@54 // through DeserializedClassMemberScope@51
+    membersProtos = LinkedHashMap@54 // through DeserializedClassMemberScope@51
     properties('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@51
     properties('name': Name@28) = ArrayList@55[1] { DeserializedPropertyDescriptor@56['name'] } // through DeserializedClassMemberScope@51
     properties('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@51
@@ -69,7 +69,7 @@ DeserializedClassDescriptor@12['KProperty'] {
     containingDeclaration = LazyJavaPackageFragment@21['reflect']
     functions('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@58
     functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@58
-    membersProtos = HashMap@59 // through DeserializedClassMemberScope@58
+    membersProtos = LinkedHashMap@59 // through DeserializedClassMemberScope@58
     properties('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@58
     properties('name': Name@28) = ArrayList@60[1] { DeserializedPropertyDescriptor@61['name'] } // through DeserializedClassMemberScope@58
     properties('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@58
@@ -79,7 +79,7 @@ DeserializedClassDescriptor@14['KTopLevelProperty'] {
     containingDeclaration = LazyJavaPackageFragment@21['reflect']
     functions('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@62
     functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@62
-    membersProtos = HashMap@63 // through DeserializedClassMemberScope@62
+    membersProtos = LinkedHashMap@63 // through DeserializedClassMemberScope@62
     properties('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@62
     properties('name': Name@28) = ArrayList@64[1] { DeserializedPropertyDescriptor@65['name'] } // through DeserializedClassMemberScope@62
     properties('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@62
@@ -90,7 +90,7 @@ DeserializedClassDescriptor@16['KTopLevelVariable'] {
     defaultType = JetTypeImpl@66['KTopLevelVariable<1>']
     functions('get': Name@23) = ArrayList@67[1] { DeserializedSimpleFunctionDescriptor@68['get'] } // through DeserializedClassMemberScope@69
     functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@69
-    membersProtos = HashMap@70 // through DeserializedClassMemberScope@69
+    membersProtos = LinkedHashMap@70 // through DeserializedClassMemberScope@69
     properties('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@69
     properties('name': Name@28) = ArrayList@71[1] { DeserializedPropertyDescriptor@72['name'] } // through DeserializedClassMemberScope@69
     properties('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@69
@@ -101,7 +101,7 @@ DeserializedClassDescriptor@18['KVariable'] {
     defaultType = JetTypeImpl@73['KVariable<1>']
     functions('get': Name@23) = ArrayList@74[1] { DeserializedSimpleFunctionDescriptor@75['get'] } // through DeserializedClassMemberScope@76
     functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@76
-    membersProtos = HashMap@77 // through DeserializedClassMemberScope@76
+    membersProtos = LinkedHashMap@77 // through DeserializedClassMemberScope@76
     properties('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@76
     properties('name': Name@28) = ArrayList@78[1] { DeserializedPropertyDescriptor@79['name'] } // through DeserializedClassMemberScope@76
     properties('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@76
@@ -179,57 +179,57 @@ DeserializedType@129['K in kotlin'] {
 }
 
 DeserializedType@130['R in kotlin.reflect.KMutableProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@105
-}
-
-DeserializedType@131['R in kotlin.reflect.KMutableTopLevelProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@113
-}
-
-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@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'] {
+DeserializedType@131['R in kotlin.reflect.KMutableTopLevelProperty'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@105
+}
+
+DeserializedType@132['R in kotlin.reflect.KMutableTopLevelProperty'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@105
+}
+
+DeserializedType@133['R in kotlin.reflect.KMutableTopLevelVariable'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@121
 }
 
-DeserializedType@141['R in kotlin.reflect.KTopLevelVariable'] {
+DeserializedType@134['R in kotlin.reflect.KMutableTopLevelVariable'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@121
+}
+
+DeserializedType@135['R in kotlin.reflect.KMutableTopLevelVariable'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@121
+}
+
+DeserializedType@136['R in kotlin.reflect.KMutableVariable'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@98
 }
 
-DeserializedType@142['R in kotlin.reflect.KTopLevelVariable'] {
+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@117
+}
+
+DeserializedType@140['R in kotlin.reflect.KTopLevelProperty'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@113
+}
+
+DeserializedType@141['R in kotlin.reflect.KTopLevelVariable'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@93
+}
+
+DeserializedType@142['R in kotlin.reflect.KTopLevelVariable'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@93
+}
+
 DeserializedType@143['R in kotlin.reflect.KVariable'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@103
 }
@@ -250,12 +250,12 @@ DeserializedType@147['V in kotlin'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@125
 }
 
-DeserializedType@95['kotlin.Any'] {
+DeserializedType@85['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@148
     memberScope = DeserializedClassMemberScope@149
 }
 
-DeserializedType@150['kotlin.Any'] {
+DeserializedType@115['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@148
     memberScope = DeserializedClassMemberScope@149
 }
@@ -265,21 +265,6 @@ DeserializedType@90['kotlin.Any'] {
     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
@@ -290,12 +275,27 @@ DeserializedType@111['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@149
 }
 
-DeserializedType@85['kotlin.Any'] {
+DeserializedType@150['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@148
     memberScope = DeserializedClassMemberScope@149
 }
 
-DeserializedType@115['kotlin.Any'] {
+DeserializedType@107['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@148
+    memberScope = DeserializedClassMemberScope@149
+}
+
+DeserializedType@95['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@148
+    memberScope = DeserializedClassMemberScope@149
+}
+
+DeserializedType@100['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@148
+    memberScope = DeserializedClassMemberScope@149
+}
+
+DeserializedType@127['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@148
     memberScope = DeserializedClassMemberScope@149
 }
@@ -385,310 +385,322 @@ DeserializedType@192['kotlin.reflect.KVariable'] {
     memberScope = SubstitutingScope@193
 }
 
-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
+EnumEntryClassDescriptors@194 {
+    findEnumEntry('get': Name@195) = null
+    findEnumEntry('name': Name@196) = null
+    findEnumEntry('set': Name@197) = null
 }
 
-LazyJavaPackageFragment@196['<root>'] {
-    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
+EnumEntryClassDescriptors@198 {
+    findEnumEntry('get': Name@23) = null
+    findEnumEntry('name': Name@28) = null
+    findEnumEntry('set': Name@26) = null
 }
 
-LazyJavaPackageFragment@233['io'] {
-    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@280) = null // through LazyPackageFragmentScopeForJavaPackage@287
-    classes('set': Name@26) = 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('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('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@282) = EmptyList@24[empty] // through DeserializedPackageMemberScope@288
-    properties('y': Name@283) = EmptyList@24[empty] // through DeserializedPackageMemberScope@288
+LazyJavaPackageFragmentProvider@199 {
+    packageFragments('<root>': FqName@200) = LazyJavaPackageFragment@201['<root>']
+    packageFragments('Int': FqName@202) = null
+    packageFragments('KCallable': FqName@203) = null
+    packageFragments('KMutableProperty': FqName@204) = null
+    packageFragments('KMutableTopLevelProperty': FqName@205) = null
+    packageFragments('KMutableTopLevelVariable': FqName@206) = null
+    packageFragments('KMutableVariable': FqName@207) = null
+    packageFragments('KProperty': FqName@208) = null
+    packageFragments('KTopLevelProperty': FqName@209) = null
+    packageFragments('KTopLevelVariable': FqName@210) = null
+    packageFragments('String': FqName@211) = null
+    packageFragments('java': FqName@212) = LazyJavaPackageFragment@213['java']
+    packageFragments('java.lang': FqName@214) = LazyJavaPackageFragment@215['lang']
+    packageFragments('java.lang.Int': FqName@216) = null
+    packageFragments('java.lang.KCallable': FqName@217) = null
+    packageFragments('java.lang.KMutableProperty': FqName@218) = null
+    packageFragments('java.lang.KMutableTopLevelProperty': FqName@219) = null
+    packageFragments('java.lang.KMutableTopLevelVariable': FqName@220) = null
+    packageFragments('java.lang.KMutableVariable': FqName@221) = null
+    packageFragments('java.lang.KProperty': FqName@222) = null
+    packageFragments('java.lang.KTopLevelProperty': FqName@223) = null
+    packageFragments('java.lang.KTopLevelVariable': FqName@224) = null
+    packageFragments('java.lang.String': FqName@225) = null
+    packageFragments('kotlin': FqName@226) = LazyJavaPackageFragment@81['kotlin']
+    packageFragments('kotlin.Int': FqName@227) = null
+    packageFragments('kotlin.KCallable': FqName@228) = null
+    packageFragments('kotlin.KMutableProperty': FqName@229) = null
+    packageFragments('kotlin.KMutableTopLevelProperty': FqName@230) = null
+    packageFragments('kotlin.KMutableTopLevelVariable': FqName@231) = null
+    packageFragments('kotlin.KMutableVariable': FqName@232) = null
+    packageFragments('kotlin.KProperty': FqName@233) = null
+    packageFragments('kotlin.KTopLevelProperty': FqName@234) = null
+    packageFragments('kotlin.KTopLevelVariable': FqName@235) = null
+    packageFragments('kotlin.String': FqName@236) = null
+    packageFragments('kotlin.io': FqName@237) = LazyJavaPackageFragment@238['io']
+    packageFragments('kotlin.io.Int': FqName@239) = null
+    packageFragments('kotlin.io.KCallable': FqName@240) = null
+    packageFragments('kotlin.io.KMutableProperty': FqName@241) = null
+    packageFragments('kotlin.io.KMutableTopLevelProperty': FqName@242) = null
+    packageFragments('kotlin.io.KMutableTopLevelVariable': FqName@243) = null
+    packageFragments('kotlin.io.KMutableVariable': FqName@244) = null
+    packageFragments('kotlin.io.KProperty': FqName@245) = null
+    packageFragments('kotlin.io.KTopLevelProperty': FqName@246) = null
+    packageFragments('kotlin.io.KTopLevelVariable': FqName@247) = null
+    packageFragments('kotlin.io.String': FqName@248) = null
+    packageFragments('kotlin.jvm': FqName@249) = LazyJavaPackageFragment@250['jvm']
+    packageFragments('kotlin.jvm.Int': FqName@251) = null
+    packageFragments('kotlin.jvm.KCallable': FqName@252) = null
+    packageFragments('kotlin.jvm.KMutableProperty': FqName@253) = null
+    packageFragments('kotlin.jvm.KMutableTopLevelProperty': FqName@254) = null
+    packageFragments('kotlin.jvm.KMutableTopLevelVariable': FqName@255) = null
+    packageFragments('kotlin.jvm.KMutableVariable': FqName@256) = null
+    packageFragments('kotlin.jvm.KProperty': FqName@257) = null
+    packageFragments('kotlin.jvm.KTopLevelProperty': FqName@258) = null
+    packageFragments('kotlin.jvm.KTopLevelVariable': FqName@259) = null
+    packageFragments('kotlin.jvm.String': FqName@260) = null
+    packageFragments('kotlin.reflect': FqName@261) = LazyJavaPackageFragment@21['reflect']
+    packageFragments('kotlin.reflect.Int': FqName@262) = null
+    packageFragments('kotlin.reflect.KCallable': FqName@263) = null
+    packageFragments('kotlin.reflect.KMutableProperty': FqName@264) = null
+    packageFragments('kotlin.reflect.KMutableTopLevelProperty': FqName@265) = null
+    packageFragments('kotlin.reflect.KMutableTopLevelVariable': FqName@266) = null
+    packageFragments('kotlin.reflect.KMutableVariable': FqName@267) = null
+    packageFragments('kotlin.reflect.KProperty': FqName@268) = null
+    packageFragments('kotlin.reflect.KTopLevelProperty': FqName@269) = null
+    packageFragments('kotlin.reflect.KTopLevelVariable': FqName@270) = null
+    packageFragments('kotlin.reflect.String': FqName@271) = null
+    packageFragments('x': FqName@272) = null
+    packageFragments('y': FqName@273) = null
 }
 
-LazyJavaPackageFragment@208['java'] {
-    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@201['<root>'] {
+    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@275
+    classes('KCallable': Name@276) = null // through LazyPackageFragmentScopeForJavaPackage@275
+    classes('KMutableProperty': Name@277) = null // through LazyPackageFragmentScopeForJavaPackage@275
+    classes('KMutableTopLevelProperty': Name@278) = null // through LazyPackageFragmentScopeForJavaPackage@275
+    classes('KMutableTopLevelVariable': Name@279) = null // through LazyPackageFragmentScopeForJavaPackage@275
+    classes('KMutableVariable': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@275
+    classes('KProperty': Name@281) = null // through LazyPackageFragmentScopeForJavaPackage@275
+    classes('KTopLevelProperty': Name@282) = null // through LazyPackageFragmentScopeForJavaPackage@275
+    classes('KTopLevelVariable': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@275
+    classes('String': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@275
+    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@275
+    classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@275
+    classes('kotlin': Name@286) = null // through LazyPackageFragmentScopeForJavaPackage@275
+    classes('set': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@275
+    classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@275
+    classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@275
+    deserializedPackageScope = Empty@289 // through LazyPackageFragmentScopeForJavaPackage@275
+    functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@275
+    functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@275
+    functions('kotlin': Name@290) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@275
+    functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@275
+    functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@275
+    functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@275
+    memberIndex = computeMemberIndex$1@291 // through LazyPackageFragmentScopeForJavaPackage@275
 }
 
-LazyJavaPackageFragment@245['jvm'] {
-    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@280) = null // through LazyPackageFragmentScopeForJavaPackage@297
-    classes('set': Name@26) = null // 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@238['io'] {
+    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@292
+    classes('String': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@292
+    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@292
+    classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@292
+    classes('set': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@292
+    classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@292
+    classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@292
+    deserializedPackageScope = DeserializedPackageMemberScope@293 // through LazyPackageFragmentScopeForJavaPackage@292
+    functions('get': Name@23) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
+    functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@292
+    functions('invoke': Name@285) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
+    functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@292
+    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
+    functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@292
+    functions('x': Name@287) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
+    functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@292
+    functions('y': Name@288) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
+    functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@292
+    memberIndex = computeMemberIndex$1@294 // through LazyPackageFragmentScopeForJavaPackage@292
+    membersProtos = LinkedHashMap@295 // through DeserializedPackageMemberScope@293
+    properties('get': Name@23) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
+    properties('name': Name@28) = ArrayList@296[1] { DeserializedPropertyDescriptor@297['name'] } // through DeserializedPackageMemberScope@293
+    properties('set': Name@26) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
+    properties('x': Name@287) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
+    properties('y': Name@288) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
+}
+
+LazyJavaPackageFragment@213['java'] {
+    classes('lang': Name@298) = null // through LazyPackageFragmentScopeForJavaPackage@299
+    deserializedPackageScope = Empty@289 // through LazyPackageFragmentScopeForJavaPackage@299
+    functions('lang': Name@300) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@299
+    memberIndex = computeMemberIndex$1@301 // through LazyPackageFragmentScopeForJavaPackage@299
+}
+
+LazyJavaPackageFragment@250['jvm'] {
+    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@302
+    classes('String': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@302
+    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@302
+    classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@302
+    classes('set': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@302
+    classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@302
+    classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@302
+    deserializedPackageScope = Empty@289 // through LazyPackageFragmentScopeForJavaPackage@302
+    functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@302
+    functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@302
+    functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@302
+    functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@302
+    functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@302
+    memberIndex = computeMemberIndex$1@303 // through LazyPackageFragmentScopeForJavaPackage@302
 }
 
 LazyJavaPackageFragment@81['kotlin'] {
-    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
+    classes('Any': Name@304) = null // through LazyPackageFragmentScopeForJavaPackage@305
+    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@305
+    classes('MutableMap': Name@306) = null // through LazyPackageFragmentScopeForJavaPackage@305
+    classes('String': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@305
+    classes('Unit': Name@307) = DeserializedClassDescriptor@20['Unit'] // through LazyPackageFragmentScopeForJavaPackage@305
+    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@305
+    classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@305
+    classes('io': Name@308) = null // through LazyPackageFragmentScopeForJavaPackage@305
+    classes('jvm': Name@309) = null // through LazyPackageFragmentScopeForJavaPackage@305
+    classes('reflect': Name@310) = null // through LazyPackageFragmentScopeForJavaPackage@305
+    classes('set': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@305
+    classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@305
+    classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@305
+    deserializedPackageScope = DeserializedPackageMemberScope@311 // through LazyPackageFragmentScopeForJavaPackage@305
+    functions('get': Name@23) = ArrayList@312[2] { DeserializedSimpleFunctionDescriptor@313['get'], DeserializedSimpleFunctionDescriptor@314['get'] } // through DeserializedPackageMemberScope@311
+    functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@305
+    functions('invoke': Name@285) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
+    functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@305
+    functions('io': Name@315) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
+    functions('io': Name@315) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@305
+    functions('jvm': Name@316) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
+    functions('jvm': Name@316) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@305
+    functions('reflect': Name@317) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
+    functions('reflect': Name@317) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@305
+    functions('set': Name@26) = ArrayList@318[1] { DeserializedSimpleFunctionDescriptor@319['set'] } // through DeserializedPackageMemberScope@311
+    functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@305
+    functions('x': Name@287) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
+    functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@305
+    functions('y': Name@288) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
+    functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@305
+    memberIndex = computeMemberIndex$1@320 // through LazyPackageFragmentScopeForJavaPackage@305
+    membersProtos = LinkedHashMap@321 // through DeserializedPackageMemberScope@311
+    properties('get': Name@23) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
+    properties('io': Name@315) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
+    properties('jvm': Name@316) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
+    properties('name': Name@28) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
+    properties('reflect': Name@317) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
+    properties('set': Name@26) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
+    properties('x': Name@287) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
+    properties('y': Name@288) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
 }
 
-LazyJavaPackageFragment@210['lang'] {
-    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('invoke': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('set': Name@26) = null // 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@215['lang'] {
+    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@322
+    classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@322
+    classes('set': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@322
+    classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@322
+    classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@322
+    deserializedPackageScope = Empty@289 // through LazyPackageFragmentScopeForJavaPackage@322
+    functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@322
+    functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@322
+    functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@322
+    functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@322
+    functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@322
+    memberIndex = computeMemberIndex$1@323 // through LazyPackageFragmentScopeForJavaPackage@322
 }
 
 LazyJavaPackageFragment@21['reflect'] {
-    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@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@279) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('invoke': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('set': Name@26) = null // 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
+    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@324
+    classes('KCallable': Name@325) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@324
+    classes('KMutableProperty': Name@326) = DeserializedClassDescriptor@4['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@324
+    classes('KMutableTopLevelProperty': Name@278) = DeserializedClassDescriptor@6['KMutableTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@324
+    classes('KMutableTopLevelVariable': Name@327) = DeserializedClassDescriptor@8['KMutableTopLevelVariable'] // through LazyPackageFragmentScopeForJavaPackage@324
+    classes('KMutableVariable': Name@328) = DeserializedClassDescriptor@10['KMutableVariable'] // through LazyPackageFragmentScopeForJavaPackage@324
+    classes('KProperty': Name@329) = DeserializedClassDescriptor@12['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@324
+    classes('KTopLevelProperty': Name@330) = DeserializedClassDescriptor@14['KTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@324
+    classes('KTopLevelVariable': Name@331) = DeserializedClassDescriptor@16['KTopLevelVariable'] // through LazyPackageFragmentScopeForJavaPackage@324
+    classes('KVariable': Name@332) = DeserializedClassDescriptor@18['KVariable'] // through LazyPackageFragmentScopeForJavaPackage@324
+    classes('String': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@324
+    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@324
+    classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@324
+    classes('set': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@324
+    classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@324
+    classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@324
+    deserializedPackageScope = Empty@289 // through LazyPackageFragmentScopeForJavaPackage@324
+    functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@324
+    functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@324
+    functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@324
+    functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@324
+    functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@324
+    memberIndex = computeMemberIndex$1@333 // through LazyPackageFragmentScopeForJavaPackage@324
 }
 
-NestedClassDescriptors@329 {
-    findClass('get': Name@23) = null
-    findClass('name': Name@28) = null
-    findClass('set': Name@26) = null
+NestedClassDescriptors@334 {
+    findNestedClass('get': Name@23) = null
+    findNestedClass('name': Name@28) = null
+    findNestedClass('set': Name@26) = null
 }
 
-NestedClassDescriptors@330 {
-    findClass('get': Name@331) = null
-    findClass('name': Name@332) = null
-    findClass('set': Name@333) = null
+NestedClassDescriptors@335 {
+    findNestedClass('get': Name@195) = null
+    findNestedClass('name': Name@196) = null
+    findNestedClass('set': Name@197) = null
 }
 
-TypeDeserializer@334 {
-    classDescriptors('102': Integer@335) = DeserializedClassDescriptor@336['MutableMap']
-    classDescriptors('2': Integer@337) = DeserializedClassDescriptor@338['Any']
+TypeDeserializer@336 {
+    classDescriptors('129': Integer@337) = DeserializedClassDescriptor@338['MutableMap']
+    classDescriptors('9': Integer@339) = DeserializedClassDescriptor@340['Any']
 }
 
-TypeDeserializer@339 {
-    classDescriptors('3': Integer@340) = DeserializedClassDescriptor@338['Any']
-    classDescriptors('4': Integer@341) = DeserializedClassDescriptor@2['KCallable']
-}
-
-TypeDeserializer@342 {
-    classDescriptors('3': Integer@340) = DeserializedClassDescriptor@338['Any']
-    classDescriptors('4': Integer@341) = DeserializedClassDescriptor@12['KProperty']
-}
-
-TypeDeserializer@343 {
-    classDescriptors('3': Integer@340) = DeserializedClassDescriptor@338['Any']
-    classDescriptors('4': Integer@341) = DeserializedClassDescriptor@12['KProperty']
+TypeDeserializer@341 {
+    classDescriptors('3': Integer@342) = DeserializedClassDescriptor@340['Any']
+    classDescriptors('4': Integer@343) = DeserializedClassDescriptor@2['KCallable']
 }
 
 TypeDeserializer@344 {
-    classDescriptors('3': Integer@340) = DeserializedClassDescriptor@338['Any']
-    classDescriptors('4': Integer@341) = DeserializedClassDescriptor@14['KTopLevelProperty']
-    classDescriptors('5': Integer@345) = DeserializedClassDescriptor@4['KMutableProperty']
+    classDescriptors('3': Integer@342) = DeserializedClassDescriptor@340['Any']
+    classDescriptors('4': Integer@343) = DeserializedClassDescriptor@12['KProperty']
+}
+
+TypeDeserializer@345 {
+    classDescriptors('3': Integer@342) = DeserializedClassDescriptor@340['Any']
+    classDescriptors('4': Integer@343) = DeserializedClassDescriptor@12['KProperty']
 }
 
 TypeDeserializer@346 {
-    classDescriptors('3': Integer@340) = DeserializedClassDescriptor@338['Any']
-    classDescriptors('4': Integer@341) = DeserializedClassDescriptor@16['KTopLevelVariable']
-    classDescriptors('5': Integer@345) = DeserializedClassDescriptor@10['KMutableVariable']
-    classDescriptors('6': Integer@347) = DeserializedClassDescriptor@6['KMutableTopLevelProperty']
+    classDescriptors('3': Integer@342) = DeserializedClassDescriptor@340['Any']
+    classDescriptors('4': Integer@343) = DeserializedClassDescriptor@14['KTopLevelProperty']
+    classDescriptors('5': Integer@347) = DeserializedClassDescriptor@4['KMutableProperty']
 }
 
 TypeDeserializer@348 {
-    classDescriptors('3': Integer@340) = DeserializedClassDescriptor@338['Any']
-    classDescriptors('4': Integer@341) = DeserializedClassDescriptor@18['KVariable']
-    classDescriptors('5': Integer@345) = DeserializedClassDescriptor@4['KMutableProperty']
-}
-
-TypeDeserializer@349 {
-    classDescriptors('3': Integer@340) = DeserializedClassDescriptor@338['Any']
-    classDescriptors('4': Integer@341) = DeserializedClassDescriptor@18['KVariable']
-    classDescriptors('5': Integer@345) = DeserializedClassDescriptor@14['KTopLevelProperty']
+    classDescriptors('3': Integer@342) = DeserializedClassDescriptor@340['Any']
+    classDescriptors('4': Integer@343) = DeserializedClassDescriptor@16['KTopLevelVariable']
+    classDescriptors('5': Integer@347) = DeserializedClassDescriptor@10['KMutableVariable']
+    classDescriptors('6': Integer@349) = DeserializedClassDescriptor@6['KMutableTopLevelProperty']
 }
 
 TypeDeserializer@350 {
-    classDescriptors('3': Integer@340) = DeserializedClassDescriptor@338['Any']
+    classDescriptors('3': Integer@342) = DeserializedClassDescriptor@340['Any']
+    classDescriptors('4': Integer@343) = DeserializedClassDescriptor@18['KVariable']
+    classDescriptors('5': Integer@347) = DeserializedClassDescriptor@4['KMutableProperty']
 }
 
 TypeDeserializer@351 {
-    classDescriptors('4': Integer@341) = DeserializedClassDescriptor@12['KProperty']
+    classDescriptors('3': Integer@342) = DeserializedClassDescriptor@340['Any']
+    classDescriptors('4': Integer@343) = DeserializedClassDescriptor@18['KVariable']
+    classDescriptors('5': Integer@347) = DeserializedClassDescriptor@14['KTopLevelProperty']
 }
 
 TypeDeserializer@352 {
-    classDescriptors('4': Integer@341) = DeserializedClassDescriptor@353['String']
+    classDescriptors('3': Integer@342) = DeserializedClassDescriptor@340['Any']
+}
+
+TypeDeserializer@353 {
+    classDescriptors('4': Integer@343) = DeserializedClassDescriptor@12['KProperty']
 }
 
 TypeDeserializer@354 {
-    classDescriptors('6': Integer@347) = DeserializedClassDescriptor@20['Unit']
+    classDescriptors('4': Integer@343) = DeserializedClassDescriptor@355['String']
+}
+
+TypeDeserializer@356 {
+    classDescriptors('6': Integer@349) = DeserializedClassDescriptor@20['Unit']
 }

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

@@ -104,7 +104,7 @@ LazyJavaPackageFragment@43['io'] {
     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
+    membersProtos = LinkedHashMap@59 // 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
@@ -149,7 +149,7 @@ LazyJavaPackageFragment@11['kotlin'] {
     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@72
+    membersProtos = LinkedHashMap@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