Update lazy logs after field rename

compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.lazy.log

@@ -6,13 +6,13 @@ DescriptorResolver@0 {
 }
 
 LazyJavaPackageFragmentProvider@4 {
-    _packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    _packageFragments('A': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('kotlin': FqName@12) = null
-    _packageFragments('kotlin.io': FqName@13) = null
-    _packageFragments('kotlin.jvm': FqName@14) = null
+    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
+    packageFragments('A': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('kotlin': FqName@12) = null
+    packageFragments('kotlin.io': FqName@13) = null
+    packageFragments('kotlin.jvm': FqName@14) = null
 }
 
 LazyJavaPackageFragment@6['<root>'] {
@@ -21,10 +21,10 @@ LazyJavaPackageFragment@6['<root>'] {
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
 LazyJavaPackageFragment@11['lang'] {

compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.lazy.log

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

compiler/testData/diagnostics/tests/classObjects/ClassObjects.lazy.log

@@ -15,240 +15,240 @@ DescriptorResolver@0 {
 }
 
 LazyJavaClassDescriptor@10['Appendable'] {
-    _functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@13
-    _properties('println': Name@14) = EmptyList@12[empty] // through LazyJavaClassMemberScope@13
-    _typeConstructor = LazyJavaClassTypeConstructor@15['Appendable']
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@13
+    functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@13
+    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@13
+    properties('println': Name@15) = EmptyList@12[empty] // through LazyJavaClassMemberScope@13
+    typeConstructor = LazyJavaClassTypeConstructor@16['Appendable']
 }
 
 LazyJavaClassDescriptor@17['AutoCloseable'] {
-    _functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@18
-    _properties('println': Name@14) = EmptyList@12[empty] // through LazyJavaClassMemberScope@18
-    _typeConstructor = LazyJavaClassTypeConstructor@19['AutoCloseable']
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@18
+    functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@18
+    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
+    properties('println': Name@15) = EmptyList@12[empty] // through LazyJavaClassMemberScope@18
+    typeConstructor = LazyJavaClassTypeConstructor@20['AutoCloseable']
 }
 
 LazyJavaClassDescriptor@21['Closeable'] {
-    _functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@22
-    _properties('println': Name@14) = EmptyList@12[empty] // through LazyJavaClassMemberScope@22
-    _typeConstructor = LazyJavaClassTypeConstructor@23['Closeable']
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@22
+    functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@22
+    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
+    properties('println': Name@15) = EmptyList@12[empty] // through LazyJavaClassMemberScope@22
+    typeConstructor = LazyJavaClassTypeConstructor@24['Closeable']
 }
 
 LazyJavaClassDescriptor@25['FilterOutputStream'] {
-    _functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@26
-    _properties('println': Name@14) = EmptyList@12[empty] // through LazyJavaClassMemberScope@26
-    _typeConstructor = LazyJavaClassTypeConstructor@27['FilterOutputStream']
-    memberIndex = computeMemberIndex$1@28 // through LazyJavaClassMemberScope@26
+    functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@26
+    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@26
+    properties('println': Name@15) = EmptyList@12[empty] // through LazyJavaClassMemberScope@26
+    typeConstructor = LazyJavaClassTypeConstructor@28['FilterOutputStream']
 }
 
 LazyJavaClassDescriptor@29['OutputStream'] {
-    _functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@30
-    _properties('println': Name@14) = EmptyList@12[empty] // through LazyJavaClassMemberScope@30
-    _typeConstructor = LazyJavaClassTypeConstructor@31['OutputStream']
-    memberIndex = computeMemberIndex$1@32 // through LazyJavaClassMemberScope@30
+    functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@30
+    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@30
+    properties('println': Name@15) = EmptyList@12[empty] // through LazyJavaClassMemberScope@30
+    typeConstructor = LazyJavaClassTypeConstructor@32['OutputStream']
 }
 
 LazyJavaClassDescriptor@33['PrintStream'] {
-    _functions('println': Name@14) = ArrayList@34[10] { JavaMethodDescriptor@35['println'], JavaMethodDescriptor@36['println'], JavaMethodDescriptor@37['println'], ... } // through LazyJavaClassMemberScope@38
-    _properties('println': Name@14) = EmptyList@12[empty] // through LazyJavaClassMemberScope@38
-    _typeConstructor = LazyJavaClassTypeConstructor@39['PrintStream']
-    defaultType = JetTypeImpl@40['PrintStream']
-    enumEntryIndex = LinkedHashMap@41 // through LazyJavaClassMemberScope@38
-    memberIndex = computeMemberIndex$1@42 // through LazyJavaClassMemberScope@38
-    nestedClassIndex = LinkedHashMap@43 // through LazyJavaClassMemberScope@38
-    nestedClasses('println': Name@14) = null // through LazyJavaClassMemberScope@38
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@44['<this>']
+    defaultType = JetTypeImpl@34['PrintStream']
+    enumEntryIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@36
+    functions('println': Name@15) = ArrayList@37[10] { JavaMethodDescriptor@38['println'], JavaMethodDescriptor@39['println'], JavaMethodDescriptor@40['println'], ... } // through LazyJavaClassMemberScope@36
+    memberIndex = computeMemberIndex$1@41 // through LazyJavaClassMemberScope@36
+    nestedClassIndex = LinkedHashMap@42 // through LazyJavaClassMemberScope@36
+    nestedClasses('println': Name@15) = null // through LazyJavaClassMemberScope@36
+    properties('println': Name@15) = EmptyList@12[empty] // through LazyJavaClassMemberScope@36
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@43['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@44['PrintStream']
 }
 
 LazyJavaClassDescriptor@45['System'] {
-    _properties('out': Name@46) = ArrayList@47[1] { JavaPropertyDescriptor@48['out'] } // through LazyJavaStaticClassScope@49
-    _properties('out': Name@46) = EmptyList@12[empty] // through LazyJavaClassMemberScope@50
-    _typeConstructor = LazyJavaClassTypeConstructor@51['System']
-    enumEntryIndex = LinkedHashMap@52 // through LazyJavaClassMemberScope@50
-    memberIndex = computeMemberIndex$1@53 // through LazyJavaClassMemberScope@50
-    memberIndex = computeMemberIndex$1@54 // through LazyJavaStaticClassScope@49
-    nestedClassIndex = LinkedHashMap@55 // through LazyJavaClassMemberScope@50
-    nestedClasses('out': Name@46) = null // through LazyJavaClassMemberScope@50
+    enumEntryIndex = LinkedHashMap@46 // through LazyJavaClassMemberScope@47
+    memberIndex = computeMemberIndex$1@48 // through LazyJavaClassMemberScope@47
+    memberIndex = computeMemberIndex$1@49 // through LazyJavaStaticClassScope@50
+    nestedClassIndex = LinkedHashMap@51 // through LazyJavaClassMemberScope@47
+    nestedClasses('out': Name@52) = null // through LazyJavaClassMemberScope@47
+    properties('out': Name@52) = ArrayList@53[1] { JavaPropertyDescriptor@54['out'] } // through LazyJavaStaticClassScope@50
+    properties('out': Name@52) = EmptyList@12[empty] // through LazyJavaClassMemberScope@47
+    typeConstructor = LazyJavaClassTypeConstructor@55['System']
 }
 
-LazyJavaClassTypeConstructor@15['Appendable'] {
-    _parameters = ArrayList@56[empty]
-    _supertypes = ArrayList@57[1] { JetTypeImpl@58['Any'] }
+LazyJavaClassTypeConstructor@16['Appendable'] {
+    parameters = ArrayList@56[empty]
+    supertypes = ArrayList@57[1] { JetTypeImpl@58['Any'] }
 }
 
-LazyJavaClassTypeConstructor@19['AutoCloseable'] {
-    _parameters = ArrayList@59[empty]
-    _supertypes = ArrayList@60[1] { JetTypeImpl@58['Any'] }
+LazyJavaClassTypeConstructor@20['AutoCloseable'] {
+    parameters = ArrayList@59[empty]
+    supertypes = ArrayList@60[1] { JetTypeImpl@58['Any'] }
 }
 
-LazyJavaClassTypeConstructor@23['Closeable'] {
-    _parameters = ArrayList@61[empty]
-    _supertypes = ArrayList@62[1] { LazyJavaClassifierType@63['AutoCloseable'] }
+LazyJavaClassTypeConstructor@24['Closeable'] {
+    parameters = ArrayList@61[empty]
+    supertypes = ArrayList@62[1] { LazyJavaClassifierType@63['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@27['FilterOutputStream'] {
-    _parameters = ArrayList@64[empty]
-    _supertypes = ArrayList@65[1] { LazyJavaClassifierType@66['OutputStream'] }
+LazyJavaClassTypeConstructor@28['FilterOutputStream'] {
+    parameters = ArrayList@64[empty]
+    supertypes = ArrayList@65[1] { LazyJavaClassifierType@66['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@31['OutputStream'] {
-    _parameters = ArrayList@67[empty]
-    _supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['Closeable'] }
+LazyJavaClassTypeConstructor@32['OutputStream'] {
+    parameters = ArrayList@67[empty]
+    supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@39['PrintStream'] {
-    _parameters = ArrayList@70[empty]
-    _supertypes = ArrayList@71[3] { LazyJavaClassifierType@72['FilterOutputStream'], LazyJavaClassifierType@73['Appendable'], LazyJavaClassifierType@74['Closeable'] }
+LazyJavaClassTypeConstructor@44['PrintStream'] {
+    parameters = ArrayList@70[empty]
+    supertypes = ArrayList@71[3] { LazyJavaClassifierType@72['FilterOutputStream'], LazyJavaClassifierType@73['Appendable'], LazyJavaClassifierType@74['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@51['System'] {
-    _supertypes = ArrayList@75[1] { JetTypeImpl@58['Any'] }
+LazyJavaClassTypeConstructor@55['System'] {
+    supertypes = ArrayList@75[1] { JetTypeImpl@58['Any'] }
 }
 
 LazyJavaClassifierType@73['Appendable'] {
-    _arguments = ArrayList@76[empty]
-    _memberScope = LazyJavaClassMemberScope@13
-    _typeConstructor = LazyJavaClassTypeConstructor@15['Appendable']
+    arguments = ArrayList@76[empty]
     classifier = JavaClassImpl@77['Appendable']
+    memberScope = LazyJavaClassMemberScope@13
+    typeConstructor = LazyJavaClassTypeConstructor@16['Appendable']
 }
 
 LazyJavaClassifierType@63['AutoCloseable'] {
-    _arguments = ArrayList@78[empty]
-    _memberScope = LazyJavaClassMemberScope@18
-    _typeConstructor = LazyJavaClassTypeConstructor@19['AutoCloseable']
+    arguments = ArrayList@78[empty]
     classifier = JavaClassImpl@79['AutoCloseable']
-}
-
-LazyJavaClassifierType@74['Closeable'] {
-    _arguments = ArrayList@80[empty]
-    _memberScope = LazyJavaClassMemberScope@22
-    _typeConstructor = LazyJavaClassTypeConstructor@23['Closeable']
-    classifier = JavaClassImpl@81['Closeable']
+    memberScope = LazyJavaClassMemberScope@18
+    typeConstructor = LazyJavaClassTypeConstructor@20['AutoCloseable']
 }
 
 LazyJavaClassifierType@69['Closeable'] {
-    _arguments = ArrayList@82[empty]
-    _memberScope = LazyJavaClassMemberScope@22
-    _typeConstructor = LazyJavaClassTypeConstructor@23['Closeable']
+    arguments = ArrayList@80[empty]
+    classifier = JavaClassImpl@81['Closeable']
+    memberScope = LazyJavaClassMemberScope@22
+    typeConstructor = LazyJavaClassTypeConstructor@24['Closeable']
+}
+
+LazyJavaClassifierType@74['Closeable'] {
+    arguments = ArrayList@82[empty]
     classifier = JavaClassImpl@83['Closeable']
+    memberScope = LazyJavaClassMemberScope@22
+    typeConstructor = LazyJavaClassTypeConstructor@24['Closeable']
 }
 
 LazyJavaClassifierType@72['FilterOutputStream'] {
-    _arguments = ArrayList@84[empty]
-    _memberScope = LazyJavaClassMemberScope@26
-    _typeConstructor = LazyJavaClassTypeConstructor@27['FilterOutputStream']
+    arguments = ArrayList@84[empty]
     classifier = JavaClassImpl@85['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@26
+    typeConstructor = LazyJavaClassTypeConstructor@28['FilterOutputStream']
 }
 
 LazyJavaClassifierType@86['Flushable'] {
-    _typeConstructor = TypeConstructorImpl$1@87
     classifier = null
+    typeConstructor = TypeConstructorImpl$1@87
 }
 
 LazyJavaClassifierType@88['Object'] {
-    _arguments = ArrayList@89[empty]
-    _nullable = 'false': Boolean@90
-    _typeConstructor = DeserializedClassTypeConstructor@91
-    classifier = JavaClassImpl@92['Object']
+    arguments = ArrayList@89[empty]
+    classifier = JavaClassImpl@90['Object']
+    nullable = 'false': Boolean@91
+    typeConstructor = DeserializedClassTypeConstructor@92
 }
 
 LazyJavaClassifierType@93['Object'] {
-    _arguments = ArrayList@94[empty]
-    _nullable = 'true': Boolean@95
-    _typeConstructor = DeserializedClassTypeConstructor@91
-    classifier = JavaClassImpl@92['Object']
+    arguments = ArrayList@94[empty]
+    classifier = JavaClassImpl@90['Object']
+    nullable = 'true': Boolean@95
+    typeConstructor = DeserializedClassTypeConstructor@92
 }
 
 LazyJavaClassifierType@96['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@91
     classifier = JavaClassImpl@97['Object']
+    typeConstructor = DeserializedClassTypeConstructor@92
 }
 
 LazyJavaClassifierType@98['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@91
     classifier = JavaClassImpl@99['Object']
+    typeConstructor = DeserializedClassTypeConstructor@92
 }
 
 LazyJavaClassifierType@100['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@91
     classifier = JavaClassImpl@101['Object']
+    typeConstructor = DeserializedClassTypeConstructor@92
 }
 
 LazyJavaClassifierType@102['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@91
     classifier = JavaClassImpl@103['Object']
+    typeConstructor = DeserializedClassTypeConstructor@92
 }
 
 LazyJavaClassifierType@66['OutputStream'] {
-    _arguments = ArrayList@104[empty]
-    _memberScope = LazyJavaClassMemberScope@30
-    _typeConstructor = LazyJavaClassTypeConstructor@31['OutputStream']
+    arguments = ArrayList@104[empty]
     classifier = JavaClassImpl@105['OutputStream']
+    memberScope = LazyJavaClassMemberScope@30
+    typeConstructor = LazyJavaClassTypeConstructor@32['OutputStream']
 }
 
 LazyJavaClassifierType@106['PrintStream'] {
-    _arguments = ArrayList@107[empty]
-    _memberScope = LazyJavaClassMemberScope@38
-    _nullable = 'false': Boolean@90
-    _typeConstructor = LazyJavaClassTypeConstructor@39['PrintStream']
+    arguments = ArrayList@107[empty]
     classifier = JavaClassImpl@108['PrintStream']
+    memberScope = LazyJavaClassMemberScope@36
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@44['PrintStream']
 }
 
 LazyJavaClassifierType@109['PrintStream'] {
-    _arguments = ArrayList@110[empty]
-    _nullable = 'true': Boolean@95
-    _typeConstructor = LazyJavaClassTypeConstructor@39['PrintStream']
+    arguments = ArrayList@110[empty]
     classifier = JavaClassImpl@108['PrintStream']
+    nullable = 'true': Boolean@95
+    typeConstructor = LazyJavaClassTypeConstructor@44['PrintStream']
 }
 
 LazyJavaClassifierType@111['String'] {
-    _arguments = ArrayList@112[empty]
-    _nullable = 'false': Boolean@90
-    _typeConstructor = DeserializedClassTypeConstructor@113
-    classifier = JavaClassImpl@114['String']
+    arguments = ArrayList@112[empty]
+    classifier = JavaClassImpl@113['String']
+    nullable = 'false': Boolean@91
+    typeConstructor = DeserializedClassTypeConstructor@114
 }
 
 LazyJavaClassifierType@115['String'] {
-    _arguments = ArrayList@116[empty]
-    _nullable = 'true': Boolean@95
-    _typeConstructor = DeserializedClassTypeConstructor@113
-    classifier = JavaClassImpl@114['String']
+    arguments = ArrayList@116[empty]
+    classifier = JavaClassImpl@113['String']
+    nullable = 'true': Boolean@95
+    typeConstructor = DeserializedClassTypeConstructor@114
 }
 
 LazyJavaPackageFragmentProvider@117 {
-    _packageFragments('<root>': FqName@118) = LazyJavaPackageFragment@119['<root>']
-    _packageFragments('A': FqName@120) = null
-    _packageFragments('B': FqName@121) = null
-    _packageFragments('Jet86': FqName@122) = null
-    _packageFragments('Jet86.A': FqName@123) = null
-    _packageFragments('Jet86.B': FqName@124) = null
-    _packageFragments('Jet86.System': FqName@125) = null
-    _packageFragments('Jet86.a': FqName@126) = null
-    _packageFragments('Jet86.b': FqName@127) = null
-    _packageFragments('Jet86.c': FqName@128) = null
-    _packageFragments('Jet86.d': FqName@129) = null
-    _packageFragments('Jet86.java': FqName@130) = null
-    _packageFragments('Jet86.s': FqName@131) = null
-    _packageFragments('System': FqName@132) = null
-    _packageFragments('b': FqName@133) = null
-    _packageFragments('java': FqName@134) = LazyJavaPackageFragment@135['java']
-    _packageFragments('java.io': FqName@136) = LazyJavaPackageFragment@137['io']
-    _packageFragments('java.lang': FqName@138) = LazyJavaPackageFragment@139['lang']
-    _packageFragments('java.lang.A': FqName@140) = null
-    _packageFragments('java.lang.B': FqName@141) = null
-    _packageFragments('java.lang.System': FqName@142) = null
-    _packageFragments('java.lang.b': FqName@143) = null
-    _packageFragments('kotlin': FqName@144) = null
-    _packageFragments('kotlin.A': FqName@145) = null
-    _packageFragments('kotlin.B': FqName@146) = null
-    _packageFragments('kotlin.System': FqName@147) = null
-    _packageFragments('kotlin.b': FqName@148) = null
-    _packageFragments('kotlin.io': FqName@149) = null
-    _packageFragments('kotlin.jvm': FqName@150) = null
+    packageFragments('<root>': FqName@118) = LazyJavaPackageFragment@119['<root>']
+    packageFragments('A': FqName@120) = null
+    packageFragments('B': FqName@121) = null
+    packageFragments('Jet86': FqName@122) = null
+    packageFragments('Jet86.A': FqName@123) = null
+    packageFragments('Jet86.B': FqName@124) = null
+    packageFragments('Jet86.System': FqName@125) = null
+    packageFragments('Jet86.a': FqName@126) = null
+    packageFragments('Jet86.b': FqName@127) = null
+    packageFragments('Jet86.c': FqName@128) = null
+    packageFragments('Jet86.d': FqName@129) = null
+    packageFragments('Jet86.java': FqName@130) = null
+    packageFragments('Jet86.s': FqName@131) = null
+    packageFragments('System': FqName@132) = null
+    packageFragments('b': FqName@133) = null
+    packageFragments('java': FqName@134) = LazyJavaPackageFragment@135['java']
+    packageFragments('java.io': FqName@136) = LazyJavaPackageFragment@137['io']
+    packageFragments('java.lang': FqName@138) = LazyJavaPackageFragment@139['lang']
+    packageFragments('java.lang.A': FqName@140) = null
+    packageFragments('java.lang.B': FqName@141) = null
+    packageFragments('java.lang.System': FqName@142) = null
+    packageFragments('java.lang.b': FqName@143) = null
+    packageFragments('kotlin': FqName@144) = null
+    packageFragments('kotlin.A': FqName@145) = null
+    packageFragments('kotlin.B': FqName@146) = null
+    packageFragments('kotlin.System': FqName@147) = null
+    packageFragments('kotlin.b': FqName@148) = null
+    packageFragments('kotlin.io': FqName@149) = null
+    packageFragments('kotlin.jvm': FqName@150) = null
     topLevelClasses(JavaClassImpl@77['Appendable']) = LazyJavaClassDescriptor@10['Appendable']
     topLevelClasses(JavaClassImpl@79['AutoCloseable']) = LazyJavaClassDescriptor@17['AutoCloseable']
-    topLevelClasses(JavaClassImpl@81['Closeable']) = LazyJavaClassDescriptor@21['Closeable']
+    topLevelClasses(JavaClassImpl@83['Closeable']) = LazyJavaClassDescriptor@21['Closeable']
     topLevelClasses(JavaClassImpl@85['FilterOutputStream']) = LazyJavaClassDescriptor@25['FilterOutputStream']
     topLevelClasses(JavaClassImpl@105['OutputStream']) = LazyJavaClassDescriptor@29['OutputStream']
     topLevelClasses(JavaClassImpl@108['PrintStream']) = LazyJavaClassDescriptor@33['PrintStream']
@@ -256,19 +256,19 @@ LazyJavaPackageFragmentProvider@117 {
 }
 
 LazyJavaPackageFragment@135['java'] {
-    _functions('lang': Name@152) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@153
-    classes('lang': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@153
-    deserializedPackageScope = Empty@155 // through LazyPackageFragmentScopeForJavaPackage@153
+    classes('lang': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@153
+    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@153
+    functions('lang': Name@155) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@153
     memberIndex = computeMemberIndex$1@156 // through LazyPackageFragmentScopeForJavaPackage@153
 }
 
 LazyJavaPackageFragment@139['lang'] {
-    _functions('println': Name@14) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    _functions('x': Name@158) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('System': Name@159) = LazyJavaClassDescriptor@45['System'] // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('java': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('println': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('x': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    deserializedPackageScope = Empty@155 // through LazyPackageFragmentScopeForJavaPackage@157
-    memberIndex = computeMemberIndex$1@161 // through LazyPackageFragmentScopeForJavaPackage@157
+    classes('System': Name@157) = LazyJavaClassDescriptor@45['System'] // through LazyPackageFragmentScopeForJavaPackage@158
+    classes('java': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@158
+    classes('println': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@158
+    classes('x': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@158
+    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@158
+    functions('println': Name@15) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@158
+    functions('x': Name@160) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@158
+    memberIndex = computeMemberIndex$1@161 // through LazyPackageFragmentScopeForJavaPackage@158
 }

compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.lazy.log

@@ -1,18 +1,18 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('A': FqName@3) = null
-    _packageFragments('B': FqName@4) = null
-    _packageFragments('C': FqName@5) = null
-    _packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    _packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    _packageFragments('kotlin': FqName@10) = null
-    _packageFragments('kotlin.io': FqName@11) = null
-    _packageFragments('kotlin.jvm': FqName@12) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('A': FqName@3) = null
+    packageFragments('B': FqName@4) = null
+    packageFragments('C': FqName@5) = null
+    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
+    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
+    packageFragments('kotlin': FqName@10) = null
+    packageFragments('kotlin.io': FqName@11) = null
+    packageFragments('kotlin.jvm': FqName@12) = null
 }
 
 LazyJavaPackageFragment@7['java'] {
-    _functions('lang': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@15
+    classes('lang': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
+    functions('lang': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
+    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
 }

compiler/testData/diagnostics/tests/classObjects/classObjectInLocalClass.lazy.log

@@ -3,17 +3,17 @@ ClosureExpressionsTypingVisitor$1@0 {
 }
 
 LazyJavaPackageFragmentProvider@2 {
-    _packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    _packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    _packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    _packageFragments('kotlin': FqName@9) = null
-    _packageFragments('kotlin.io': FqName@10) = null
-    _packageFragments('kotlin.jvm': FqName@11) = null
+    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
+    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
+    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
+    packageFragments('kotlin': FqName@9) = null
+    packageFragments('kotlin.io': FqName@10) = null
+    packageFragments('kotlin.jvm': FqName@11) = null
 }
 
 LazyJavaPackageFragment@6['java'] {
-    _functions('lang': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@17 // through LazyPackageFragmentScopeForJavaPackage@14
+    classes('lang': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@13
+    deserializedPackageScope = Empty@14 // through LazyPackageFragmentScopeForJavaPackage@13
+    functions('lang': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@13
+    memberIndex = computeMemberIndex$1@17 // through LazyPackageFragmentScopeForJavaPackage@13
 }

compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.lazy.log

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

compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.lazy.log

@@ -1,58 +1,58 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('A': FqName@3) = null
-    _packageFragments('Any': FqName@4) = null
-    _packageFragments('B': FqName@5) = null
-    _packageFragments('C': FqName@6) = null
-    _packageFragments('D': FqName@7) = null
-    _packageFragments('a': FqName@8) = null
-    _packageFragments('a.A': FqName@9) = null
-    _packageFragments('a.B': FqName@10) = null
-    _packageFragments('a.C': FqName@11) = null
-    _packageFragments('a.D': FqName@12) = null
-    _packageFragments('b': FqName@13) = null
-    _packageFragments('b.A': FqName@14) = null
-    _packageFragments('b.Any': FqName@15) = null
-    _packageFragments('b.B': FqName@16) = null
-    _packageFragments('b.C': FqName@17) = null
-    _packageFragments('b.D': FqName@18) = null
-    _packageFragments('b.a': FqName@19) = null
-    _packageFragments('java': FqName@20) = LazyJavaPackageFragment@21['java']
-    _packageFragments('java.lang': FqName@22) = LazyJavaPackageFragment@23['lang']
-    _packageFragments('java.lang.A': FqName@24) = null
-    _packageFragments('java.lang.Any': FqName@25) = null
-    _packageFragments('java.lang.B': FqName@26) = null
-    _packageFragments('java.lang.C': FqName@27) = null
-    _packageFragments('java.lang.D': FqName@28) = null
-    _packageFragments('kotlin': FqName@29) = null
-    _packageFragments('kotlin.A': FqName@30) = null
-    _packageFragments('kotlin.Any': FqName@31) = null
-    _packageFragments('kotlin.B': FqName@32) = null
-    _packageFragments('kotlin.C': FqName@33) = null
-    _packageFragments('kotlin.D': FqName@34) = null
-    _packageFragments('kotlin.io': FqName@35) = null
-    _packageFragments('kotlin.jvm': FqName@36) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('A': FqName@3) = null
+    packageFragments('Any': FqName@4) = null
+    packageFragments('B': FqName@5) = null
+    packageFragments('C': FqName@6) = null
+    packageFragments('D': FqName@7) = null
+    packageFragments('a': FqName@8) = null
+    packageFragments('a.A': FqName@9) = null
+    packageFragments('a.B': FqName@10) = null
+    packageFragments('a.C': FqName@11) = null
+    packageFragments('a.D': FqName@12) = null
+    packageFragments('b': FqName@13) = null
+    packageFragments('b.A': FqName@14) = null
+    packageFragments('b.Any': FqName@15) = null
+    packageFragments('b.B': FqName@16) = null
+    packageFragments('b.C': FqName@17) = null
+    packageFragments('b.D': FqName@18) = null
+    packageFragments('b.a': FqName@19) = null
+    packageFragments('java': FqName@20) = LazyJavaPackageFragment@21['java']
+    packageFragments('java.lang': FqName@22) = LazyJavaPackageFragment@23['lang']
+    packageFragments('java.lang.A': FqName@24) = null
+    packageFragments('java.lang.Any': FqName@25) = null
+    packageFragments('java.lang.B': FqName@26) = null
+    packageFragments('java.lang.C': FqName@27) = null
+    packageFragments('java.lang.D': FqName@28) = null
+    packageFragments('kotlin': FqName@29) = null
+    packageFragments('kotlin.A': FqName@30) = null
+    packageFragments('kotlin.Any': FqName@31) = null
+    packageFragments('kotlin.B': FqName@32) = null
+    packageFragments('kotlin.C': FqName@33) = null
+    packageFragments('kotlin.D': FqName@34) = null
+    packageFragments('kotlin.io': FqName@35) = null
+    packageFragments('kotlin.jvm': FqName@36) = null
 }
 
 LazyJavaPackageFragment@21['java'] {
-    _functions('lang': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('lang': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
 }
 
 LazyJavaPackageFragment@23['lang'] {
-    _functions('bar': Name@43) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    _functions('baz': Name@45) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    _functions('f': Name@46) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    _functions('foo': Name@47) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    _functions('quux': Name@48) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('a': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('bar': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('baz': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('f': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('foo': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('quux': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('a': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('bar': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('baz': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('f': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('foo': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('quux': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('bar': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('baz': Name@46) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('f': Name@47) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('foo': Name@48) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('quux': Name@49) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
     memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@44
 }

compiler/testData/diagnostics/tests/classObjects/kt3866.lazy.log

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

compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.lazy.log

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