Update lazy logs after field rename

compiler/testData/diagnostics/tests/enum/AbstractEnum.lazy.log

@@ -1,17 +1,17 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('abstract': FqName@3) = null
-    _packageFragments('abstract.MyAbstractEnum': FqName@4) = null
-    _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@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('abstract': FqName@3) = null
+    packageFragments('abstract.MyAbstractEnum': FqName@4) = null
+    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/enum/AbstractInEnum.lazy.log

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

compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.lazy.log

@@ -1,19 +1,19 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('E': FqName@3) = null
-    _packageFragments('T': FqName@4) = null
-    _packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    _packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    _packageFragments('java.lang.T': FqName@9) = null
-    _packageFragments('kotlin': FqName@10) = null
-    _packageFragments('kotlin.T': FqName@11) = null
-    _packageFragments('kotlin.io': FqName@12) = null
-    _packageFragments('kotlin.jvm': FqName@13) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('E': FqName@3) = null
+    packageFragments('T': FqName@4) = null
+    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
+    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
+    packageFragments('java.lang.T': FqName@9) = null
+    packageFragments('kotlin': FqName@10) = null
+    packageFragments('kotlin.T': FqName@11) = null
+    packageFragments('kotlin.io': FqName@12) = null
+    packageFragments('kotlin.jvm': FqName@13) = null
 }
 
 LazyJavaPackageFragment@6['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
 }

compiler/testData/diagnostics/tests/enum/classObjectInEnum.lazy.log

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

compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.lazy.log

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

compiler/testData/diagnostics/tests/enum/commonSupertype.lazy.log

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

compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.lazy.log

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

compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.lazy.log

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

compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.lazy.log

@@ -4,34 +4,34 @@ DescriptorResolver@0 {
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('E': FqName@6) = null
-    _packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    _packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    _packageFragments('java.lang.E': FqName@11) = null
-    _packageFragments('kotlin': FqName@12) = null
-    _packageFragments('kotlin.E': FqName@13) = null
-    _packageFragments('kotlin.io': FqName@14) = null
-    _packageFragments('kotlin.jvm': FqName@15) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('E': FqName@6) = null
+    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
+    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
+    packageFragments('java.lang.E': FqName@11) = null
+    packageFragments('kotlin': FqName@12) = null
+    packageFragments('kotlin.E': 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
 }

compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.lazy.log

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

compiler/testData/diagnostics/tests/enum/enumImplementingTrait.lazy.log

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

compiler/testData/diagnostics/tests/enum/enumInheritance.lazy.log

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

compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.lazy.log

@@ -7,98 +7,98 @@ EnumEntrySyntheticClassDescriptor@2['RUNTIME'] {
 }
 
 LazyJavaClassDescriptor@4['RetentionPolicy'] {
-    _functionTypeForSamInterface = null
-    _properties('RUNTIME': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _properties('RUNTIME': Name@5) = EmptyList@6[empty] // through LazyJavaStaticClassScope@8
-    _typeConstructor = LazyJavaClassTypeConstructor@9['RetentionPolicy']
-    defaultType = JetTypeImpl@10['RetentionPolicy']
-    enumEntryIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaStaticClassScope@8
-    nestedClassIndex = LinkedHashMap@14 // through LazyJavaClassMemberScope@7
-    nestedClasses('RUNTIME': Name@5) = EnumEntrySyntheticClassDescriptor@2['RUNTIME'] // through LazyJavaClassMemberScope@7
+    defaultType = JetTypeImpl@5['RetentionPolicy']
+    enumEntryIndex = LinkedHashMap@6 // through LazyJavaClassMemberScope@7
+    functionTypeForSamInterface = null
+    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
+    memberIndex = computeMemberIndex$1@9 // through LazyJavaStaticClassScope@10
+    nestedClassIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@7
+    nestedClasses('RUNTIME': Name@12) = EnumEntrySyntheticClassDescriptor@2['RUNTIME'] // through LazyJavaClassMemberScope@7
+    properties('RUNTIME': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
+    properties('RUNTIME': Name@12) = EmptyList@13[empty] // through LazyJavaStaticClassScope@10
+    typeConstructor = LazyJavaClassTypeConstructor@14['RetentionPolicy']
 }
 
-LazyJavaClassTypeConstructor@9['RetentionPolicy'] {
-    _parameters = ArrayList@15[empty]
-    _supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Enum<RetentionPolicy>'] }
+LazyJavaClassTypeConstructor@14['RetentionPolicy'] {
+    parameters = ArrayList@15[empty]
+    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Enum<RetentionPolicy>'] }
 }
 
 LazyJavaClassifierType@17['Enum<RetentionPolicy>'] {
-    _arguments = ArrayList@18[1] { TypeProjectionImpl@19 }
-    _memberScope = SubstitutingScope@20
-    _typeConstructor = DeserializedClassTypeConstructor@21
-    classifier = JavaClassImpl@22['Enum']
+    arguments = ArrayList@18[1] { TypeProjectionImpl@19 }
+    classifier = JavaClassImpl@20['Enum']
+    memberScope = SubstitutingScope@21
+    typeConstructor = DeserializedClassTypeConstructor@22
 }
 
 LazyJavaClassifierType@23['RetentionPolicy'] {
-    _arguments = ArrayList@24[empty]
-    _nullable = 'false': Boolean@25
-    _typeConstructor = LazyJavaClassTypeConstructor@9['RetentionPolicy']
-    classifier = JavaClassImpl@26['RetentionPolicy']
+    arguments = ArrayList@24[empty]
+    classifier = JavaClassImpl@25['RetentionPolicy']
+    nullable = 'false': Boolean@26
+    typeConstructor = LazyJavaClassTypeConstructor@14['RetentionPolicy']
 }
 
 LazyJavaClassifierType@27['RetentionPolicy'] {
-    _arguments = ArrayList@28[empty]
-    _nullable = 'true': Boolean@29
-    _typeConstructor = LazyJavaClassTypeConstructor@9['RetentionPolicy']
-    classifier = JavaClassImpl@26['RetentionPolicy']
+    arguments = ArrayList@28[empty]
+    classifier = JavaClassImpl@25['RetentionPolicy']
+    nullable = 'true': Boolean@29
+    typeConstructor = LazyJavaClassTypeConstructor@14['RetentionPolicy']
 }
 
 LazyJavaPackageFragmentProvider@30 {
-    _packageFragments('<root>': FqName@31) = LazyJavaPackageFragment@32['<root>']
-    _packageFragments('E': FqName@33) = null
-    _packageFragments('Enum': FqName@34) = null
-    _packageFragments('InlineOption': FqName@35) = null
-    _packageFragments('RetentionPolicy': FqName@36) = null
-    _packageFragments('a': FqName@37) = null
-    _packageFragments('b': FqName@38) = null
-    _packageFragments('c': FqName@39) = null
-    _packageFragments('java': FqName@40) = LazyJavaPackageFragment@41['java']
-    _packageFragments('java.lang': FqName@42) = LazyJavaPackageFragment@43['lang']
-    _packageFragments('java.lang.E': FqName@44) = null
-    _packageFragments('java.lang.Enum': FqName@45) = null
-    _packageFragments('java.lang.InlineOption': FqName@46) = null
-    _packageFragments('java.lang.RetentionPolicy': FqName@47) = null
-    _packageFragments('java.lang.annotation': FqName@48) = LazyJavaPackageFragment@49['annotation']
-    _packageFragments('java.lang.annotation.RetentionPolicy': FqName@50) = null
-    _packageFragments('kotlin': FqName@51) = null
-    _packageFragments('kotlin.E': FqName@52) = null
-    _packageFragments('kotlin.Enum': FqName@53) = null
-    _packageFragments('kotlin.InlineOption': FqName@54) = null
-    _packageFragments('kotlin.RetentionPolicy': FqName@55) = null
-    _packageFragments('kotlin.io': FqName@56) = null
-    _packageFragments('kotlin.jvm': FqName@57) = null
+    packageFragments('<root>': FqName@31) = LazyJavaPackageFragment@32['<root>']
+    packageFragments('E': FqName@33) = null
+    packageFragments('Enum': FqName@34) = null
+    packageFragments('InlineOption': FqName@35) = null
+    packageFragments('RetentionPolicy': FqName@36) = null
+    packageFragments('a': FqName@37) = null
+    packageFragments('b': FqName@38) = null
+    packageFragments('c': FqName@39) = null
+    packageFragments('java': FqName@40) = LazyJavaPackageFragment@41['java']
+    packageFragments('java.lang': FqName@42) = LazyJavaPackageFragment@43['lang']
+    packageFragments('java.lang.E': FqName@44) = null
+    packageFragments('java.lang.Enum': FqName@45) = null
+    packageFragments('java.lang.InlineOption': FqName@46) = null
+    packageFragments('java.lang.RetentionPolicy': FqName@47) = null
+    packageFragments('java.lang.annotation': FqName@48) = LazyJavaPackageFragment@49['annotation']
+    packageFragments('java.lang.annotation.RetentionPolicy': FqName@50) = null
+    packageFragments('kotlin': FqName@51) = null
+    packageFragments('kotlin.E': FqName@52) = null
+    packageFragments('kotlin.Enum': FqName@53) = null
+    packageFragments('kotlin.InlineOption': FqName@54) = null
+    packageFragments('kotlin.RetentionPolicy': FqName@55) = null
+    packageFragments('kotlin.io': FqName@56) = null
+    packageFragments('kotlin.jvm': FqName@57) = null
     topLevelClasses(JavaClassImpl@58['RetentionPolicy']) = LazyJavaClassDescriptor@4['RetentionPolicy']
 }
 
 LazyJavaPackageFragment@32['<root>'] {
-    _functions('java': Name@59) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('Enum': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('InlineOption': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('RetentionPolicy': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('java': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@65 // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('Enum': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('InlineOption': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('RetentionPolicy': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('java': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@60
+    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@60
+    functions('java': Name@65) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@60
     memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@60
 }
 
 LazyJavaPackageFragment@49['annotation'] {
-    _functions('RetentionPolicy': Name@67) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('RetentionPolicy': Name@69) = LazyJavaClassDescriptor@4['RetentionPolicy'] // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@65 // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('RetentionPolicy': Name@67) = LazyJavaClassDescriptor@4['RetentionPolicy'] // through LazyPackageFragmentScopeForJavaPackage@68
+    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@68
+    functions('RetentionPolicy': Name@69) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@68
     memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@68
 }
 
 LazyJavaPackageFragment@41['java'] {
-    _functions('lang': Name@71) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('lang': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@65 // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('lang': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('lang': Name@73) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@72
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
 }
 
 LazyJavaPackageFragment@43['lang'] {
-    _functions('annotation': Name@75) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('annotation': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@65 // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('annotation': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('annotation': Name@77) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@76
     memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
 }

compiler/testData/diagnostics/tests/enum/enumModifier.lazy.log

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

compiler/testData/diagnostics/tests/enum/enumStarImport.lazy.log

@@ -1,146 +1,146 @@
 LazyJavaClassDescriptor@0['Exception'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
 }
 
 LazyJavaClassDescriptor@2['RuntimeException'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@3['RuntimeException']
+    typeConstructor = LazyJavaClassTypeConstructor@3['RuntimeException']
 }
 
 LazyJavaClassDescriptor@4['UnsupportedOperationException'] {
-    _constructors = ArrayList@5[4] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], ... } // through LazyJavaClassMemberScope@9
-    _functionTypeForSamInterface = null
-    _typeConstructor = LazyJavaClassTypeConstructor@10['UnsupportedOperationException']
-    defaultType = JetTypeImpl@11['UnsupportedOperationException']
+    constructors = ArrayList@5[4] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], ... } // through LazyJavaClassMemberScope@9
+    defaultType = JetTypeImpl@10['UnsupportedOperationException']
+    functionTypeForSamInterface = null
+    typeConstructor = LazyJavaClassTypeConstructor@11['UnsupportedOperationException']
 }
 
 LazyJavaClassTypeConstructor@1['Exception'] {
-    _parameters = ArrayList@12[empty]
-    _supertypes = ArrayList@13[1] { LazyJavaClassifierType@14['Throwable'] }
+    parameters = ArrayList@12[empty]
+    supertypes = ArrayList@13[1] { LazyJavaClassifierType@14['Throwable'] }
 }
 
 LazyJavaClassTypeConstructor@3['RuntimeException'] {
-    _parameters = ArrayList@15[empty]
-    _supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Exception'] }
+    parameters = ArrayList@15[empty]
+    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Exception'] }
 }
 
-LazyJavaClassTypeConstructor@10['UnsupportedOperationException'] {
-    _parameters = ArrayList@18[empty]
-    _supertypes = ArrayList@19[1] { LazyJavaClassifierType@20['RuntimeException'] }
+LazyJavaClassTypeConstructor@11['UnsupportedOperationException'] {
+    parameters = ArrayList@18[empty]
+    supertypes = ArrayList@19[1] { LazyJavaClassifierType@20['RuntimeException'] }
 }
 
 LazyJavaClassifierType@17['Exception'] {
-    _arguments = ArrayList@21[empty]
-    _typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
+    arguments = ArrayList@21[empty]
     classifier = JavaClassImpl@22['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
 }
 
 LazyJavaClassifierType@20['RuntimeException'] {
-    _arguments = ArrayList@23[empty]
-    _typeConstructor = LazyJavaClassTypeConstructor@3['RuntimeException']
+    arguments = ArrayList@23[empty]
     classifier = JavaClassImpl@24['RuntimeException']
+    typeConstructor = LazyJavaClassTypeConstructor@3['RuntimeException']
 }
 
 LazyJavaClassifierType@25['String'] {
-    _arguments = ArrayList@26[empty]
-    _nullable = 'false': Boolean@27
-    _typeConstructor = DeserializedClassTypeConstructor@28
-    classifier = JavaClassImpl@29['String']
+    arguments = ArrayList@26[empty]
+    classifier = JavaClassImpl@27['String']
+    nullable = 'false': Boolean@28
+    typeConstructor = DeserializedClassTypeConstructor@29
 }
 
 LazyJavaClassifierType@30['String'] {
-    _arguments = ArrayList@31[empty]
-    _nullable = 'false': Boolean@27
-    _typeConstructor = DeserializedClassTypeConstructor@28
+    arguments = ArrayList@31[empty]
     classifier = JavaClassImpl@32['String']
+    nullable = 'false': Boolean@28
+    typeConstructor = DeserializedClassTypeConstructor@29
 }
 
 LazyJavaClassifierType@33['String'] {
-    _arguments = ArrayList@34[empty]
-    _nullable = 'true': Boolean@35
-    _typeConstructor = DeserializedClassTypeConstructor@28
-    classifier = JavaClassImpl@29['String']
+    arguments = ArrayList@34[empty]
+    classifier = JavaClassImpl@32['String']
+    nullable = 'true': Boolean@35
+    typeConstructor = DeserializedClassTypeConstructor@29
 }
 
 LazyJavaClassifierType@36['String'] {
-    _arguments = ArrayList@37[empty]
-    _nullable = 'true': Boolean@35
-    _typeConstructor = DeserializedClassTypeConstructor@28
-    classifier = JavaClassImpl@32['String']
+    arguments = ArrayList@37[empty]
+    classifier = JavaClassImpl@27['String']
+    nullable = 'true': Boolean@35
+    typeConstructor = DeserializedClassTypeConstructor@29
 }
 
 LazyJavaClassifierType@38['Throwable'] {
-    _arguments = ArrayList@39[empty]
-    _nullable = 'false': Boolean@27
-    _typeConstructor = DeserializedClassTypeConstructor@40
-    classifier = JavaClassImpl@41['Throwable']
+    arguments = ArrayList@39[empty]
+    classifier = JavaClassImpl@40['Throwable']
+    nullable = 'false': Boolean@28
+    typeConstructor = DeserializedClassTypeConstructor@41
 }
 
 LazyJavaClassifierType@42['Throwable'] {
-    _arguments = ArrayList@43[empty]
-    _nullable = 'false': Boolean@27
-    _typeConstructor = DeserializedClassTypeConstructor@40
+    arguments = ArrayList@43[empty]
     classifier = JavaClassImpl@44['Throwable']
+    nullable = 'false': Boolean@28
+    typeConstructor = DeserializedClassTypeConstructor@41
 }
 
 LazyJavaClassifierType@45['Throwable'] {
-    _arguments = ArrayList@46[empty]
-    _nullable = 'true': Boolean@35
-    _typeConstructor = DeserializedClassTypeConstructor@40
-    classifier = JavaClassImpl@41['Throwable']
+    arguments = ArrayList@46[empty]
+    classifier = JavaClassImpl@44['Throwable']
+    nullable = 'true': Boolean@35
+    typeConstructor = DeserializedClassTypeConstructor@41
 }
 
 LazyJavaClassifierType@47['Throwable'] {
-    _arguments = ArrayList@48[empty]
-    _nullable = 'true': Boolean@35
-    _typeConstructor = DeserializedClassTypeConstructor@40
-    classifier = JavaClassImpl@44['Throwable']
+    arguments = ArrayList@48[empty]
+    classifier = JavaClassImpl@40['Throwable']
+    nullable = 'true': Boolean@35
+    typeConstructor = DeserializedClassTypeConstructor@41
 }
 
 LazyJavaClassifierType@14['Throwable'] {
-    _arguments = ArrayList@49[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@40
+    arguments = ArrayList@49[empty]
     classifier = JavaClassImpl@50['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@41
 }
 
 LazyJavaPackageFragmentProvider@51 {
-    _packageFragments('<root>': FqName@52) = LazyJavaPackageFragment@53['<root>']
-    _packageFragments('HappyEnum': FqName@54) = null
-    _packageFragments('enum': FqName@55) = null
-    _packageFragments('enum.HappyEnum': FqName@56) = null
-    _packageFragments('java': FqName@57) = LazyJavaPackageFragment@58['java']
-    _packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
-    _packageFragments('java.lang.HappyEnum': FqName@61) = null
-    _packageFragments('kotlin': FqName@62) = null
-    _packageFragments('kotlin.HappyEnum': FqName@63) = null
-    _packageFragments('kotlin.io': FqName@64) = null
-    _packageFragments('kotlin.jvm': FqName@65) = null
+    packageFragments('<root>': FqName@52) = LazyJavaPackageFragment@53['<root>']
+    packageFragments('HappyEnum': FqName@54) = null
+    packageFragments('enum': FqName@55) = null
+    packageFragments('enum.HappyEnum': FqName@56) = null
+    packageFragments('java': FqName@57) = LazyJavaPackageFragment@58['java']
+    packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
+    packageFragments('java.lang.HappyEnum': FqName@61) = null
+    packageFragments('kotlin': FqName@62) = null
+    packageFragments('kotlin.HappyEnum': FqName@63) = null
+    packageFragments('kotlin.io': FqName@64) = null
+    packageFragments('kotlin.jvm': FqName@65) = null
     topLevelClasses(JavaClassImpl@22['Exception']) = LazyJavaClassDescriptor@0['Exception']
     topLevelClasses(JavaClassImpl@24['RuntimeException']) = LazyJavaClassDescriptor@2['RuntimeException']
     topLevelClasses(JavaClassImpl@66['UnsupportedOperationException']) = LazyJavaClassDescriptor@4['UnsupportedOperationException']
 }
 
 LazyJavaPackageFragment@53['<root>'] {
-    _functions('UnsupportedOperationException': Name@67) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    _functions('enum': Name@70) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('CASE1': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('CASE2': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('HappyEnum': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('UnsupportedOperationException': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('enum': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('CASE1': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('CASE2': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('HappyEnum': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('UnsupportedOperationException': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('enum': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@68
+    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@68
+    functions('UnsupportedOperationException': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@68
+    functions('enum': Name@75) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@68
+    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@68
 }
 
 LazyJavaPackageFragment@58['java'] {
-    _functions('lang': Name@77) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('lang': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('lang': Name@79) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@78
     memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@78
 }
 
 LazyJavaPackageFragment@60['lang'] {
-    _functions('UnsupportedOperationException': Name@67) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('UnsupportedOperationException': Name@67) = LazyJavaClassDescriptor@4['UnsupportedOperationException'] // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('UnsupportedOperationException': Name@71) = LazyJavaClassDescriptor@4['UnsupportedOperationException'] // through LazyPackageFragmentScopeForJavaPackage@81
+    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('UnsupportedOperationException': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@81
     memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@81
 }

compiler/testData/diagnostics/tests/enum/enumWithEmptyName.lazy.log

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

compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.lazy.log

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

compiler/testData/diagnostics/tests/enum/importEnumFromJava.lazy.log

@@ -11,82 +11,82 @@ EnumEntrySyntheticClassDescriptor@4['SECONDS'] {
 }
 
 LazyJavaClassDescriptor@6['TimeUnit'] {
-    _functionTypeForSamInterface = null
-    _properties('SECONDS': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@9
-    _properties('SECONDS': Name@7) = EmptyList@8[empty] // through LazyJavaStaticClassScope@10
-    _typeConstructor = LazyJavaClassTypeConstructor@11['TimeUnit']
     defaultType = JetTypeImpl@1['TimeUnit']
-    enumEntryIndex = LinkedHashMap@12 // through LazyJavaClassMemberScope@9
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@9
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaStaticClassScope@10
-    nestedClassIndex = LinkedHashMap@15 // through LazyJavaClassMemberScope@9
-    nestedClasses('SECONDS': Name@7) = EnumEntrySyntheticClassDescriptor@4['SECONDS'] // through LazyJavaClassMemberScope@9
+    enumEntryIndex = LinkedHashMap@7 // through LazyJavaClassMemberScope@8
+    functionTypeForSamInterface = null
+    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@8
+    memberIndex = computeMemberIndex$1@10 // through LazyJavaStaticClassScope@11
+    nestedClassIndex = LinkedHashMap@12 // through LazyJavaClassMemberScope@8
+    nestedClasses('SECONDS': Name@13) = EnumEntrySyntheticClassDescriptor@4['SECONDS'] // through LazyJavaClassMemberScope@8
+    properties('SECONDS': Name@13) = EmptyList@14[empty] // through LazyJavaClassMemberScope@8
+    properties('SECONDS': Name@13) = EmptyList@14[empty] // through LazyJavaStaticClassScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@15['TimeUnit']
 }
 
-LazyJavaClassTypeConstructor@11['TimeUnit'] {
-    _parameters = ArrayList@16[empty]
-    _supertypes = ArrayList@17[1] { LazyJavaClassifierType@18['Enum<TimeUnit>'] }
+LazyJavaClassTypeConstructor@15['TimeUnit'] {
+    parameters = ArrayList@16[empty]
+    supertypes = ArrayList@17[1] { LazyJavaClassifierType@18['Enum<TimeUnit>'] }
 }
 
 LazyJavaClassifierType@18['Enum<TimeUnit>'] {
-    _arguments = ArrayList@19[1] { TypeProjectionImpl@20 }
-    _memberScope = SubstitutingScope@21
-    _typeConstructor = DeserializedClassTypeConstructor@22
-    classifier = JavaClassImpl@23['Enum']
+    arguments = ArrayList@19[1] { TypeProjectionImpl@20 }
+    classifier = JavaClassImpl@21['Enum']
+    memberScope = SubstitutingScope@22
+    typeConstructor = DeserializedClassTypeConstructor@23
 }
 
 LazyJavaClassifierType@24['TimeUnit'] {
-    _arguments = ArrayList@25[empty]
-    _nullable = 'false': Boolean@26
-    _typeConstructor = LazyJavaClassTypeConstructor@11['TimeUnit']
-    classifier = JavaClassImpl@27['TimeUnit']
+    arguments = ArrayList@25[empty]
+    classifier = JavaClassImpl@26['TimeUnit']
+    nullable = 'false': Boolean@27
+    typeConstructor = LazyJavaClassTypeConstructor@15['TimeUnit']
 }
 
 LazyJavaClassifierType@28['TimeUnit'] {
-    _arguments = ArrayList@29[empty]
-    _nullable = 'true': Boolean@30
-    _typeConstructor = LazyJavaClassTypeConstructor@11['TimeUnit']
-    classifier = JavaClassImpl@27['TimeUnit']
+    arguments = ArrayList@29[empty]
+    classifier = JavaClassImpl@26['TimeUnit']
+    nullable = 'true': Boolean@30
+    typeConstructor = LazyJavaClassTypeConstructor@15['TimeUnit']
 }
 
 LazyJavaPackageFragmentProvider@31 {
-    _packageFragments('<root>': FqName@32) = LazyJavaPackageFragment@33['<root>']
-    _packageFragments('java': FqName@34) = LazyJavaPackageFragment@35['java']
-    _packageFragments('java.lang': FqName@36) = LazyJavaPackageFragment@37['lang']
-    _packageFragments('java.util': FqName@38) = LazyJavaPackageFragment@39['util']
-    _packageFragments('java.util.concurrent': FqName@40) = LazyJavaPackageFragment@41['concurrent']
-    _packageFragments('java.util.concurrent.TimeUnit': FqName@42) = null
-    _packageFragments('kotlin': FqName@43) = null
-    _packageFragments('kotlin.io': FqName@44) = null
-    _packageFragments('kotlin.jvm': FqName@45) = null
-    _packageFragments('test': FqName@46) = null
-    _packageFragments('test.c': FqName@47) = null
+    packageFragments('<root>': FqName@32) = LazyJavaPackageFragment@33['<root>']
+    packageFragments('java': FqName@34) = LazyJavaPackageFragment@35['java']
+    packageFragments('java.lang': FqName@36) = LazyJavaPackageFragment@37['lang']
+    packageFragments('java.util': FqName@38) = LazyJavaPackageFragment@39['util']
+    packageFragments('java.util.concurrent': FqName@40) = LazyJavaPackageFragment@41['concurrent']
+    packageFragments('java.util.concurrent.TimeUnit': FqName@42) = null
+    packageFragments('kotlin': FqName@43) = null
+    packageFragments('kotlin.io': FqName@44) = null
+    packageFragments('kotlin.jvm': FqName@45) = null
+    packageFragments('test': FqName@46) = null
+    packageFragments('test.c': FqName@47) = null
     topLevelClasses(JavaClassImpl@48['TimeUnit']) = LazyJavaClassDescriptor@6['TimeUnit']
 }
 
 LazyJavaPackageFragment@41['concurrent'] {
-    _functions('TimeUnit': Name@49) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('TimeUnit': Name@51) = LazyJavaClassDescriptor@6['TimeUnit'] // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('TimeUnit': Name@49) = LazyJavaClassDescriptor@6['TimeUnit'] // through LazyPackageFragmentScopeForJavaPackage@50
+    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('TimeUnit': Name@52) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@50
     memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@50
 }
 
 LazyJavaPackageFragment@35['java'] {
-    _functions('lang': Name@54) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    _functions('util': Name@56) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('lang': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('util': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('lang': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('util': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@55
+    functions('lang': Name@57) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@55
+    functions('util': Name@58) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@55
     memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@55
 }
 
 LazyJavaPackageFragment@37['lang'] {
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@60
+    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@60
 }
 
 LazyJavaPackageFragment@39['util'] {
-    _functions('concurrent': Name@61) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('concurrent': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@62
+    classes('concurrent': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('concurrent': Name@63) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@62
     memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@62
 }

compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.lazy.log

@@ -1,19 +1,19 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('A': FqName@3) = null
-    _packageFragments('E': FqName@4) = null
-    _packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    _packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    _packageFragments('java.lang.E': FqName@9) = null
-    _packageFragments('kotlin': FqName@10) = null
-    _packageFragments('kotlin.E': FqName@11) = null
-    _packageFragments('kotlin.io': FqName@12) = null
-    _packageFragments('kotlin.jvm': FqName@13) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('A': FqName@3) = null
+    packageFragments('E': FqName@4) = null
+    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
+    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
+    packageFragments('java.lang.E': FqName@9) = null
+    packageFragments('kotlin': FqName@10) = null
+    packageFragments('kotlin.E': FqName@11) = null
+    packageFragments('kotlin.io': FqName@12) = null
+    packageFragments('kotlin.jvm': FqName@13) = null
 }
 
 LazyJavaPackageFragment@6['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
 }

compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.lazy.log

@@ -1,75 +1,75 @@
 LazyJavaClassDescriptor@0['MyJavaEnum'] {
-    _allDescriptors = ArrayList@1[6] { DeserializedSimpleFunctionDescriptor@2['hashCode'], DeserializedSimpleFunctionDescriptor@3['toString'], DeserializedSimpleFunctionDescriptor@4['compareTo'], ... } // through LazyJavaClassMemberScope@5
-    _constructors = ArrayList@6[1] { JavaConstructorDescriptor@7['<init>'] } // through LazyJavaClassMemberScope@5
-    _functions('clone': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5
-    _functions('compareTo': Name@10) = ArrayList@11[1] { DeserializedSimpleFunctionDescriptor@4['compareTo'] } // through LazyJavaClassMemberScope@5
-    _functions('equals': Name@12) = ArrayList@13[1] { DeserializedSimpleFunctionDescriptor@14['equals'] } // through LazyJavaClassMemberScope@5
-    _functions('finalize': Name@15) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5
-    _functions('getClass': Name@16) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5
-    _functions('getDeclaringClass': Name@17) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5
-    _functions('hashCode': Name@18) = ArrayList@19[1] { DeserializedSimpleFunctionDescriptor@2['hashCode'] } // through LazyJavaClassMemberScope@5
-    _functions('name': Name@20) = ArrayList@21[1] { DeserializedSimpleFunctionDescriptor@22['name'] } // through LazyJavaClassMemberScope@5
-    _functions('notify': Name@23) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5
-    _functions('notifyAll': Name@24) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5
-    _functions('ordinal': Name@25) = ArrayList@26[1] { DeserializedSimpleFunctionDescriptor@27['ordinal'] } // through LazyJavaClassMemberScope@5
-    _functions('readObject': Name@28) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5
-    _functions('readObjectNoData': Name@29) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5
-    _functions('toString': Name@30) = ArrayList@31[1] { DeserializedSimpleFunctionDescriptor@3['toString'] } // through LazyJavaClassMemberScope@5
-    _functions('wait': Name@32) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5
-    _properties('name': Name@33) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5
-    _properties('ordinal': Name@34) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5
-    _typeConstructor = LazyJavaClassTypeConstructor@35['MyJavaEnum']
-    defaultType = JetTypeImpl@36['MyJavaEnum']
-    enumEntryIndex = LinkedHashMap@37 // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@39 // through LazyJavaClassMemberScope@5
+    allDescriptors = ArrayList@1[6] { DeserializedSimpleFunctionDescriptor@2['hashCode'], DeserializedSimpleFunctionDescriptor@3['toString'], DeserializedSimpleFunctionDescriptor@4['compareTo'], ... } // through LazyJavaClassMemberScope@5
+    constructors = ArrayList@6[1] { JavaConstructorDescriptor@7['<init>'] } // through LazyJavaClassMemberScope@5
+    defaultType = JetTypeImpl@8['MyJavaEnum']
+    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@5
+    functions('clone': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
+    functions('compareTo': Name@12) = ArrayList@13[1] { DeserializedSimpleFunctionDescriptor@4['compareTo'] } // through LazyJavaClassMemberScope@5
+    functions('equals': Name@14) = ArrayList@15[1] { DeserializedSimpleFunctionDescriptor@16['equals'] } // through LazyJavaClassMemberScope@5
+    functions('finalize': Name@17) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
+    functions('getClass': Name@18) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
+    functions('getDeclaringClass': Name@19) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
+    functions('hashCode': Name@20) = ArrayList@21[1] { DeserializedSimpleFunctionDescriptor@2['hashCode'] } // through LazyJavaClassMemberScope@5
+    functions('name': Name@22) = ArrayList@23[1] { DeserializedSimpleFunctionDescriptor@24['name'] } // through LazyJavaClassMemberScope@5
+    functions('notify': Name@25) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
+    functions('notifyAll': Name@26) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
+    functions('ordinal': Name@27) = ArrayList@28[1] { DeserializedSimpleFunctionDescriptor@29['ordinal'] } // through LazyJavaClassMemberScope@5
+    functions('readObject': Name@30) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
+    functions('readObjectNoData': Name@31) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
+    functions('toString': Name@32) = ArrayList@33[1] { DeserializedSimpleFunctionDescriptor@3['toString'] } // through LazyJavaClassMemberScope@5
+    functions('wait': Name@34) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
+    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@5
+    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@5
+    properties('name': Name@37) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
+    properties('ordinal': Name@38) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
+    typeConstructor = LazyJavaClassTypeConstructor@39['MyJavaEnum']
 }
 
-LazyJavaClassTypeConstructor@35['MyJavaEnum'] {
-    _parameters = ArrayList@40[empty]
-    _supertypes = ArrayList@41[1] { LazyJavaClassifierType@42['Enum<MyJavaEnum>'] }
+LazyJavaClassTypeConstructor@39['MyJavaEnum'] {
+    parameters = ArrayList@40[empty]
+    supertypes = ArrayList@41[1] { LazyJavaClassifierType@42['Enum<MyJavaEnum>'] }
 }
 
 LazyJavaClassifierType@42['Enum<MyJavaEnum>'] {
-    _arguments = ArrayList@43[1] { TypeProjectionImpl@44 }
-    _memberScope = SubstitutingScope@45
-    _nullable = 'false': Boolean@46
-    _typeConstructor = DeserializedClassTypeConstructor@47
-    classifier = JavaClassImpl@48['Enum']
+    arguments = ArrayList@43[1] { TypeProjectionImpl@44 }
+    classifier = JavaClassImpl@45['Enum']
+    memberScope = SubstitutingScope@46
+    nullable = 'false': Boolean@47
+    typeConstructor = DeserializedClassTypeConstructor@48
 }
 
 LazyJavaClassifierType@49['MyJavaEnum'] {
-    _arguments = ArrayList@50[empty]
-    _nullable = 'false': Boolean@46
-    _typeConstructor = LazyJavaClassTypeConstructor@35['MyJavaEnum']
+    arguments = ArrayList@50[empty]
     classifier = JavaClassImpl@51['MyJavaEnum']
+    nullable = 'false': Boolean@47
+    typeConstructor = LazyJavaClassTypeConstructor@39['MyJavaEnum']
 }
 
 LazyJavaClassifierType@52['MyJavaEnum'] {
-    _arguments = ArrayList@53[empty]
-    _nullable = 'true': Boolean@54
-    _typeConstructor = LazyJavaClassTypeConstructor@35['MyJavaEnum']
+    arguments = ArrayList@53[empty]
     classifier = JavaClassImpl@51['MyJavaEnum']
+    nullable = 'true': Boolean@54
+    typeConstructor = LazyJavaClassTypeConstructor@39['MyJavaEnum']
 }
 
 LazyJavaPackageFragmentProvider@55 {
-    _packageFragments('<root>': FqName@56) = LazyJavaPackageFragment@57['<root>']
-    _packageFragments('MyClass': FqName@58) = null
-    _packageFragments('MyClass2': FqName@59) = null
-    _packageFragments('MyEnum': FqName@60) = null
-    _packageFragments('MyEnum2': FqName@61) = null
-    _packageFragments('MyJavaEnum': FqName@62) = null
-    _packageFragments('java': FqName@63) = LazyJavaPackageFragment@64['java']
-    _packageFragments('java.lang': FqName@65) = LazyJavaPackageFragment@66['lang']
-    _packageFragments('java.lang.MyEnum': FqName@67) = null
-    _packageFragments('java.lang.MyEnum2': FqName@68) = null
-    _packageFragments('java.lang.MyJavaEnum': FqName@69) = null
-    _packageFragments('kotlin': FqName@70) = null
-    _packageFragments('kotlin.MyEnum': FqName@71) = null
-    _packageFragments('kotlin.MyEnum2': FqName@72) = null
-    _packageFragments('kotlin.MyJavaEnum': FqName@73) = null
-    _packageFragments('kotlin.io': FqName@74) = null
-    _packageFragments('kotlin.jvm': FqName@75) = null
+    packageFragments('<root>': FqName@56) = LazyJavaPackageFragment@57['<root>']
+    packageFragments('MyClass': FqName@58) = null
+    packageFragments('MyClass2': FqName@59) = null
+    packageFragments('MyEnum': FqName@60) = null
+    packageFragments('MyEnum2': FqName@61) = null
+    packageFragments('MyJavaEnum': FqName@62) = null
+    packageFragments('java': FqName@63) = LazyJavaPackageFragment@64['java']
+    packageFragments('java.lang': FqName@65) = LazyJavaPackageFragment@66['lang']
+    packageFragments('java.lang.MyEnum': FqName@67) = null
+    packageFragments('java.lang.MyEnum2': FqName@68) = null
+    packageFragments('java.lang.MyJavaEnum': FqName@69) = null
+    packageFragments('kotlin': FqName@70) = null
+    packageFragments('kotlin.MyEnum': FqName@71) = null
+    packageFragments('kotlin.MyEnum2': FqName@72) = null
+    packageFragments('kotlin.MyJavaEnum': FqName@73) = null
+    packageFragments('kotlin.io': FqName@74) = null
+    packageFragments('kotlin.jvm': FqName@75) = null
     topLevelClasses(JavaClassImpl@76['MyJavaEnum']) = LazyJavaClassDescriptor@0['MyJavaEnum']
 }
 
@@ -78,8 +78,8 @@ LazyJavaPackageFragment@57['<root>'] {
 }
 
 LazyJavaPackageFragment@64['java'] {
-    _functions('lang': Name@79) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('lang': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('lang': Name@82) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@80
 }

compiler/testData/diagnostics/tests/enum/inner/existingClassObject.lazy.log

@@ -1,17 +1,17 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('A': FqName@3) = null
-    _packageFragments('B': FqName@4) = null
-    _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@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('A': FqName@3) = null
+    packageFragments('B': FqName@4) = null
+    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/enum/inner/insideClass.lazy.log

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

compiler/testData/diagnostics/tests/enum/inner/insideClassObject.lazy.log

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

compiler/testData/diagnostics/tests/enum/inner/insideEnum.lazy.log

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

compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.lazy.log

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

compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.lazy.log

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

compiler/testData/diagnostics/tests/enum/inner/insideObject.lazy.log

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

compiler/testData/diagnostics/tests/enum/inner/insideTrait.lazy.log

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

compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.lazy.log

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

compiler/testData/diagnostics/tests/enum/inner/twoEnums.lazy.log

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

compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.lazy.log

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

compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.lazy.log

@@ -1,53 +1,53 @@
 LazyJavaClassDescriptor@0['A'] {
-    _functions('valueOf': Name@1) = ArrayList@2[1] { SimpleFunctionDescriptorImpl@3['valueOf'] } // through LazyJavaStaticClassScope@4
-    _functions('valueOf': Name@1) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    _properties('valueOf': Name@1) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    _properties('valueOf': Name@1) = EmptyList@5[empty] // through LazyJavaStaticClassScope@4
-    _typeConstructor = LazyJavaClassTypeConstructor@7['A']
-    defaultType = JetTypeImpl@8['A']
-    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaStaticClassScope@4
-    nestedClassIndex = LinkedHashMap@12 // through LazyJavaClassMemberScope@6
-    nestedClasses('valueOf': Name@1) = null // through LazyJavaClassMemberScope@6
+    defaultType = JetTypeImpl@1['A']
+    enumEntryIndex = LinkedHashMap@2 // through LazyJavaClassMemberScope@3
+    functions('valueOf': Name@4) = ArrayList@5[1] { SimpleFunctionDescriptorImpl@6['valueOf'] } // through LazyJavaStaticClassScope@7
+    functions('valueOf': Name@4) = EmptyList@8[empty] // through LazyJavaClassMemberScope@3
+    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
+    memberIndex = computeMemberIndex$1@10 // through LazyJavaStaticClassScope@7
+    nestedClassIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@3
+    nestedClasses('valueOf': Name@4) = null // through LazyJavaClassMemberScope@3
+    properties('valueOf': Name@4) = EmptyList@8[empty] // through LazyJavaClassMemberScope@3
+    properties('valueOf': Name@4) = EmptyList@8[empty] // through LazyJavaStaticClassScope@7
+    typeConstructor = LazyJavaClassTypeConstructor@12['A']
 }
 
-LazyJavaClassTypeConstructor@7['A'] {
-    _parameters = ArrayList@13[empty]
-    _supertypes = ArrayList@14[1] { LazyJavaClassifierType@15['Enum<A>'] }
+LazyJavaClassTypeConstructor@12['A'] {
+    parameters = ArrayList@13[empty]
+    supertypes = ArrayList@14[1] { LazyJavaClassifierType@15['Enum<A>'] }
 }
 
 LazyJavaClassifierType@16['A'] {
-    _arguments = ArrayList@17[empty]
-    _nullable = 'false': Boolean@18
-    _typeConstructor = LazyJavaClassTypeConstructor@7['A']
-    classifier = JavaClassImpl@19['A']
+    arguments = ArrayList@17[empty]
+    classifier = JavaClassImpl@18['A']
+    nullable = 'false': Boolean@19
+    typeConstructor = LazyJavaClassTypeConstructor@12['A']
 }
 
 LazyJavaClassifierType@20['A'] {
-    _arguments = ArrayList@21[empty]
-    _nullable = 'true': Boolean@22
-    _typeConstructor = LazyJavaClassTypeConstructor@7['A']
-    classifier = JavaClassImpl@19['A']
+    arguments = ArrayList@21[empty]
+    classifier = JavaClassImpl@18['A']
+    nullable = 'true': Boolean@22
+    typeConstructor = LazyJavaClassTypeConstructor@12['A']
 }
 
 LazyJavaClassifierType@15['Enum<A>'] {
-    _arguments = ArrayList@23[1] { TypeProjectionImpl@24 }
-    _memberScope = SubstitutingScope@25
-    _typeConstructor = DeserializedClassTypeConstructor@26
-    classifier = JavaClassImpl@27['Enum']
+    arguments = ArrayList@23[1] { TypeProjectionImpl@24 }
+    classifier = JavaClassImpl@25['Enum']
+    memberScope = SubstitutingScope@26
+    typeConstructor = DeserializedClassTypeConstructor@27
 }
 
 LazyJavaPackageFragmentProvider@28 {
-    _packageFragments('<root>': FqName@29) = LazyJavaPackageFragment@30['<root>']
-    _packageFragments('A': FqName@31) = null
-    _packageFragments('java': FqName@32) = LazyJavaPackageFragment@33['java']
-    _packageFragments('java.lang': FqName@34) = LazyJavaPackageFragment@35['lang']
-    _packageFragments('java.lang.A': FqName@36) = null
-    _packageFragments('kotlin': FqName@37) = null
-    _packageFragments('kotlin.A': FqName@38) = null
-    _packageFragments('kotlin.io': FqName@39) = null
-    _packageFragments('kotlin.jvm': FqName@40) = null
+    packageFragments('<root>': FqName@29) = LazyJavaPackageFragment@30['<root>']
+    packageFragments('A': FqName@31) = null
+    packageFragments('java': FqName@32) = LazyJavaPackageFragment@33['java']
+    packageFragments('java.lang': FqName@34) = LazyJavaPackageFragment@35['lang']
+    packageFragments('java.lang.A': FqName@36) = null
+    packageFragments('kotlin': FqName@37) = null
+    packageFragments('kotlin.A': FqName@38) = null
+    packageFragments('kotlin.io': FqName@39) = null
+    packageFragments('kotlin.jvm': FqName@40) = null
     topLevelClasses(JavaClassImpl@41['A']) = LazyJavaClassDescriptor@0['A']
 }
 
@@ -57,9 +57,9 @@ LazyJavaPackageFragment@30['<root>'] {
 }
 
 LazyJavaPackageFragment@33['java'] {
-    _functions('lang': Name@45) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('lang': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('lang': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
     deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('lang': Name@47) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@46
     memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@46
 }
 

compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.lazy.log

@@ -1,56 +1,56 @@
 LazyJavaClassDescriptor@0['A'] {
-    _functions('values': Name@1) = ArrayList@2[1] { SimpleFunctionDescriptorImpl@3['values'] } // through LazyJavaStaticClassScope@4
-    _functions('values': Name@1) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    _properties('values': Name@1) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    _properties('values': Name@1) = EmptyList@5[empty] // through LazyJavaStaticClassScope@4
-    _typeConstructor = LazyJavaClassTypeConstructor@7['A']
-    defaultType = JetTypeImpl@8['A']
-    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaStaticClassScope@4
-    nestedClassIndex = LinkedHashMap@12 // through LazyJavaClassMemberScope@6
-    nestedClasses('values': Name@1) = null // through LazyJavaClassMemberScope@6
+    defaultType = JetTypeImpl@1['A']
+    enumEntryIndex = LinkedHashMap@2 // through LazyJavaClassMemberScope@3
+    functions('values': Name@4) = ArrayList@5[1] { SimpleFunctionDescriptorImpl@6['values'] } // through LazyJavaStaticClassScope@7
+    functions('values': Name@4) = EmptyList@8[empty] // through LazyJavaClassMemberScope@3
+    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
+    memberIndex = computeMemberIndex$1@10 // through LazyJavaStaticClassScope@7
+    nestedClassIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@3
+    nestedClasses('values': Name@4) = null // through LazyJavaClassMemberScope@3
+    properties('values': Name@4) = EmptyList@8[empty] // through LazyJavaClassMemberScope@3
+    properties('values': Name@4) = EmptyList@8[empty] // through LazyJavaStaticClassScope@7
+    typeConstructor = LazyJavaClassTypeConstructor@12['A']
 }
 
-LazyJavaClassTypeConstructor@7['A'] {
-    _parameters = ArrayList@13[empty]
-    _supertypes = ArrayList@14[1] { LazyJavaClassifierType@15['Enum<A>'] }
+LazyJavaClassTypeConstructor@12['A'] {
+    parameters = ArrayList@13[empty]
+    supertypes = ArrayList@14[1] { LazyJavaClassifierType@15['Enum<A>'] }
 }
 
 LazyJavaClassifierType@16['A'] {
-    _arguments = ArrayList@17[empty]
-    _nullable = 'false': Boolean@18
-    _typeConstructor = LazyJavaClassTypeConstructor@7['A']
-    classifier = JavaClassImpl@19['A']
+    arguments = ArrayList@17[empty]
+    classifier = JavaClassImpl@18['A']
+    nullable = 'false': Boolean@19
+    typeConstructor = LazyJavaClassTypeConstructor@12['A']
 }
 
 LazyJavaClassifierType@20['A'] {
-    _arguments = ArrayList@21[empty]
-    _nullable = 'true': Boolean@22
-    _typeConstructor = LazyJavaClassTypeConstructor@7['A']
-    classifier = JavaClassImpl@19['A']
+    arguments = ArrayList@21[empty]
+    classifier = JavaClassImpl@18['A']
+    nullable = 'true': Boolean@22
+    typeConstructor = LazyJavaClassTypeConstructor@12['A']
 }
 
 LazyJavaClassifierType@15['Enum<A>'] {
-    _arguments = ArrayList@23[1] { TypeProjectionImpl@24 }
-    _memberScope = SubstitutingScope@25
-    _typeConstructor = DeserializedClassTypeConstructor@26
-    classifier = JavaClassImpl@27['Enum']
+    arguments = ArrayList@23[1] { TypeProjectionImpl@24 }
+    classifier = JavaClassImpl@25['Enum']
+    memberScope = SubstitutingScope@26
+    typeConstructor = DeserializedClassTypeConstructor@27
 }
 
 LazyJavaPackageFragmentProvider@28 {
-    _packageFragments('<root>': FqName@29) = LazyJavaPackageFragment@30['<root>']
-    _packageFragments('A': FqName@31) = null
-    _packageFragments('Array': FqName@32) = null
-    _packageFragments('java': FqName@33) = LazyJavaPackageFragment@34['java']
-    _packageFragments('java.lang': FqName@35) = LazyJavaPackageFragment@36['lang']
-    _packageFragments('java.lang.A': FqName@37) = null
-    _packageFragments('java.lang.Array': FqName@38) = null
-    _packageFragments('kotlin': FqName@39) = null
-    _packageFragments('kotlin.A': FqName@40) = null
-    _packageFragments('kotlin.Array': FqName@41) = null
-    _packageFragments('kotlin.io': FqName@42) = null
-    _packageFragments('kotlin.jvm': FqName@43) = null
+    packageFragments('<root>': FqName@29) = LazyJavaPackageFragment@30['<root>']
+    packageFragments('A': FqName@31) = null
+    packageFragments('Array': FqName@32) = null
+    packageFragments('java': FqName@33) = LazyJavaPackageFragment@34['java']
+    packageFragments('java.lang': FqName@35) = LazyJavaPackageFragment@36['lang']
+    packageFragments('java.lang.A': FqName@37) = null
+    packageFragments('java.lang.Array': FqName@38) = null
+    packageFragments('kotlin': FqName@39) = null
+    packageFragments('kotlin.A': FqName@40) = null
+    packageFragments('kotlin.Array': FqName@41) = null
+    packageFragments('kotlin.io': FqName@42) = null
+    packageFragments('kotlin.jvm': FqName@43) = null
     topLevelClasses(JavaClassImpl@44['A']) = LazyJavaClassDescriptor@0['A']
 }
 
@@ -61,9 +61,9 @@ LazyJavaPackageFragment@30['<root>'] {
 }
 
 LazyJavaPackageFragment@34['java'] {
-    _functions('lang': Name@49) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('lang': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('lang': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@50
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('lang': Name@51) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@50
     memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@50
 }
 

compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.lazy.log

@@ -12,96 +12,96 @@ EnumEntrySyntheticClassDescriptor@8['ENTRY'] {
 }
 
 LazyJavaClassDescriptor@14['A'] {
-    _functions('s': Name@2) = ArrayList@15[1] { JavaMethodDescriptor@16['s'] } // through LazyJavaClassMemberScope@17
-    _properties('ENTRY': Name@18) = EmptyList@19[empty] // through LazyJavaClassMemberScope@17
-    _properties('ENTRY': Name@18) = EmptyList@19[empty] // through LazyJavaStaticClassScope@20
-    _properties('s': Name@2) = EmptyList@19[empty] // through LazyJavaClassMemberScope@17
-    _typeConstructor = LazyJavaClassTypeConstructor@21['A']
-    defaultType = JetTypeImpl@22['A']
-    enumEntryIndex = LinkedHashMap@23 // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@25 // through LazyJavaStaticClassScope@20
-    nestedClassIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@17
-    nestedClasses('ENTRY': Name@18) = EnumEntrySyntheticClassDescriptor@8['ENTRY'] // through LazyJavaClassMemberScope@17
+    defaultType = JetTypeImpl@15['A']
+    enumEntryIndex = LinkedHashMap@16 // through LazyJavaClassMemberScope@17
+    functions('s': Name@2) = ArrayList@18[1] { JavaMethodDescriptor@19['s'] } // through LazyJavaClassMemberScope@17
+    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@17
+    memberIndex = computeMemberIndex$1@21 // through LazyJavaStaticClassScope@22
+    nestedClassIndex = LinkedHashMap@23 // through LazyJavaClassMemberScope@17
+    nestedClasses('ENTRY': Name@24) = EnumEntrySyntheticClassDescriptor@8['ENTRY'] // through LazyJavaClassMemberScope@17
     nestedClasses('s': Name@2) = null // through LazyJavaClassMemberScope@17
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@27['<this>']
+    properties('ENTRY': Name@24) = EmptyList@25[empty] // through LazyJavaClassMemberScope@17
+    properties('ENTRY': Name@24) = EmptyList@25[empty] // through LazyJavaStaticClassScope@22
+    properties('s': Name@2) = EmptyList@25[empty] // through LazyJavaClassMemberScope@17
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@26['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@27['A']
 }
 
-LazyJavaClassTypeConstructor@21['A'] {
-    _parameters = ArrayList@28[empty]
-    _supertypes = ArrayList@29[1] { LazyJavaClassifierType@30['Enum<A>'] }
+LazyJavaClassTypeConstructor@27['A'] {
+    parameters = ArrayList@28[empty]
+    supertypes = ArrayList@29[1] { LazyJavaClassifierType@30['Enum<A>'] }
 }
 
 LazyJavaClassifierType@31['A'] {
-    _arguments = ArrayList@32[empty]
-    _nullable = 'false': Boolean@33
-    _typeConstructor = LazyJavaClassTypeConstructor@21['A']
-    classifier = JavaClassImpl@34['A']
+    arguments = ArrayList@32[empty]
+    classifier = JavaClassImpl@33['A']
+    nullable = 'false': Boolean@34
+    typeConstructor = LazyJavaClassTypeConstructor@27['A']
 }
 
 LazyJavaClassifierType@35['A'] {
-    _arguments = ArrayList@36[empty]
-    _nullable = 'true': Boolean@37
-    _typeConstructor = LazyJavaClassTypeConstructor@21['A']
-    classifier = JavaClassImpl@34['A']
+    arguments = ArrayList@36[empty]
+    classifier = JavaClassImpl@33['A']
+    nullable = 'true': Boolean@37
+    typeConstructor = LazyJavaClassTypeConstructor@27['A']
 }
 
 LazyJavaClassifierType@30['Enum<A>'] {
-    _arguments = ArrayList@38[1] { TypeProjectionImpl@39 }
-    _memberScope = SubstitutingScope@40
-    _typeConstructor = DeserializedClassTypeConstructor@41
-    classifier = JavaClassImpl@42['Enum']
+    arguments = ArrayList@38[1] { TypeProjectionImpl@39 }
+    classifier = JavaClassImpl@40['Enum']
+    memberScope = SubstitutingScope@41
+    typeConstructor = DeserializedClassTypeConstructor@42
 }
 
 LazyJavaClassifierType@43['String'] {
-    _arguments = ArrayList@44[empty]
-    _nullable = 'false': Boolean@33
-    _typeConstructor = DeserializedClassTypeConstructor@45
-    classifier = JavaClassImpl@46['String']
+    arguments = ArrayList@44[empty]
+    classifier = JavaClassImpl@45['String']
+    nullable = 'false': Boolean@34
+    typeConstructor = DeserializedClassTypeConstructor@46
 }
 
 LazyJavaClassifierType@47['String'] {
-    _arguments = ArrayList@48[empty]
-    _nullable = 'true': Boolean@37
-    _typeConstructor = DeserializedClassTypeConstructor@45
-    classifier = JavaClassImpl@46['String']
+    arguments = ArrayList@48[empty]
+    classifier = JavaClassImpl@45['String']
+    nullable = 'true': Boolean@37
+    typeConstructor = DeserializedClassTypeConstructor@46
 }
 
 LazyJavaPackageFragmentProvider@49 {
-    _packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    _packageFragments('A': FqName@52) = null
-    _packageFragments('String': FqName@53) = null
-    _packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
-    _packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
-    _packageFragments('java.lang.A': FqName@58) = null
-    _packageFragments('java.lang.String': FqName@59) = null
-    _packageFragments('kotlin': FqName@60) = null
-    _packageFragments('kotlin.A': FqName@61) = null
-    _packageFragments('kotlin.String': FqName@62) = null
-    _packageFragments('kotlin.io': FqName@63) = null
-    _packageFragments('kotlin.jvm': FqName@64) = null
+    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
+    packageFragments('A': FqName@52) = null
+    packageFragments('String': FqName@53) = null
+    packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
+    packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
+    packageFragments('java.lang.A': FqName@58) = null
+    packageFragments('java.lang.String': FqName@59) = null
+    packageFragments('kotlin': FqName@60) = null
+    packageFragments('kotlin.A': FqName@61) = null
+    packageFragments('kotlin.String': FqName@62) = null
+    packageFragments('kotlin.io': FqName@63) = null
+    packageFragments('kotlin.jvm': FqName@64) = null
     topLevelClasses(JavaClassImpl@65['A']) = LazyJavaClassDescriptor@14['A']
 }
 
 LazyJavaPackageFragment@51['<root>'] {
-    _functions('s': Name@2) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('A': Name@67) = LazyJavaClassDescriptor@14['A'] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('String': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('s': Name@2) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('A': Name@66) = LazyJavaClassDescriptor@14['A'] // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('String': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('s': Name@2) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('s': Name@2) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@67
 }
 
 LazyJavaPackageFragment@55['java'] {
-    _functions('lang': Name@71) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('lang': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('lang': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
     deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('lang': Name@73) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@72
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
 }
 
 LazyJavaPackageFragment@57['lang'] {
-    _functions('s': Name@2) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@75
     classes('s': Name@2) = null // through LazyPackageFragmentScopeForJavaPackage@75
     deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('s': Name@2) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@75
     memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
 }

compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.lazy.log

@@ -7,92 +7,92 @@ EnumEntrySyntheticClassDescriptor@2['ENTRY'] {
 }
 
 LazyJavaClassDescriptor@4['A'] {
-    _functions('s': Name@5) = ArrayList@6[1] { JavaMethodDescriptor@7['s'] } // through LazyJavaClassMemberScope@8
-    _properties('ENTRY': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@8
-    _properties('ENTRY': Name@9) = EmptyList@10[empty] // through LazyJavaStaticClassScope@11
-    _properties('s': Name@5) = EmptyList@10[empty] // through LazyJavaClassMemberScope@8
-    _typeConstructor = LazyJavaClassTypeConstructor@12['A']
-    defaultType = JetTypeImpl@13['A']
-    enumEntryIndex = LinkedHashMap@14 // through LazyJavaClassMemberScope@8
-    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@8
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaStaticClassScope@11
-    nestedClassIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@8
-    nestedClasses('ENTRY': Name@9) = EnumEntrySyntheticClassDescriptor@2['ENTRY'] // through LazyJavaClassMemberScope@8
-    nestedClasses('s': Name@5) = null // through LazyJavaClassMemberScope@8
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@18['<this>']
+    defaultType = JetTypeImpl@5['A']
+    enumEntryIndex = LinkedHashMap@6 // through LazyJavaClassMemberScope@7
+    functions('s': Name@8) = ArrayList@9[1] { JavaMethodDescriptor@10['s'] } // through LazyJavaClassMemberScope@7
+    memberIndex = computeMemberIndex$1@11 // through LazyJavaClassMemberScope@7
+    memberIndex = computeMemberIndex$1@12 // through LazyJavaStaticClassScope@13
+    nestedClassIndex = LinkedHashMap@14 // through LazyJavaClassMemberScope@7
+    nestedClasses('ENTRY': Name@15) = EnumEntrySyntheticClassDescriptor@2['ENTRY'] // through LazyJavaClassMemberScope@7
+    nestedClasses('s': Name@8) = null // through LazyJavaClassMemberScope@7
+    properties('ENTRY': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@7
+    properties('ENTRY': Name@15) = EmptyList@16[empty] // through LazyJavaStaticClassScope@13
+    properties('s': Name@8) = EmptyList@16[empty] // through LazyJavaClassMemberScope@7
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@17['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@18['A']
 }
 
-LazyJavaClassTypeConstructor@12['A'] {
-    _parameters = ArrayList@19[empty]
-    _supertypes = ArrayList@20[1] { LazyJavaClassifierType@21['Enum<A>'] }
+LazyJavaClassTypeConstructor@18['A'] {
+    parameters = ArrayList@19[empty]
+    supertypes = ArrayList@20[1] { LazyJavaClassifierType@21['Enum<A>'] }
 }
 
 LazyJavaClassifierType@22['A'] {
-    _arguments = ArrayList@23[empty]
-    _nullable = 'false': Boolean@24
-    _typeConstructor = LazyJavaClassTypeConstructor@12['A']
-    classifier = JavaClassImpl@25['A']
+    arguments = ArrayList@23[empty]
+    classifier = JavaClassImpl@24['A']
+    nullable = 'false': Boolean@25
+    typeConstructor = LazyJavaClassTypeConstructor@18['A']
 }
 
 LazyJavaClassifierType@26['A'] {
-    _arguments = ArrayList@27[empty]
-    _nullable = 'true': Boolean@28
-    _typeConstructor = LazyJavaClassTypeConstructor@12['A']
-    classifier = JavaClassImpl@25['A']
+    arguments = ArrayList@27[empty]
+    classifier = JavaClassImpl@24['A']
+    nullable = 'true': Boolean@28
+    typeConstructor = LazyJavaClassTypeConstructor@18['A']
 }
 
 LazyJavaClassifierType@21['Enum<A>'] {
-    _arguments = ArrayList@29[1] { TypeProjectionImpl@30 }
-    _memberScope = SubstitutingScope@31
-    _typeConstructor = DeserializedClassTypeConstructor@32
-    classifier = JavaClassImpl@33['Enum']
+    arguments = ArrayList@29[1] { TypeProjectionImpl@30 }
+    classifier = JavaClassImpl@31['Enum']
+    memberScope = SubstitutingScope@32
+    typeConstructor = DeserializedClassTypeConstructor@33
 }
 
 LazyJavaClassifierType@34['String'] {
-    _arguments = ArrayList@35[empty]
-    _nullable = 'false': Boolean@24
-    _typeConstructor = DeserializedClassTypeConstructor@36
-    classifier = JavaClassImpl@37['String']
+    arguments = ArrayList@35[empty]
+    classifier = JavaClassImpl@36['String']
+    nullable = 'false': Boolean@25
+    typeConstructor = DeserializedClassTypeConstructor@37
 }
 
 LazyJavaClassifierType@38['String'] {
-    _arguments = ArrayList@39[empty]
-    _nullable = 'true': Boolean@28
-    _typeConstructor = DeserializedClassTypeConstructor@36
-    classifier = JavaClassImpl@37['String']
+    arguments = ArrayList@39[empty]
+    classifier = JavaClassImpl@36['String']
+    nullable = 'true': Boolean@28
+    typeConstructor = DeserializedClassTypeConstructor@37
 }
 
 LazyJavaPackageFragmentProvider@40 {
-    _packageFragments('<root>': FqName@41) = LazyJavaPackageFragment@42['<root>']
-    _packageFragments('A': FqName@43) = null
-    _packageFragments('java': FqName@44) = LazyJavaPackageFragment@45['java']
-    _packageFragments('java.lang': FqName@46) = LazyJavaPackageFragment@47['lang']
-    _packageFragments('java.lang.A': FqName@48) = null
-    _packageFragments('kotlin': FqName@49) = null
-    _packageFragments('kotlin.A': FqName@50) = null
-    _packageFragments('kotlin.io': FqName@51) = null
-    _packageFragments('kotlin.jvm': FqName@52) = null
+    packageFragments('<root>': FqName@41) = LazyJavaPackageFragment@42['<root>']
+    packageFragments('A': FqName@43) = null
+    packageFragments('java': FqName@44) = LazyJavaPackageFragment@45['java']
+    packageFragments('java.lang': FqName@46) = LazyJavaPackageFragment@47['lang']
+    packageFragments('java.lang.A': FqName@48) = null
+    packageFragments('kotlin': FqName@49) = null
+    packageFragments('kotlin.A': FqName@50) = null
+    packageFragments('kotlin.io': FqName@51) = null
+    packageFragments('kotlin.jvm': FqName@52) = null
     topLevelClasses(JavaClassImpl@53['A']) = LazyJavaClassDescriptor@4['A']
 }
 
 LazyJavaPackageFragment@42['<root>'] {
-    _functions('s': Name@5) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('A': Name@55) = LazyJavaClassDescriptor@4['A'] // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('s': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('A': Name@54) = LazyJavaClassDescriptor@4['A'] // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('s': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@55
+    functions('s': Name@8) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@55
+    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@55
 }
 
 LazyJavaPackageFragment@45['java'] {
-    _functions('lang': Name@58) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
     deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('lang': Name@60) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@59
     memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@47['lang'] {
-    _functions('s': Name@5) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('s': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    classes('s': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@62
     deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('s': Name@8) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@62
     memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
 }

compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.lazy.log

@@ -18,74 +18,74 @@ EnumEntrySyntheticClassDescriptor@14['ENTRY'] {
 }
 
 LazyJavaClassDescriptor@16['A'] {
-    _properties('ANOTHER': Name@17) = EmptyList@18[empty] // through LazyJavaClassMemberScope@19
-    _properties('ANOTHER': Name@17) = EmptyList@18[empty] // through LazyJavaStaticClassScope@20
-    _properties('ENTRY': Name@21) = ArrayList@22[1] { JavaPropertyDescriptor@23['ENTRY'] } // through LazyJavaClassMemberScope@19
-    _properties('ENTRY': Name@21) = EmptyList@18[empty] // through LazyJavaStaticClassScope@20
-    _typeConstructor = LazyJavaClassTypeConstructor@24['A']
-    defaultType = JetTypeImpl@25['A']
-    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@28 // through LazyJavaStaticClassScope@20
-    nestedClassIndex = LinkedHashMap@29 // through LazyJavaClassMemberScope@19
-    nestedClasses('ANOTHER': Name@17) = EnumEntrySyntheticClassDescriptor@9['ANOTHER'] // through LazyJavaClassMemberScope@19
-    nestedClasses('ENTRY': Name@21) = EnumEntrySyntheticClassDescriptor@14['ENTRY'] // through LazyJavaClassMemberScope@19
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@30['<this>']
+    defaultType = JetTypeImpl@17['A']
+    enumEntryIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@19
+    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
+    memberIndex = computeMemberIndex$1@21 // through LazyJavaStaticClassScope@22
+    nestedClassIndex = LinkedHashMap@23 // through LazyJavaClassMemberScope@19
+    nestedClasses('ANOTHER': Name@24) = EnumEntrySyntheticClassDescriptor@9['ANOTHER'] // through LazyJavaClassMemberScope@19
+    nestedClasses('ENTRY': Name@25) = EnumEntrySyntheticClassDescriptor@14['ENTRY'] // through LazyJavaClassMemberScope@19
+    properties('ANOTHER': Name@24) = EmptyList@26[empty] // through LazyJavaClassMemberScope@19
+    properties('ANOTHER': Name@24) = EmptyList@26[empty] // through LazyJavaStaticClassScope@22
+    properties('ENTRY': Name@25) = ArrayList@27[1] { JavaPropertyDescriptor@28['ENTRY'] } // through LazyJavaClassMemberScope@19
+    properties('ENTRY': Name@25) = EmptyList@26[empty] // through LazyJavaStaticClassScope@22
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@29['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@30['A']
 }
 
-LazyJavaClassTypeConstructor@24['A'] {
-    _parameters = ArrayList@31[empty]
-    _supertypes = ArrayList@32[1] { LazyJavaClassifierType@33['Enum<A>'] }
+LazyJavaClassTypeConstructor@30['A'] {
+    parameters = ArrayList@31[empty]
+    supertypes = ArrayList@32[1] { LazyJavaClassifierType@33['Enum<A>'] }
 }
 
 LazyJavaClassifierType@34['A'] {
-    _arguments = ArrayList@35[empty]
-    _nullable = 'false': Boolean@36
-    _typeConstructor = LazyJavaClassTypeConstructor@24['A']
-    classifier = JavaClassImpl@37['A']
+    arguments = ArrayList@35[empty]
+    classifier = JavaClassImpl@36['A']
+    nullable = 'false': Boolean@37
+    typeConstructor = LazyJavaClassTypeConstructor@30['A']
 }
 
 LazyJavaClassifierType@38['A'] {
-    _arguments = ArrayList@39[empty]
-    _nullable = 'true': Boolean@40
-    _typeConstructor = LazyJavaClassTypeConstructor@24['A']
-    classifier = JavaClassImpl@37['A']
+    arguments = ArrayList@39[empty]
+    classifier = JavaClassImpl@36['A']
+    nullable = 'true': Boolean@40
+    typeConstructor = LazyJavaClassTypeConstructor@30['A']
 }
 
 LazyJavaClassifierType@33['Enum<A>'] {
-    _arguments = ArrayList@41[1] { TypeProjectionImpl@42 }
-    _memberScope = SubstitutingScope@43
-    _typeConstructor = DeserializedClassTypeConstructor@44
-    classifier = JavaClassImpl@45['Enum']
+    arguments = ArrayList@41[1] { TypeProjectionImpl@42 }
+    classifier = JavaClassImpl@43['Enum']
+    memberScope = SubstitutingScope@44
+    typeConstructor = DeserializedClassTypeConstructor@45
 }
 
 LazyJavaClassifierType@46['String'] {
-    _arguments = ArrayList@47[empty]
-    _nullable = 'false': Boolean@36
-    _typeConstructor = DeserializedClassTypeConstructor@48
-    classifier = JavaClassImpl@49['String']
+    arguments = ArrayList@47[empty]
+    classifier = JavaClassImpl@48['String']
+    nullable = 'false': Boolean@37
+    typeConstructor = DeserializedClassTypeConstructor@49
 }
 
 LazyJavaClassifierType@50['String'] {
-    _arguments = ArrayList@51[empty]
-    _nullable = 'true': Boolean@40
-    _typeConstructor = DeserializedClassTypeConstructor@48
-    classifier = JavaClassImpl@49['String']
+    arguments = ArrayList@51[empty]
+    classifier = JavaClassImpl@48['String']
+    nullable = 'true': Boolean@40
+    typeConstructor = DeserializedClassTypeConstructor@49
 }
 
 LazyJavaPackageFragmentProvider@52 {
-    _packageFragments('<root>': FqName@53) = LazyJavaPackageFragment@54['<root>']
-    _packageFragments('A': FqName@55) = null
-    _packageFragments('String': FqName@56) = null
-    _packageFragments('java': FqName@57) = LazyJavaPackageFragment@58['java']
-    _packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
-    _packageFragments('java.lang.A': FqName@61) = null
-    _packageFragments('java.lang.String': FqName@62) = null
-    _packageFragments('kotlin': FqName@63) = null
-    _packageFragments('kotlin.A': FqName@64) = null
-    _packageFragments('kotlin.String': FqName@65) = null
-    _packageFragments('kotlin.io': FqName@66) = null
-    _packageFragments('kotlin.jvm': FqName@67) = null
+    packageFragments('<root>': FqName@53) = LazyJavaPackageFragment@54['<root>']
+    packageFragments('A': FqName@55) = null
+    packageFragments('String': FqName@56) = null
+    packageFragments('java': FqName@57) = LazyJavaPackageFragment@58['java']
+    packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
+    packageFragments('java.lang.A': FqName@61) = null
+    packageFragments('java.lang.String': FqName@62) = null
+    packageFragments('kotlin': FqName@63) = null
+    packageFragments('kotlin.A': FqName@64) = null
+    packageFragments('kotlin.String': FqName@65) = null
+    packageFragments('kotlin.io': FqName@66) = null
+    packageFragments('kotlin.jvm': FqName@67) = null
     topLevelClasses(JavaClassImpl@68['A']) = LazyJavaClassDescriptor@16['A']
 }
 
@@ -96,9 +96,9 @@ LazyJavaPackageFragment@54['<root>'] {
 }
 
 LazyJavaPackageFragment@58['java'] {
-    _functions('lang': Name@73) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('lang': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
     deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('lang': Name@75) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@74
     memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@74
 }
 

compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.lazy.log

@@ -18,73 +18,73 @@ EnumEntrySyntheticClassDescriptor@14['ENTRY'] {
 }
 
 LazyJavaClassDescriptor@16['A'] {
-    _properties('ANOTHER': Name@17) = EmptyList@18[empty] // through LazyJavaClassMemberScope@19
-    _properties('ANOTHER': Name@17) = EmptyList@18[empty] // through LazyJavaStaticClassScope@20
-    _properties('ENTRY': Name@21) = EmptyList@18[empty] // through LazyJavaClassMemberScope@19
-    _properties('ENTRY': Name@21) = EmptyList@18[empty] // through LazyJavaStaticClassScope@20
-    _properties('s': Name@22) = ArrayList@23[1] { JavaPropertyDescriptor@24['s'] } // through LazyJavaClassMemberScope@19
-    _typeConstructor = LazyJavaClassTypeConstructor@25['A']
-    defaultType = JetTypeImpl@26['A']
-    enumEntryIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@28 // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@29 // through LazyJavaStaticClassScope@20
-    nestedClassIndex = LinkedHashMap@30 // through LazyJavaClassMemberScope@19
-    nestedClasses('ANOTHER': Name@17) = EnumEntrySyntheticClassDescriptor@9['ANOTHER'] // through LazyJavaClassMemberScope@19
-    nestedClasses('ENTRY': Name@21) = EnumEntrySyntheticClassDescriptor@14['ENTRY'] // through LazyJavaClassMemberScope@19
-    nestedClasses('s': Name@22) = null // through LazyJavaClassMemberScope@19
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@31['<this>']
+    defaultType = JetTypeImpl@17['A']
+    enumEntryIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@19
+    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
+    memberIndex = computeMemberIndex$1@21 // through LazyJavaStaticClassScope@22
+    nestedClassIndex = LinkedHashMap@23 // through LazyJavaClassMemberScope@19
+    nestedClasses('ANOTHER': Name@24) = EnumEntrySyntheticClassDescriptor@9['ANOTHER'] // through LazyJavaClassMemberScope@19
+    nestedClasses('ENTRY': Name@25) = EnumEntrySyntheticClassDescriptor@14['ENTRY'] // through LazyJavaClassMemberScope@19
+    nestedClasses('s': Name@26) = null // through LazyJavaClassMemberScope@19
+    properties('ANOTHER': Name@24) = EmptyList@27[empty] // through LazyJavaClassMemberScope@19
+    properties('ANOTHER': Name@24) = EmptyList@27[empty] // through LazyJavaStaticClassScope@22
+    properties('ENTRY': Name@25) = EmptyList@27[empty] // through LazyJavaClassMemberScope@19
+    properties('ENTRY': Name@25) = EmptyList@27[empty] // through LazyJavaStaticClassScope@22
+    properties('s': Name@26) = ArrayList@28[1] { JavaPropertyDescriptor@29['s'] } // through LazyJavaClassMemberScope@19
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@30['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@31['A']
 }
 
-LazyJavaClassTypeConstructor@25['A'] {
-    _parameters = ArrayList@32[empty]
-    _supertypes = ArrayList@33[1] { LazyJavaClassifierType@34['Enum<A>'] }
+LazyJavaClassTypeConstructor@31['A'] {
+    parameters = ArrayList@32[empty]
+    supertypes = ArrayList@33[1] { LazyJavaClassifierType@34['Enum<A>'] }
 }
 
 LazyJavaClassifierType@35['A'] {
-    _arguments = ArrayList@36[empty]
-    _nullable = 'false': Boolean@37
-    _typeConstructor = LazyJavaClassTypeConstructor@25['A']
-    classifier = JavaClassImpl@38['A']
+    arguments = ArrayList@36[empty]
+    classifier = JavaClassImpl@37['A']
+    nullable = 'false': Boolean@38
+    typeConstructor = LazyJavaClassTypeConstructor@31['A']
 }
 
 LazyJavaClassifierType@39['A'] {
-    _arguments = ArrayList@40[empty]
-    _nullable = 'true': Boolean@41
-    _typeConstructor = LazyJavaClassTypeConstructor@25['A']
-    classifier = JavaClassImpl@38['A']
+    arguments = ArrayList@40[empty]
+    classifier = JavaClassImpl@37['A']
+    nullable = 'true': Boolean@41
+    typeConstructor = LazyJavaClassTypeConstructor@31['A']
 }
 
 LazyJavaClassifierType@34['Enum<A>'] {
-    _arguments = ArrayList@42[1] { TypeProjectionImpl@43 }
-    _memberScope = SubstitutingScope@44
-    _typeConstructor = DeserializedClassTypeConstructor@45
-    classifier = JavaClassImpl@46['Enum']
+    arguments = ArrayList@42[1] { TypeProjectionImpl@43 }
+    classifier = JavaClassImpl@44['Enum']
+    memberScope = SubstitutingScope@45
+    typeConstructor = DeserializedClassTypeConstructor@46
 }
 
 LazyJavaClassifierType@47['String'] {
-    _arguments = ArrayList@48[empty]
-    _nullable = 'false': Boolean@37
-    _typeConstructor = DeserializedClassTypeConstructor@49
-    classifier = JavaClassImpl@50['String']
+    arguments = ArrayList@48[empty]
+    classifier = JavaClassImpl@49['String']
+    nullable = 'false': Boolean@38
+    typeConstructor = DeserializedClassTypeConstructor@50
 }
 
 LazyJavaClassifierType@51['String'] {
-    _arguments = ArrayList@52[empty]
-    _nullable = 'true': Boolean@41
-    _typeConstructor = DeserializedClassTypeConstructor@49
-    classifier = JavaClassImpl@50['String']
+    arguments = ArrayList@52[empty]
+    classifier = JavaClassImpl@49['String']
+    nullable = 'true': Boolean@41
+    typeConstructor = DeserializedClassTypeConstructor@50
 }
 
 LazyJavaPackageFragmentProvider@53 {
-    _packageFragments('<root>': FqName@54) = LazyJavaPackageFragment@55['<root>']
-    _packageFragments('A': FqName@56) = null
-    _packageFragments('java': FqName@57) = LazyJavaPackageFragment@58['java']
-    _packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
-    _packageFragments('java.lang.A': FqName@61) = null
-    _packageFragments('kotlin': FqName@62) = null
-    _packageFragments('kotlin.A': FqName@63) = null
-    _packageFragments('kotlin.io': FqName@64) = null
-    _packageFragments('kotlin.jvm': FqName@65) = null
+    packageFragments('<root>': FqName@54) = LazyJavaPackageFragment@55['<root>']
+    packageFragments('A': FqName@56) = null
+    packageFragments('java': FqName@57) = LazyJavaPackageFragment@58['java']
+    packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
+    packageFragments('java.lang.A': FqName@61) = null
+    packageFragments('kotlin': FqName@62) = null
+    packageFragments('kotlin.A': FqName@63) = null
+    packageFragments('kotlin.io': FqName@64) = null
+    packageFragments('kotlin.jvm': FqName@65) = null
     topLevelClasses(JavaClassImpl@66['A']) = LazyJavaClassDescriptor@16['A']
 }
 
@@ -94,9 +94,9 @@ LazyJavaPackageFragment@55['<root>'] {
 }
 
 LazyJavaPackageFragment@58['java'] {
-    _functions('lang': Name@70) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('lang': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
     deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@71
+    functions('lang': Name@72) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@71
     memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 

compiler/testData/diagnostics/tests/enum/kt2834.lazy.log

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

compiler/testData/diagnostics/tests/enum/localEnums.lazy.log

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

compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.lazy.log

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

compiler/testData/diagnostics/tests/enum/openMemberInEnum.lazy.log

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

compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.lazy.log

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

compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.lazy.log

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

compiler/testData/diagnostics/tests/enum/typeParametersInEnum.lazy.log

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

compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.lazy.log

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