Update lazy logs after field rename

compiler/testData/diagnostics/tests/regressions/AmbiguityOnLazyTypeComputation.lazy.log

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

compiler/testData/diagnostics/tests/regressions/AssignmentsUnderOperators.lazy.log

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

compiler/testData/diagnostics/tests/regressions/CoercionToUnit.lazy.log

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

compiler/testData/diagnostics/tests/regressions/ErrorsOnIbjectExpressionsAsParameters.lazy.log

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

compiler/testData/diagnostics/tests/regressions/Jet11.lazy.log

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

@@ -3,42 +3,42 @@ DescriptorResolver@0 {
 }
 
 LazyJavaPackageFragmentProvider@1 {
-    _packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
-    _packageFragments('Int': FqName@4) = null
-    _packageFragments('String': FqName@5) = null
-    _packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    _packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    _packageFragments('java.lang.Int': FqName@10) = null
-    _packageFragments('java.lang.String': FqName@11) = null
-    _packageFragments('jet121': FqName@12) = null
-    _packageFragments('jet121.Int': FqName@13) = null
-    _packageFragments('jet121.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@2) = LazyJavaPackageFragment@3['<root>']
+    packageFragments('Int': FqName@4) = null
+    packageFragments('String': FqName@5) = null
+    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
+    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
+    packageFragments('java.lang.Int': FqName@10) = null
+    packageFragments('java.lang.String': FqName@11) = null
+    packageFragments('jet121': FqName@12) = null
+    packageFragments('jet121.Int': FqName@13) = null
+    packageFragments('jet121.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@7['java'] {
-    _functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    _functions('apply': Name@26) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('equals': Name@28) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('f': Name@29) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('get': Name@30) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('invoke': Name@31) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     classes('apply': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('f': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('get': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('invoke': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('length': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('apply': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('equals': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('f': Name@29) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('get': Name@30) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('invoke': Name@31) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@27
 }

compiler/testData/diagnostics/tests/regressions/Jet124.lazy.log

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

compiler/testData/diagnostics/tests/regressions/Jet169.lazy.log

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

compiler/testData/diagnostics/tests/regressions/Jet17.lazy.log

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

compiler/testData/diagnostics/tests/regressions/Jet183-1.lazy.log

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

compiler/testData/diagnostics/tests/regressions/Jet183.lazy.log

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

@@ -4,126 +4,126 @@ DescriptorResolver@0 {
 }
 
 LazyJavaClassDescriptor@2['Collections'] {
-    _functionTypeForSamInterface = null
-    _functions('emptyList': Name@3) = ArrayList@4[1] { JavaMethodDescriptor@5['emptyList'] } // through LazyJavaStaticClassScope@6
-    _functions('emptyList': Name@3) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    _properties('emptyList': Name@3) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    _properties('emptyList': Name@3) = EmptyList@7[empty] // through LazyJavaStaticClassScope@6
-    _typeConstructor = LazyJavaClassTypeConstructor@9['Collections']
-    enumEntryIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@8
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaClassMemberScope@8
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaStaticClassScope@6
-    nestedClassIndex = LinkedHashMap@13 // through LazyJavaClassMemberScope@8
-    nestedClasses('emptyList': Name@3) = null // through LazyJavaClassMemberScope@8
+    enumEntryIndex = LinkedHashMap@3 // through LazyJavaClassMemberScope@4
+    functionTypeForSamInterface = null
+    functions('emptyList': Name@5) = ArrayList@6[1] { JavaMethodDescriptor@7['emptyList'] } // through LazyJavaStaticClassScope@8
+    functions('emptyList': Name@5) = EmptyList@9[empty] // through LazyJavaClassMemberScope@4
+    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@4
+    memberIndex = computeMemberIndex$1@11 // through LazyJavaStaticClassScope@8
+    nestedClassIndex = LinkedHashMap@12 // through LazyJavaClassMemberScope@4
+    nestedClasses('emptyList': Name@5) = null // through LazyJavaClassMemberScope@4
+    properties('emptyList': Name@5) = EmptyList@9[empty] // through LazyJavaClassMemberScope@4
+    properties('emptyList': Name@5) = EmptyList@9[empty] // through LazyJavaStaticClassScope@8
+    typeConstructor = LazyJavaClassTypeConstructor@13['Collections']
 }
 
-LazyJavaClassTypeConstructor@9['Collections'] {
-    _supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
+LazyJavaClassTypeConstructor@13['Collections'] {
+    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
 }
 
 LazyJavaClassifierType@16['List<T>'] {
-    _arguments = ArrayList@17[1] { TypeProjectionImpl@18 }
-    _memberScope = SubstitutingScope@19
-    _nullable = 'false': Boolean@20
-    _typeConstructor = DeserializedClassTypeConstructor@21
-    classifier = JavaClassImpl@22['List']
+    arguments = ArrayList@17[1] { TypeProjectionImpl@18 }
+    classifier = JavaClassImpl@19['List']
+    memberScope = SubstitutingScope@20
+    nullable = 'false': Boolean@21
+    typeConstructor = DeserializedClassTypeConstructor@22
 }
 
 LazyJavaClassifierType@23['List<T>'] {
-    _arguments = ArrayList@24[1] { TypeProjectionImpl@25 }
-    _memberScope = SubstitutingScope@26
-    _nullable = 'true': Boolean@27
-    _typeConstructor = DeserializedClassTypeConstructor@28
-    classifier = JavaClassImpl@22['List']
+    arguments = ArrayList@24[1] { TypeProjectionImpl@25 }
+    classifier = JavaClassImpl@19['List']
+    memberScope = SubstitutingScope@26
+    nullable = 'true': Boolean@27
+    typeConstructor = DeserializedClassTypeConstructor@28
 }
 
 LazyJavaClassifierType@29['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@30
-    classifier = JavaClassImpl@31['Object']
+    classifier = JavaClassImpl@30['Object']
+    typeConstructor = DeserializedClassTypeConstructor@31
 }
 
 LazyJavaClassifierType@32['T'] {
-    _arguments = ArrayList@33[empty]
-    _nullable = 'false': Boolean@20
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@34
-    classifier = JavaTypeParameterImpl@35['T']
+    arguments = ArrayList@33[empty]
+    classifier = JavaTypeParameterImpl@34['T']
+    nullable = 'false': Boolean@21
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
 }
 
 LazyJavaClassifierType@36['T'] {
-    _arguments = ArrayList@37[empty]
-    _nullable = 'false': Boolean@20
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@34
+    arguments = ArrayList@37[empty]
     classifier = JavaTypeParameterImpl@38['T']
+    nullable = 'false': Boolean@21
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
 }
 
 LazyJavaClassifierType@39['T'] {
-    _arguments = ArrayList@40[empty]
-    _nullable = 'true': Boolean@27
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@34
-    classifier = JavaTypeParameterImpl@35['T']
+    arguments = ArrayList@40[empty]
+    classifier = JavaTypeParameterImpl@34['T']
+    nullable = 'true': Boolean@27
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
 }
 
 LazyJavaClassifierType@41['T'] {
-    _arguments = ArrayList@42[empty]
-    _nullable = 'true': Boolean@27
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@34
+    arguments = ArrayList@42[empty]
     classifier = JavaTypeParameterImpl@38['T']
+    nullable = 'true': Boolean@27
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
 }
 
 LazyJavaPackageFragmentProvider@43 {
-    _packageFragments('<root>': FqName@44) = LazyJavaPackageFragment@45['<root>']
-    _packageFragments('Collections': FqName@46) = null
-    _packageFragments('Int': FqName@47) = null
-    _packageFragments('List': FqName@48) = null
-    _packageFragments('ab': FqName@49) = null
-    _packageFragments('java': FqName@50) = LazyJavaPackageFragment@51['java']
-    _packageFragments('java.lang': FqName@52) = LazyJavaPackageFragment@53['lang']
-    _packageFragments('java.lang.Collections': FqName@54) = null
-    _packageFragments('java.lang.Int': FqName@55) = null
-    _packageFragments('java.lang.List': FqName@56) = null
-    _packageFragments('java.util': FqName@57) = LazyJavaPackageFragment@58['util']
-    _packageFragments('java.util.Collections': FqName@59) = null
-    _packageFragments('kotlin': FqName@60) = null
-    _packageFragments('kotlin.Collections': FqName@61) = null
-    _packageFragments('kotlin.Int': FqName@62) = null
-    _packageFragments('kotlin.List': FqName@63) = null
-    _packageFragments('kotlin.io': FqName@64) = null
-    _packageFragments('kotlin.jvm': FqName@65) = null
+    packageFragments('<root>': FqName@44) = LazyJavaPackageFragment@45['<root>']
+    packageFragments('Collections': FqName@46) = null
+    packageFragments('Int': FqName@47) = null
+    packageFragments('List': FqName@48) = null
+    packageFragments('ab': FqName@49) = null
+    packageFragments('java': FqName@50) = LazyJavaPackageFragment@51['java']
+    packageFragments('java.lang': FqName@52) = LazyJavaPackageFragment@53['lang']
+    packageFragments('java.lang.Collections': FqName@54) = null
+    packageFragments('java.lang.Int': FqName@55) = null
+    packageFragments('java.lang.List': FqName@56) = null
+    packageFragments('java.util': FqName@57) = LazyJavaPackageFragment@58['util']
+    packageFragments('java.util.Collections': FqName@59) = null
+    packageFragments('kotlin': FqName@60) = null
+    packageFragments('kotlin.Collections': FqName@61) = null
+    packageFragments('kotlin.Int': FqName@62) = null
+    packageFragments('kotlin.List': FqName@63) = null
+    packageFragments('kotlin.io': FqName@64) = null
+    packageFragments('kotlin.jvm': FqName@65) = null
     topLevelClasses(JavaClassImpl@66['Collections']) = LazyJavaClassDescriptor@2['Collections']
 }
 
 LazyJavaPackageFragment@45['<root>'] {
-    _functions('java': Name@67) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('Collections': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('Int': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('List': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('java': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('Collections': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('Int': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('List': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('java': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@68
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@68
+    functions('java': Name@73) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@68
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@68
 }
 
 LazyJavaPackageFragment@51['java'] {
-    _functions('lang': Name@75) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    _functions('util': Name@77) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('lang': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('util': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('util': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('lang': Name@78) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('util': Name@79) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@76
     memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@53['lang'] {
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@81
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
 LazyJavaPackageFragment@58['util'] {
-    _functions('Collections': Name@82) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('Collections': Name@84) = LazyJavaClassDescriptor@2['Collections'] // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('Collections': Name@82) = LazyJavaClassDescriptor@2['Collections'] // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('Collections': Name@84) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@83
     memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
 LazyJavaTypeParameterDescriptor@86['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@34
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
     upperBounds = LinkedHashSet@87[1] { NullableType@88 }
     upperBoundsAsType = NullableType@88
 }

compiler/testData/diagnostics/tests/regressions/Jet67.lazy.log

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

compiler/testData/diagnostics/tests/regressions/Jet68.lazy.log

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

compiler/testData/diagnostics/tests/regressions/Jet69.lazy.log

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

compiler/testData/diagnostics/tests/regressions/Jet81.lazy.log

@@ -29,40 +29,40 @@ DescriptorResolver@14 {
 }
 
 LazyJavaPackageFragmentProvider@15 {
-    _packageFragments('<root>': FqName@16) = LazyJavaPackageFragment@17['<root>']
-    _packageFragments('A': FqName@18) = null
-    _packageFragments('Test': FqName@19) = null
-    _packageFragments('Test2': FqName@20) = null
-    _packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
-    _packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
-    _packageFragments('kotlin': FqName@25) = null
-    _packageFragments('kotlin.io': FqName@26) = null
-    _packageFragments('kotlin.jvm': FqName@27) = null
+    packageFragments('<root>': FqName@16) = LazyJavaPackageFragment@17['<root>']
+    packageFragments('A': FqName@18) = null
+    packageFragments('Test': FqName@19) = null
+    packageFragments('Test2': FqName@20) = null
+    packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
+    packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
+    packageFragments('kotlin': FqName@25) = null
+    packageFragments('kotlin.io': FqName@26) = null
+    packageFragments('kotlin.jvm': FqName@27) = null
 }
 
 LazyJavaPackageFragment@17['<root>'] {
-    _functions('plus': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('a': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('b': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('y': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('a': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('b': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('plus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('y': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('plus': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@29
 }
 
 LazyJavaPackageFragment@22['java'] {
-    _functions('lang': Name@36) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
 }
 
 LazyJavaPackageFragment@24['lang'] {
-    _functions('plus': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('a': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('b': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('y': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('a': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('b': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('plus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('y': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('plus': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
     memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
 }

compiler/testData/diagnostics/tests/regressions/OrphanStarProjection.lazy.log

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

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

compiler/testData/diagnostics/tests/regressions/OverrideResolution.lazy.log

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

compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.lazy.log

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

compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.lazy.log

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

compiler/testData/diagnostics/tests/regressions/TypeParameterAsASupertype.lazy.log

@@ -1,19 +1,19 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('A': 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('A': 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/regressions/UnavaliableQualifiedThis.lazy.log

@@ -3,52 +3,52 @@ ClosureExpressionsTypingVisitor$1@0 {
 }
 
 LazyJavaPackageFragmentProvider@2 {
-    _packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    _packageFragments('Boolean': FqName@5) = null
-    _packageFragments('Iterator': FqName@6) = null
-    _packageFragments('R': FqName@7) = null
-    _packageFragments('T': FqName@8) = null
-    _packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    _packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    _packageFragments('java.lang.Boolean': FqName@13) = null
-    _packageFragments('java.lang.Iterator': FqName@14) = null
-    _packageFragments('java.lang.R': FqName@15) = null
-    _packageFragments('java.lang.T': FqName@16) = null
-    _packageFragments('kotlin': FqName@17) = null
-    _packageFragments('kotlin.Boolean': FqName@18) = null
-    _packageFragments('kotlin.Iterator': FqName@19) = null
-    _packageFragments('kotlin.R': FqName@20) = null
-    _packageFragments('kotlin.T': FqName@21) = null
-    _packageFragments('kotlin.io': FqName@22) = null
-    _packageFragments('kotlin.jvm': FqName@23) = null
+    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
+    packageFragments('Boolean': FqName@5) = null
+    packageFragments('Iterator': FqName@6) = null
+    packageFragments('R': FqName@7) = null
+    packageFragments('T': FqName@8) = null
+    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
+    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
+    packageFragments('java.lang.Boolean': FqName@13) = null
+    packageFragments('java.lang.Iterator': FqName@14) = null
+    packageFragments('java.lang.R': FqName@15) = null
+    packageFragments('java.lang.T': FqName@16) = null
+    packageFragments('kotlin': FqName@17) = null
+    packageFragments('kotlin.Boolean': FqName@18) = null
+    packageFragments('kotlin.Iterator': FqName@19) = null
+    packageFragments('kotlin.R': FqName@20) = null
+    packageFragments('kotlin.T': FqName@21) = null
+    packageFragments('kotlin.io': FqName@22) = null
+    packageFragments('kotlin.jvm': FqName@23) = null
 }
 
 LazyJavaPackageFragment@4['<root>'] {
-    _functions('invoke': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('next': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('transform': Name@28) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Boolean': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('next': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('transform': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('Boolean': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('next': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('transform': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('invoke': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('next': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('transform': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@32) = EmptyList@25[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@12['lang'] {
-    _functions('invoke': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('next': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('transform': Name@28) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('next': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('transform': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('invoke': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('next': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('transform': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
 }

compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.lazy.log

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

compiler/testData/diagnostics/tests/regressions/ea40964.lazy.log

@@ -1,378 +1,378 @@
 LazyJavaClassDescriptor@0['AbstractMap'] {
-    _functions('get': Name@1) = ArrayList@2[1] { JavaMethodDescriptor@3['get'] } // through LazyJavaClassMemberScope@4
-    _properties('get': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@4
-    _typeConstructor = LazyJavaClassTypeConstructor@7['AbstractMap']
-    defaultType = JetTypeImpl@8['AbstractMap<2>']
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@4
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@10['<this>']
+    defaultType = JetTypeImpl@1['AbstractMap<2>']
+    functions('get': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['get'] } // through LazyJavaClassMemberScope@5
+    memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
+    properties('get': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@5
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractMap']
 }
 
 LazyJavaClassDescriptor@11['HashMap'] {
-    _constructors = ArrayList@12[4] { JavaConstructorDescriptor@13['<init>'], JavaConstructorDescriptor@14['<init>'], JavaConstructorDescriptor@15['<init>'], ... } // through LazyJavaClassMemberScope@16
-    _functionTypeForSamInterface = null
-    _functions('get': Name@5) = ArrayList@17[1] { JavaMethodDescriptor@18['get'] } // through LazyJavaClassMemberScope@16
-    _properties('get': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@16
-    _typeConstructor = LazyJavaClassTypeConstructor@19['HashMap']
-    defaultType = JetTypeImpl@20['HashMap<2>']
-    enumEntryIndex = LinkedHashMap@21 // through LazyJavaClassMemberScope@16
-    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@16
-    nestedClassIndex = LinkedHashMap@23 // through LazyJavaClassMemberScope@16
-    nestedClasses('get': Name@5) = null // through LazyJavaClassMemberScope@16
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@24['<this>']
+    constructors = ArrayList@12[4] { JavaConstructorDescriptor@13['<init>'], JavaConstructorDescriptor@14['<init>'], JavaConstructorDescriptor@15['<init>'], ... } // through LazyJavaClassMemberScope@16
+    defaultType = JetTypeImpl@17['HashMap<2>']
+    enumEntryIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@16
+    functionTypeForSamInterface = null
+    functions('get': Name@7) = ArrayList@19[1] { JavaMethodDescriptor@20['get'] } // through LazyJavaClassMemberScope@16
+    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@16
+    nestedClassIndex = LinkedHashMap@22 // through LazyJavaClassMemberScope@16
+    nestedClasses('get': Name@7) = null // through LazyJavaClassMemberScope@16
+    properties('get': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@16
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@23['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@24['HashMap']
 }
 
 LazyJavaClassDescriptor@25['Serializable'] {
-    _functions('get': Name@1) = EmptyList@6[empty] // through LazyJavaClassMemberScope@26
-    _properties('get': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@26
-    _typeConstructor = LazyJavaClassTypeConstructor@27['Serializable']
-    memberIndex = computeMemberIndex$1@28 // through LazyJavaClassMemberScope@26
+    functions('get': Name@2) = EmptyList@8[empty] // through LazyJavaClassMemberScope@26
+    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@26
+    properties('get': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@26
+    typeConstructor = LazyJavaClassTypeConstructor@28['Serializable']
 }
 
-LazyJavaClassTypeConstructor@7['AbstractMap'] {
-    _parameters = ArrayList@29[2] { LazyJavaTypeParameterDescriptor@30['K'], LazyJavaTypeParameterDescriptor@31['V'] }
-    _supertypes = ArrayList@32[1] { LazyJavaClassifierType@33['Map<K, V>'] }
+LazyJavaClassTypeConstructor@10['AbstractMap'] {
+    parameters = ArrayList@29[2] { LazyJavaTypeParameterDescriptor@30['K'], LazyJavaTypeParameterDescriptor@31['V'] }
+    supertypes = ArrayList@32[1] { LazyJavaClassifierType@33['Map<K, V>'] }
 }
 
-LazyJavaClassTypeConstructor@19['HashMap'] {
-    _parameters = ArrayList@34[2] { LazyJavaTypeParameterDescriptor@35['K'], LazyJavaTypeParameterDescriptor@36['V'] }
-    _supertypes = ArrayList@37[4] { LazyJavaClassifierType@38['AbstractMap<K, V>'], LazyJavaClassifierType@39['Map<K, V>'], LazyJavaClassifierType@40['Cloneable'], ... }
+LazyJavaClassTypeConstructor@24['HashMap'] {
+    parameters = ArrayList@34[2] { LazyJavaTypeParameterDescriptor@35['K'], LazyJavaTypeParameterDescriptor@36['V'] }
+    supertypes = ArrayList@37[4] { LazyJavaClassifierType@38['AbstractMap<K, V>'], LazyJavaClassifierType@39['Map<K, V>'], LazyJavaClassifierType@40['Cloneable'], ... }
 }
 
-LazyJavaClassTypeConstructor@27['Serializable'] {
-    _parameters = ArrayList@41[empty]
-    _supertypes = ArrayList@42[1] { JetTypeImpl@43['Any'] }
+LazyJavaClassTypeConstructor@28['Serializable'] {
+    parameters = ArrayList@41[empty]
+    supertypes = ArrayList@42[1] { JetTypeImpl@43['Any'] }
 }
 
 LazyJavaClassifierType@38['AbstractMap<K, V>'] {
-    _arguments = ArrayList@44[2] { TypeProjectionImpl@45, TypeProjectionImpl@46 }
-    _memberScope = SubstitutingScope@47
-    _typeConstructor = LazyJavaClassTypeConstructor@7['AbstractMap']
-    classifier = JavaClassImpl@48['AbstractMap']
+    arguments = ArrayList@44[2] { TypeProjectionImpl@45, TypeProjectionImpl@46 }
+    classifier = JavaClassImpl@47['AbstractMap']
+    memberScope = SubstitutingScope@48
+    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractMap']
 }
 
 LazyJavaClassifierType@40['Cloneable'] {
-    _arguments = ArrayList@49[empty]
-    _memberScope = DeserializedClassMemberScope@50
-    _typeConstructor = DeserializedClassTypeConstructor@51
-    classifier = JavaClassImpl@52['Cloneable']
+    arguments = ArrayList@49[empty]
+    classifier = JavaClassImpl@50['Cloneable']
+    memberScope = DeserializedClassMemberScope@51
+    typeConstructor = DeserializedClassTypeConstructor@52
 }
 
 LazyJavaClassifierType@53['K'] {
-    _arguments = ArrayList@54[empty]
-    _nullable = 'false': Boolean@55
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-    classifier = JavaTypeParameterImpl@57['K']
+    arguments = ArrayList@54[empty]
+    classifier = JavaTypeParameterImpl@55['K']
+    nullable = 'false': Boolean@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@58['K'] {
-    _arguments = ArrayList@59[empty]
-    _nullable = 'false': Boolean@55
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
-    classifier = JavaTypeParameterImpl@61['K']
+    arguments = ArrayList@59[empty]
+    classifier = JavaTypeParameterImpl@60['K']
+    nullable = 'false': Boolean@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
-LazyJavaClassifierType@62['K'] {
-    _arguments = ArrayList@63[empty]
-    _nullable = 'false': Boolean@55
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-    classifier = JavaTypeParameterImpl@64['K']
+LazyJavaClassifierType@61['K'] {
+    arguments = ArrayList@62[empty]
+    classifier = JavaTypeParameterImpl@63['K']
+    nullable = 'false': Boolean@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
-LazyJavaClassifierType@65['K'] {
-    _arguments = ArrayList@66[empty]
-    _nullable = 'false': Boolean@55
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-    classifier = JavaTypeParameterImpl@67['K']
+LazyJavaClassifierType@64['K'] {
+    arguments = ArrayList@65[empty]
+    classifier = JavaTypeParameterImpl@66['K']
+    nullable = 'false': Boolean@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@68['K'] {
-    _arguments = ArrayList@69[empty]
-    _nullable = 'false': Boolean@55
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
+    arguments = ArrayList@69[empty]
     classifier = JavaTypeParameterImpl@70['K']
+    nullable = 'false': Boolean@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@71['K'] {
-    _arguments = ArrayList@72[empty]
-    _nullable = 'true': Boolean@73
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-    classifier = JavaTypeParameterImpl@67['K']
+    arguments = ArrayList@72[empty]
+    classifier = JavaTypeParameterImpl@60['K']
+    nullable = 'true': Boolean@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@74['K'] {
-    _arguments = ArrayList@75[empty]
-    _nullable = 'true': Boolean@73
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-    classifier = JavaTypeParameterImpl@57['K']
+    arguments = ArrayList@75[empty]
+    classifier = JavaTypeParameterImpl@70['K']
+    nullable = 'true': Boolean@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@76['K'] {
-    _arguments = ArrayList@77[empty]
-    _nullable = 'true': Boolean@73
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
-    classifier = JavaTypeParameterImpl@61['K']
+    arguments = ArrayList@77[empty]
+    classifier = JavaTypeParameterImpl@63['K']
+    nullable = 'true': Boolean@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@78['K'] {
-    _arguments = ArrayList@79[empty]
-    _nullable = 'true': Boolean@73
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-    classifier = JavaTypeParameterImpl@64['K']
+    arguments = ArrayList@79[empty]
+    classifier = JavaTypeParameterImpl@55['K']
+    nullable = 'true': Boolean@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@80['K'] {
-    _arguments = ArrayList@81[empty]
-    _nullable = 'true': Boolean@73
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-    classifier = JavaTypeParameterImpl@70['K']
+    arguments = ArrayList@81[empty]
+    classifier = JavaTypeParameterImpl@66['K']
+    nullable = 'true': Boolean@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@82['Map<? extends K, ? extends V>'] {
-    _arguments = ArrayList@83[2] { TypeProjectionImpl@84, TypeProjectionImpl@85 }
-    _memberScope = SubstitutingScope@86
-    _nullable = 'false': Boolean@55
-    _typeConstructor = DeserializedClassTypeConstructor@87
-    classifier = JavaClassImpl@88['Map']
+    arguments = ArrayList@83[2] { TypeProjectionImpl@84, TypeProjectionImpl@85 }
+    classifier = JavaClassImpl@86['Map']
+    memberScope = SubstitutingScope@87
+    nullable = 'false': Boolean@56
+    typeConstructor = DeserializedClassTypeConstructor@88
 }
 
 LazyJavaClassifierType@89['Map<? extends K, ? extends V>'] {
-    _arguments = ArrayList@90[2] { TypeProjectionImpl@91, TypeProjectionImpl@92 }
-    _memberScope = SubstitutingScope@93
-    _nullable = 'true': Boolean@73
-    _typeConstructor = DeserializedClassTypeConstructor@94
-    classifier = JavaClassImpl@88['Map']
+    arguments = ArrayList@90[2] { TypeProjectionImpl@91, TypeProjectionImpl@92 }
+    classifier = JavaClassImpl@86['Map']
+    memberScope = SubstitutingScope@93
+    nullable = 'true': Boolean@73
+    typeConstructor = DeserializedClassTypeConstructor@94
 }
 
 LazyJavaClassifierType@39['Map<K, V>'] {
-    _arguments = ArrayList@95[2] { TypeProjectionImpl@96, TypeProjectionImpl@97 }
-    _memberScope = SubstitutingScope@98
-    _typeConstructor = DeserializedClassTypeConstructor@87
-    classifier = JavaClassImpl@99['Map']
+    arguments = ArrayList@95[2] { TypeProjectionImpl@96, TypeProjectionImpl@97 }
+    classifier = JavaClassImpl@98['Map']
+    memberScope = SubstitutingScope@99
+    typeConstructor = DeserializedClassTypeConstructor@88
 }
 
 LazyJavaClassifierType@33['Map<K, V>'] {
-    _arguments = ArrayList@100[2] { TypeProjectionImpl@101, TypeProjectionImpl@102 }
-    _memberScope = SubstitutingScope@103
-    _typeConstructor = DeserializedClassTypeConstructor@87
-    classifier = JavaClassImpl@104['Map']
+    arguments = ArrayList@100[2] { TypeProjectionImpl@101, TypeProjectionImpl@102 }
+    classifier = JavaClassImpl@103['Map']
+    memberScope = SubstitutingScope@104
+    typeConstructor = DeserializedClassTypeConstructor@88
 }
 
 LazyJavaClassifierType@105['Object'] {
-    _arguments = ArrayList@106[empty]
-    _memberScope = DeserializedClassMemberScope@107
-    _nullable = 'false': Boolean@55
-    _typeConstructor = DeserializedClassTypeConstructor@108
-    classifier = JavaClassImpl@109['Object']
+    arguments = ArrayList@106[empty]
+    classifier = JavaClassImpl@107['Object']
+    memberScope = DeserializedClassMemberScope@108
+    nullable = 'false': Boolean@56
+    typeConstructor = DeserializedClassTypeConstructor@109
 }
 
 LazyJavaClassifierType@110['Object'] {
-    _arguments = ArrayList@111[empty]
-    _memberScope = DeserializedClassMemberScope@107
-    _nullable = 'false': Boolean@55
-    _typeConstructor = DeserializedClassTypeConstructor@108
+    arguments = ArrayList@111[empty]
     classifier = JavaClassImpl@112['Object']
+    memberScope = DeserializedClassMemberScope@108
+    nullable = 'false': Boolean@56
+    typeConstructor = DeserializedClassTypeConstructor@109
 }
 
 LazyJavaClassifierType@113['Object'] {
-    _arguments = ArrayList@114[empty]
-    _memberScope = DeserializedClassMemberScope@107
-    _nullable = 'true': Boolean@73
-    _typeConstructor = DeserializedClassTypeConstructor@108
+    arguments = ArrayList@114[empty]
     classifier = JavaClassImpl@112['Object']
+    memberScope = DeserializedClassMemberScope@108
+    nullable = 'true': Boolean@73
+    typeConstructor = DeserializedClassTypeConstructor@109
 }
 
 LazyJavaClassifierType@115['Object'] {
-    _arguments = ArrayList@116[empty]
-    _memberScope = DeserializedClassMemberScope@107
-    _nullable = 'true': Boolean@73
-    _typeConstructor = DeserializedClassTypeConstructor@108
-    classifier = JavaClassImpl@109['Object']
+    arguments = ArrayList@116[empty]
+    classifier = JavaClassImpl@107['Object']
+    memberScope = DeserializedClassMemberScope@108
+    nullable = 'true': Boolean@73
+    typeConstructor = DeserializedClassTypeConstructor@109
 }
 
 LazyJavaClassifierType@117['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@108
     classifier = JavaClassImpl@118['Object']
+    typeConstructor = DeserializedClassTypeConstructor@109
 }
 
 LazyJavaClassifierType@119['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@108
     classifier = JavaClassImpl@120['Object']
+    typeConstructor = DeserializedClassTypeConstructor@109
 }
 
 LazyJavaClassifierType@121['Serializable'] {
-    _arguments = ArrayList@122[empty]
-    _memberScope = LazyJavaClassMemberScope@26
-    _typeConstructor = LazyJavaClassTypeConstructor@27['Serializable']
+    arguments = ArrayList@122[empty]
     classifier = JavaClassImpl@123['Serializable']
+    memberScope = LazyJavaClassMemberScope@26
+    typeConstructor = LazyJavaClassTypeConstructor@28['Serializable']
 }
 
 LazyJavaClassifierType@124['V'] {
-    _arguments = ArrayList@125[empty]
-    _nullable = 'false': Boolean@55
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-    classifier = JavaTypeParameterImpl@127['V']
+    arguments = ArrayList@125[empty]
+    classifier = JavaTypeParameterImpl@126['V']
+    nullable = 'false': Boolean@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@128['V'] {
-    _arguments = ArrayList@129[empty]
-    _nullable = 'false': Boolean@55
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-    classifier = JavaTypeParameterImpl@131['V']
+    arguments = ArrayList@129[empty]
+    classifier = JavaTypeParameterImpl@130['V']
+    nullable = 'false': Boolean@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
 LazyJavaClassifierType@132['V'] {
-    _arguments = ArrayList@133[empty]
-    _nullable = 'false': Boolean@55
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    arguments = ArrayList@133[empty]
     classifier = JavaTypeParameterImpl@134['V']
+    nullable = 'false': Boolean@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@135['V'] {
-    _arguments = ArrayList@136[empty]
-    _nullable = 'false': Boolean@55
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    arguments = ArrayList@136[empty]
     classifier = JavaTypeParameterImpl@137['V']
+    nullable = 'false': Boolean@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
 LazyJavaClassifierType@138['V'] {
-    _arguments = ArrayList@139[empty]
-    _nullable = 'false': Boolean@55
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    arguments = ArrayList@139[empty]
     classifier = JavaTypeParameterImpl@140['V']
+    nullable = 'false': Boolean@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@141['V'] {
-    _arguments = ArrayList@142[empty]
-    _nullable = 'false': Boolean@55
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    arguments = ArrayList@142[empty]
     classifier = JavaTypeParameterImpl@143['V']
+    nullable = 'false': Boolean@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@144['V'] {
-    _arguments = ArrayList@145[empty]
-    _nullable = 'false': Boolean@55
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    arguments = ArrayList@145[empty]
     classifier = JavaTypeParameterImpl@146['V']
+    nullable = 'false': Boolean@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@147['V'] {
-    _arguments = ArrayList@148[empty]
-    _nullable = 'true': Boolean@73
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-    classifier = JavaTypeParameterImpl@137['V']
+    arguments = ArrayList@148[empty]
+    classifier = JavaTypeParameterImpl@146['V']
+    nullable = 'true': Boolean@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@149['V'] {
-    _arguments = ArrayList@150[empty]
-    _nullable = 'true': Boolean@73
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-    classifier = JavaTypeParameterImpl@146['V']
+    arguments = ArrayList@150[empty]
+    classifier = JavaTypeParameterImpl@143['V']
+    nullable = 'true': Boolean@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@151['V'] {
-    _arguments = ArrayList@152[empty]
-    _nullable = 'true': Boolean@73
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-    classifier = JavaTypeParameterImpl@131['V']
+    arguments = ArrayList@152[empty]
+    classifier = JavaTypeParameterImpl@126['V']
+    nullable = 'true': Boolean@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@153['V'] {
-    _arguments = ArrayList@154[empty]
-    _nullable = 'true': Boolean@73
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-    classifier = JavaTypeParameterImpl@127['V']
+    arguments = ArrayList@154[empty]
+    classifier = JavaTypeParameterImpl@140['V']
+    nullable = 'true': Boolean@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@155['V'] {
-    _arguments = ArrayList@156[empty]
-    _nullable = 'true': Boolean@73
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-    classifier = JavaTypeParameterImpl@143['V']
+    arguments = ArrayList@156[empty]
+    classifier = JavaTypeParameterImpl@137['V']
+    nullable = 'true': Boolean@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
 LazyJavaClassifierType@157['V'] {
-    _arguments = ArrayList@158[empty]
-    _nullable = 'true': Boolean@73
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-    classifier = JavaTypeParameterImpl@140['V']
+    arguments = ArrayList@158[empty]
+    classifier = JavaTypeParameterImpl@130['V']
+    nullable = 'true': Boolean@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
 LazyJavaClassifierType@159['V'] {
-    _arguments = ArrayList@160[empty]
-    _nullable = 'true': Boolean@73
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    arguments = ArrayList@160[empty]
     classifier = JavaTypeParameterImpl@134['V']
+    nullable = 'true': Boolean@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaPackageFragmentProvider@161 {
-    _packageFragments('<root>': FqName@162) = LazyJavaPackageFragment@163['<root>']
-    _packageFragments('Array': FqName@164) = null
-    _packageFragments('String': FqName@165) = null
-    _packageFragments('checkFiles': FqName@166) = null
-    _packageFragments('checkFiles.Array': FqName@167) = null
-    _packageFragments('checkFiles.String': FqName@168) = null
-    _packageFragments('java': FqName@169) = LazyJavaPackageFragment@170['java']
-    _packageFragments('java.io': FqName@171) = LazyJavaPackageFragment@172['io']
-    _packageFragments('java.lang': FqName@173) = LazyJavaPackageFragment@174['lang']
-    _packageFragments('java.lang.Array': FqName@175) = null
-    _packageFragments('java.lang.String': FqName@176) = null
-    _packageFragments('java.util': FqName@177) = LazyJavaPackageFragment@178['util']
-    _packageFragments('java.util.HashMap': FqName@179) = null
-    _packageFragments('kotlin': FqName@180) = null
-    _packageFragments('kotlin.Array': FqName@181) = null
-    _packageFragments('kotlin.String': FqName@182) = null
-    _packageFragments('kotlin.io': FqName@183) = null
-    _packageFragments('kotlin.jvm': FqName@184) = null
-    topLevelClasses(JavaClassImpl@48['AbstractMap']) = LazyJavaClassDescriptor@0['AbstractMap']
+    packageFragments('<root>': FqName@162) = LazyJavaPackageFragment@163['<root>']
+    packageFragments('Array': FqName@164) = null
+    packageFragments('String': FqName@165) = null
+    packageFragments('checkFiles': FqName@166) = null
+    packageFragments('checkFiles.Array': FqName@167) = null
+    packageFragments('checkFiles.String': FqName@168) = null
+    packageFragments('java': FqName@169) = LazyJavaPackageFragment@170['java']
+    packageFragments('java.io': FqName@171) = LazyJavaPackageFragment@172['io']
+    packageFragments('java.lang': FqName@173) = LazyJavaPackageFragment@174['lang']
+    packageFragments('java.lang.Array': FqName@175) = null
+    packageFragments('java.lang.String': FqName@176) = null
+    packageFragments('java.util': FqName@177) = LazyJavaPackageFragment@178['util']
+    packageFragments('java.util.HashMap': FqName@179) = null
+    packageFragments('kotlin': FqName@180) = null
+    packageFragments('kotlin.Array': FqName@181) = null
+    packageFragments('kotlin.String': FqName@182) = null
+    packageFragments('kotlin.io': FqName@183) = null
+    packageFragments('kotlin.jvm': FqName@184) = null
+    topLevelClasses(JavaClassImpl@47['AbstractMap']) = LazyJavaClassDescriptor@0['AbstractMap']
     topLevelClasses(JavaClassImpl@185['HashMap']) = LazyJavaClassDescriptor@11['HashMap']
     topLevelClasses(JavaClassImpl@123['Serializable']) = LazyJavaClassDescriptor@25['Serializable']
 }
 
 LazyJavaPackageFragment@170['java'] {
-    _functions('lang': Name@186) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@187
-    _functions('util': Name@188) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@187
-    classes('lang': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@187
-    classes('util': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@187
-    deserializedPackageScope = Empty@191 // through LazyPackageFragmentScopeForJavaPackage@187
+    classes('lang': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@187
+    classes('util': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@187
+    deserializedPackageScope = Empty@189 // through LazyPackageFragmentScopeForJavaPackage@187
+    functions('lang': Name@190) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@187
+    functions('util': Name@191) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@187
     memberIndex = computeMemberIndex$1@192 // through LazyPackageFragmentScopeForJavaPackage@187
 }
 
 LazyJavaPackageFragment@174['lang'] {
-    _functions('HashMap': Name@193) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@194
-    _functions('get': Name@5) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@194
     classes('HashMap': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    classes('get': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    deserializedPackageScope = Empty@191 // through LazyPackageFragmentScopeForJavaPackage@194
+    classes('get': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@194
+    deserializedPackageScope = Empty@189 // through LazyPackageFragmentScopeForJavaPackage@194
+    functions('HashMap': Name@193) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@194
+    functions('get': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@194
     memberIndex = computeMemberIndex$1@195 // through LazyPackageFragmentScopeForJavaPackage@194
 }
 
 LazyJavaPackageFragment@178['util'] {
-    _functions('HashMap': Name@196) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('HashMap': Name@198) = LazyJavaClassDescriptor@11['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@197
-    deserializedPackageScope = Empty@191 // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('HashMap': Name@196) = LazyJavaClassDescriptor@11['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@197
+    deserializedPackageScope = Empty@189 // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('HashMap': Name@198) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@197
     memberIndex = computeMemberIndex$1@199 // through LazyPackageFragmentScopeForJavaPackage@197
 }
 
 LazyJavaTypeParameterDescriptor@35['K'] {
     defaultType = JetTypeImpl@200['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
     upperBounds = LinkedHashSet@201[1] { NullableType@202 }
 }
 
 LazyJavaTypeParameterDescriptor@30['K'] {
     defaultType = JetTypeImpl@203['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaTypeParameterDescriptor@31['V'] {
     defaultType = JetTypeImpl@204['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
     upperBounds = LinkedHashSet@205[1] { NullableType@206 }
 }
 
 LazyJavaTypeParameterDescriptor@36['V'] {
     defaultType = JetTypeImpl@207['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
     upperBounds = LinkedHashSet@208[1] { NullableType@209 }
 }
 
@@ -387,9 +387,9 @@ LazyJavaTypeParameterResolver@213 {
 }
 
 LazyJavaTypeParameterResolver@216 {
-    resolve(JavaTypeParameterImpl@143['V']) = null
+    resolve(JavaTypeParameterImpl@126['V']) = null
 }
 
 LazyJavaTypeParameterResolver@217 {
-    resolve(JavaTypeParameterImpl@127['V']) = null
+    resolve(JavaTypeParameterImpl@130['V']) = null
 }

compiler/testData/diagnostics/tests/regressions/ea43298.lazy.log

@@ -1,23 +1,23 @@
 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@2['<root>'] {
-    _functions('A': Name@11) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@13
-    classes('A': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@13
-    deserializedPackageScope = Empty@14 // through LazyPackageFragmentScopeForJavaPackage@13
-    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@13
+    classes('A': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
+    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
+    functions('A': Name@11) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@12
+    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@12
 }
 
 LazyJavaPackageFragment@5['java'] {
-    _functions('lang': Name@16) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@14 // through LazyPackageFragmentScopeForJavaPackage@17
+    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('lang': Name@18) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@17
     memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@17
 }

compiler/testData/diagnostics/tests/regressions/ea53340.lazy.log

@@ -1,50 +1,50 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('A': FqName@3) = null
-    _packageFragments('Array': FqName@4) = null
-    _packageFragments('Function0': FqName@5) = null
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': 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.Function0': FqName@13) = null
-    _packageFragments('java.lang.Int': FqName@14) = null
-    _packageFragments('java.lang.String': FqName@15) = null
-    _packageFragments('kotlin': FqName@16) = null
-    _packageFragments('kotlin.Array': FqName@17) = null
-    _packageFragments('kotlin.Function0': FqName@18) = null
-    _packageFragments('kotlin.Int': FqName@19) = null
-    _packageFragments('kotlin.String': FqName@20) = null
-    _packageFragments('kotlin.io': FqName@21) = null
-    _packageFragments('kotlin.jvm': FqName@22) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('A': FqName@3) = null
+    packageFragments('Array': FqName@4) = null
+    packageFragments('Function0': FqName@5) = null
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': 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.Function0': FqName@13) = null
+    packageFragments('java.lang.Int': FqName@14) = null
+    packageFragments('java.lang.String': FqName@15) = null
+    packageFragments('kotlin': FqName@16) = null
+    packageFragments('kotlin.Array': FqName@17) = null
+    packageFragments('kotlin.Function0': FqName@18) = null
+    packageFragments('kotlin.Int': FqName@19) = null
+    packageFragments('kotlin.String': FqName@20) = null
+    packageFragments('kotlin.io': FqName@21) = null
+    packageFragments('kotlin.jvm': FqName@22) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    _functions('A': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    _functions('invoke': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('A': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Array': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Function0': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('A': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Array': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Function0': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('invoke': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('A': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('invoke': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@33) = EmptyList@24[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@11['lang'] {
-    _functions('A': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('invoke': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     classes('A': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('invoke': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('A': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('invoke': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
 }

compiler/testData/diagnostics/tests/regressions/kt127.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt128.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt1489_1728.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt1647.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt1736.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt174.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt201.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt235.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt2376.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt251.lazy.log

@@ -6,22 +6,22 @@ DescriptorResolver@0 {
 }
 
 LazyJavaPackageFragmentProvider@4 {
-    _packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    _packageFragments('A': FqName@7) = null
-    _packageFragments('Any': FqName@8) = null
-    _packageFragments('Int': 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.Any': 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.Int': FqName@20) = null
-    _packageFragments('kotlin.String': FqName@21) = null
-    _packageFragments('kotlin.io': FqName@22) = null
-    _packageFragments('kotlin.jvm': FqName@23) = null
+    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
+    packageFragments('A': FqName@7) = null
+    packageFragments('Any': FqName@8) = null
+    packageFragments('Int': 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.Any': 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.Int': FqName@20) = null
+    packageFragments('kotlin.String': FqName@21) = null
+    packageFragments('kotlin.io': FqName@22) = null
+    packageFragments('kotlin.jvm': FqName@23) = null
 }
 
 LazyJavaPackageFragment@6['<root>'] {
@@ -36,10 +36,10 @@ LazyJavaPackageFragment@6['<root>'] {
 }
 
 LazyJavaPackageFragment@12['java'] {
-    _functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@14['lang'] {

compiler/testData/diagnostics/tests/regressions/kt258.lazy.log

@@ -1,349 +1,349 @@
 LazyJavaClassDescriptor@0['AbstractMap'] {
-    _functions('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    _properties('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    _typeConstructor = LazyJavaClassTypeConstructor@4['AbstractMap']
-    memberIndex = computeMemberIndex$1@5 // through LazyJavaClassMemberScope@3
+    functions('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
+    memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
+    properties('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
+    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractMap']
 }
 
 LazyJavaClassDescriptor@6['HashMap'] {
-    _constructors = ArrayList@7[4] { JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], JavaConstructorDescriptor@10['<init>'], ... } // through LazyJavaClassMemberScope@11
-    _functionTypeForSamInterface = null
-    _functions('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
-    _properties('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
-    _typeConstructor = LazyJavaClassTypeConstructor@12['HashMap']
-    defaultType = JetTypeImpl@13['HashMap<2>']
-    enumEntryIndex = LinkedHashMap@14 // through LazyJavaClassMemberScope@11
-    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@11
-    nestedClassIndex = LinkedHashMap@16 // through LazyJavaClassMemberScope@11
+    constructors = ArrayList@7[4] { JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], JavaConstructorDescriptor@10['<init>'], ... } // through LazyJavaClassMemberScope@11
+    defaultType = JetTypeImpl@12['HashMap<2>']
+    enumEntryIndex = LinkedHashMap@13 // through LazyJavaClassMemberScope@11
+    functionTypeForSamInterface = null
+    functions('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
+    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@11
+    nestedClassIndex = LinkedHashMap@15 // through LazyJavaClassMemberScope@11
     nestedClasses('set': Name@1) = null // through LazyJavaClassMemberScope@11
+    properties('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@16['HashMap']
 }
 
 LazyJavaClassDescriptor@17['Serializable'] {
-    _functions('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
-    _properties('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
-    _typeConstructor = LazyJavaClassTypeConstructor@19['Serializable']
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@18
+    functions('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
+    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
+    properties('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
+    typeConstructor = LazyJavaClassTypeConstructor@20['Serializable']
 }
 
-LazyJavaClassTypeConstructor@4['AbstractMap'] {
-    _parameters = ArrayList@21[2] { LazyJavaTypeParameterDescriptor@22['K'], LazyJavaTypeParameterDescriptor@23['V'] }
-    _supertypes = ArrayList@24[1] { LazyJavaClassifierType@25['Map<K, V>'] }
+LazyJavaClassTypeConstructor@5['AbstractMap'] {
+    parameters = ArrayList@21[2] { LazyJavaTypeParameterDescriptor@22['K'], LazyJavaTypeParameterDescriptor@23['V'] }
+    supertypes = ArrayList@24[1] { LazyJavaClassifierType@25['Map<K, V>'] }
 }
 
-LazyJavaClassTypeConstructor@12['HashMap'] {
-    _parameters = ArrayList@26[2] { LazyJavaTypeParameterDescriptor@27['K'], LazyJavaTypeParameterDescriptor@28['V'] }
-    _supertypes = ArrayList@29[4] { LazyJavaClassifierType@30['AbstractMap<K, V>'], LazyJavaClassifierType@31['Map<K, V>'], LazyJavaClassifierType@32['Cloneable'], ... }
+LazyJavaClassTypeConstructor@16['HashMap'] {
+    parameters = ArrayList@26[2] { LazyJavaTypeParameterDescriptor@27['K'], LazyJavaTypeParameterDescriptor@28['V'] }
+    supertypes = ArrayList@29[4] { LazyJavaClassifierType@30['AbstractMap<K, V>'], LazyJavaClassifierType@31['Map<K, V>'], LazyJavaClassifierType@32['Cloneable'], ... }
 }
 
-LazyJavaClassTypeConstructor@19['Serializable'] {
-    _parameters = ArrayList@33[empty]
-    _supertypes = ArrayList@34[1] { JetTypeImpl@35['Any'] }
+LazyJavaClassTypeConstructor@20['Serializable'] {
+    parameters = ArrayList@33[empty]
+    supertypes = ArrayList@34[1] { JetTypeImpl@35['Any'] }
 }
 
 LazyJavaClassifierType@30['AbstractMap<K, V>'] {
-    _arguments = ArrayList@36[2] { TypeProjectionImpl@37, TypeProjectionImpl@38 }
-    _memberScope = SubstitutingScope@39
-    _typeConstructor = LazyJavaClassTypeConstructor@4['AbstractMap']
-    classifier = JavaClassImpl@40['AbstractMap']
+    arguments = ArrayList@36[2] { TypeProjectionImpl@37, TypeProjectionImpl@38 }
+    classifier = JavaClassImpl@39['AbstractMap']
+    memberScope = SubstitutingScope@40
+    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractMap']
 }
 
 LazyJavaClassifierType@32['Cloneable'] {
-    _arguments = ArrayList@41[empty]
-    _memberScope = DeserializedClassMemberScope@42
-    _typeConstructor = DeserializedClassTypeConstructor@43
-    classifier = JavaClassImpl@44['Cloneable']
+    arguments = ArrayList@41[empty]
+    classifier = JavaClassImpl@42['Cloneable']
+    memberScope = DeserializedClassMemberScope@43
+    typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaClassifierType@45['K'] {
-    _arguments = ArrayList@46[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
-    classifier = JavaTypeParameterImpl@49['K']
+    arguments = ArrayList@46[empty]
+    classifier = JavaTypeParameterImpl@47['K']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaClassifierType@50['K'] {
-    _arguments = ArrayList@51[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
+    arguments = ArrayList@51[empty]
     classifier = JavaTypeParameterImpl@52['K']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
-LazyJavaClassifierType@53['K'] {
-    _arguments = ArrayList@54[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
-    classifier = JavaTypeParameterImpl@55['K']
+LazyJavaClassifierType@54['K'] {
+    arguments = ArrayList@55[empty]
+    classifier = JavaTypeParameterImpl@56['K']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
-LazyJavaClassifierType@56['K'] {
-    _arguments = ArrayList@57[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
+LazyJavaClassifierType@57['K'] {
+    arguments = ArrayList@58[empty]
     classifier = JavaTypeParameterImpl@59['K']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaClassifierType@60['K'] {
-    _arguments = ArrayList@61[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
+    arguments = ArrayList@61[empty]
     classifier = JavaTypeParameterImpl@62['K']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaClassifierType@63['K'] {
-    _arguments = ArrayList@64[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
+    arguments = ArrayList@64[empty]
     classifier = JavaTypeParameterImpl@62['K']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaClassifierType@66['K'] {
-    _arguments = ArrayList@67[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
-    classifier = JavaTypeParameterImpl@55['K']
+    arguments = ArrayList@67[empty]
+    classifier = JavaTypeParameterImpl@56['K']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaClassifierType@68['K'] {
-    _arguments = ArrayList@69[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
-    classifier = JavaTypeParameterImpl@49['K']
+    arguments = ArrayList@69[empty]
+    classifier = JavaTypeParameterImpl@59['K']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaClassifierType@70['K'] {
-    _arguments = ArrayList@71[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
+    arguments = ArrayList@71[empty]
     classifier = JavaTypeParameterImpl@52['K']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@72['K'] {
-    _arguments = ArrayList@73[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
-    classifier = JavaTypeParameterImpl@59['K']
+    arguments = ArrayList@73[empty]
+    classifier = JavaTypeParameterImpl@47['K']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaClassifierType@74['Map<? extends K, ? extends V>'] {
-    _arguments = ArrayList@75[2] { TypeProjectionImpl@76, TypeProjectionImpl@77 }
-    _memberScope = SubstitutingScope@78
-    _nullable = 'false': Boolean@47
-    _typeConstructor = DeserializedClassTypeConstructor@79
-    classifier = JavaClassImpl@80['Map']
+    arguments = ArrayList@75[2] { TypeProjectionImpl@76, TypeProjectionImpl@77 }
+    classifier = JavaClassImpl@78['Map']
+    memberScope = SubstitutingScope@79
+    nullable = 'false': Boolean@48
+    typeConstructor = DeserializedClassTypeConstructor@80
 }
 
 LazyJavaClassifierType@81['Map<? extends K, ? extends V>'] {
-    _arguments = ArrayList@82[2] { TypeProjectionImpl@83, TypeProjectionImpl@84 }
-    _memberScope = SubstitutingScope@85
-    _nullable = 'true': Boolean@65
-    _typeConstructor = DeserializedClassTypeConstructor@86
-    classifier = JavaClassImpl@80['Map']
+    arguments = ArrayList@82[2] { TypeProjectionImpl@83, TypeProjectionImpl@84 }
+    classifier = JavaClassImpl@78['Map']
+    memberScope = SubstitutingScope@85
+    nullable = 'true': Boolean@65
+    typeConstructor = DeserializedClassTypeConstructor@86
 }
 
 LazyJavaClassifierType@25['Map<K, V>'] {
-    _arguments = ArrayList@87[2] { TypeProjectionImpl@88, TypeProjectionImpl@89 }
-    _memberScope = SubstitutingScope@90
-    _nullable = 'false': Boolean@47
-    _typeConstructor = DeserializedClassTypeConstructor@79
-    classifier = JavaClassImpl@91['Map']
+    arguments = ArrayList@87[2] { TypeProjectionImpl@88, TypeProjectionImpl@89 }
+    classifier = JavaClassImpl@90['Map']
+    memberScope = SubstitutingScope@91
+    nullable = 'false': Boolean@48
+    typeConstructor = DeserializedClassTypeConstructor@80
 }
 
 LazyJavaClassifierType@31['Map<K, V>'] {
-    _arguments = ArrayList@92[2] { TypeProjectionImpl@93, TypeProjectionImpl@94 }
-    _memberScope = SubstitutingScope@95
-    _typeConstructor = DeserializedClassTypeConstructor@79
-    classifier = JavaClassImpl@96['Map']
+    arguments = ArrayList@92[2] { TypeProjectionImpl@93, TypeProjectionImpl@94 }
+    classifier = JavaClassImpl@95['Map']
+    memberScope = SubstitutingScope@96
+    typeConstructor = DeserializedClassTypeConstructor@80
 }
 
 LazyJavaClassifierType@97['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@98
-    classifier = JavaClassImpl@99['Object']
+    classifier = JavaClassImpl@98['Object']
+    typeConstructor = DeserializedClassTypeConstructor@99
 }
 
 LazyJavaClassifierType@100['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@98
     classifier = JavaClassImpl@101['Object']
+    typeConstructor = DeserializedClassTypeConstructor@99
 }
 
 LazyJavaClassifierType@102['Serializable'] {
-    _arguments = ArrayList@103[empty]
-    _memberScope = LazyJavaClassMemberScope@18
-    _typeConstructor = LazyJavaClassTypeConstructor@19['Serializable']
+    arguments = ArrayList@103[empty]
     classifier = JavaClassImpl@104['Serializable']
+    memberScope = LazyJavaClassMemberScope@18
+    typeConstructor = LazyJavaClassTypeConstructor@20['Serializable']
 }
 
 LazyJavaClassifierType@105['V'] {
-    _arguments = ArrayList@106[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-    classifier = JavaTypeParameterImpl@108['V']
+    arguments = ArrayList@106[empty]
+    classifier = JavaTypeParameterImpl@107['V']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@109['V'] {
-    _arguments = ArrayList@110[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
-    classifier = JavaTypeParameterImpl@112['V']
+    arguments = ArrayList@110[empty]
+    classifier = JavaTypeParameterImpl@111['V']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
-LazyJavaClassifierType@113['V'] {
-    _arguments = ArrayList@114[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
-    classifier = JavaTypeParameterImpl@115['V']
+LazyJavaClassifierType@112['V'] {
+    arguments = ArrayList@113[empty]
+    classifier = JavaTypeParameterImpl@114['V']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
-LazyJavaClassifierType@116['V'] {
-    _arguments = ArrayList@117[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
-    classifier = JavaTypeParameterImpl@118['V']
+LazyJavaClassifierType@115['V'] {
+    arguments = ArrayList@116[empty]
+    classifier = JavaTypeParameterImpl@117['V']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
-LazyJavaClassifierType@119['V'] {
-    _arguments = ArrayList@120[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
-    classifier = JavaTypeParameterImpl@121['V']
+LazyJavaClassifierType@118['V'] {
+    arguments = ArrayList@119[empty]
+    classifier = JavaTypeParameterImpl@120['V']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@121
 }
 
 LazyJavaClassifierType@122['V'] {
-    _arguments = ArrayList@123[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
-    classifier = JavaTypeParameterImpl@118['V']
+    arguments = ArrayList@123[empty]
+    classifier = JavaTypeParameterImpl@111['V']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@124['V'] {
-    _arguments = ArrayList@125[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
-    classifier = JavaTypeParameterImpl@112['V']
+    arguments = ArrayList@125[empty]
+    classifier = JavaTypeParameterImpl@120['V']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@121
 }
 
 LazyJavaClassifierType@126['V'] {
-    _arguments = ArrayList@127[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-    classifier = JavaTypeParameterImpl@108['V']
+    arguments = ArrayList@127[empty]
+    classifier = JavaTypeParameterImpl@117['V']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@128['V'] {
-    _arguments = ArrayList@129[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
-    classifier = JavaTypeParameterImpl@115['V']
+    arguments = ArrayList@129[empty]
+    classifier = JavaTypeParameterImpl@114['V']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@130['V'] {
-    _arguments = ArrayList@131[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
-    classifier = JavaTypeParameterImpl@121['V']
+    arguments = ArrayList@131[empty]
+    classifier = JavaTypeParameterImpl@107['V']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaPackageFragmentProvider@132 {
-    _packageFragments('<root>': FqName@133) = LazyJavaPackageFragment@134['<root>']
-    _packageFragments('HashMap': FqName@135) = null
-    _packageFragments('K': FqName@136) = null
-    _packageFragments('MutableMap': FqName@137) = null
-    _packageFragments('String': FqName@138) = null
-    _packageFragments('V': FqName@139) = null
-    _packageFragments('java': FqName@140) = LazyJavaPackageFragment@141['java']
-    _packageFragments('java.io': FqName@142) = LazyJavaPackageFragment@143['io']
-    _packageFragments('java.lang': FqName@144) = LazyJavaPackageFragment@145['lang']
-    _packageFragments('java.lang.HashMap': FqName@146) = null
-    _packageFragments('java.lang.K': FqName@147) = null
-    _packageFragments('java.lang.MutableMap': FqName@148) = null
-    _packageFragments('java.lang.String': FqName@149) = null
-    _packageFragments('java.lang.V': FqName@150) = null
-    _packageFragments('java.util': FqName@151) = LazyJavaPackageFragment@152['util']
-    _packageFragments('java.util.HashMap': FqName@153) = null
-    _packageFragments('java.util.K': FqName@154) = null
-    _packageFragments('java.util.MutableMap': FqName@155) = null
-    _packageFragments('java.util.String': FqName@156) = null
-    _packageFragments('java.util.V': FqName@157) = null
-    _packageFragments('kotlin': FqName@158) = null
-    _packageFragments('kotlin.HashMap': FqName@159) = null
-    _packageFragments('kotlin.K': FqName@160) = null
-    _packageFragments('kotlin.MutableMap': FqName@161) = null
-    _packageFragments('kotlin.String': FqName@162) = null
-    _packageFragments('kotlin.V': FqName@163) = null
-    _packageFragments('kotlin.io': FqName@164) = null
-    _packageFragments('kotlin.jvm': FqName@165) = null
-    topLevelClasses(JavaClassImpl@40['AbstractMap']) = LazyJavaClassDescriptor@0['AbstractMap']
+    packageFragments('<root>': FqName@133) = LazyJavaPackageFragment@134['<root>']
+    packageFragments('HashMap': FqName@135) = null
+    packageFragments('K': FqName@136) = null
+    packageFragments('MutableMap': FqName@137) = null
+    packageFragments('String': FqName@138) = null
+    packageFragments('V': FqName@139) = null
+    packageFragments('java': FqName@140) = LazyJavaPackageFragment@141['java']
+    packageFragments('java.io': FqName@142) = LazyJavaPackageFragment@143['io']
+    packageFragments('java.lang': FqName@144) = LazyJavaPackageFragment@145['lang']
+    packageFragments('java.lang.HashMap': FqName@146) = null
+    packageFragments('java.lang.K': FqName@147) = null
+    packageFragments('java.lang.MutableMap': FqName@148) = null
+    packageFragments('java.lang.String': FqName@149) = null
+    packageFragments('java.lang.V': FqName@150) = null
+    packageFragments('java.util': FqName@151) = LazyJavaPackageFragment@152['util']
+    packageFragments('java.util.HashMap': FqName@153) = null
+    packageFragments('java.util.K': FqName@154) = null
+    packageFragments('java.util.MutableMap': FqName@155) = null
+    packageFragments('java.util.String': FqName@156) = null
+    packageFragments('java.util.V': FqName@157) = null
+    packageFragments('kotlin': FqName@158) = null
+    packageFragments('kotlin.HashMap': FqName@159) = null
+    packageFragments('kotlin.K': FqName@160) = null
+    packageFragments('kotlin.MutableMap': FqName@161) = null
+    packageFragments('kotlin.String': FqName@162) = null
+    packageFragments('kotlin.V': FqName@163) = null
+    packageFragments('kotlin.io': FqName@164) = null
+    packageFragments('kotlin.jvm': FqName@165) = null
+    topLevelClasses(JavaClassImpl@39['AbstractMap']) = LazyJavaClassDescriptor@0['AbstractMap']
     topLevelClasses(JavaClassImpl@166['HashMap']) = LazyJavaClassDescriptor@6['HashMap']
     topLevelClasses(JavaClassImpl@104['Serializable']) = LazyJavaClassDescriptor@17['Serializable']
 }
 
 LazyJavaPackageFragment@134['<root>'] {
-    _functions('HashMap': Name@167) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    _functions('java': Name@169) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    _functions('set': Name@1) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('HashMap': Name@170) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('MutableMap': Name@171) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('String': Name@172) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('java': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@168
+    classes('HashMap': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@168
+    classes('MutableMap': Name@169) = null // through LazyPackageFragmentScopeForJavaPackage@168
+    classes('String': Name@170) = null // through LazyPackageFragmentScopeForJavaPackage@168
+    classes('java': Name@171) = null // through LazyPackageFragmentScopeForJavaPackage@168
     classes('set': Name@1) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    deserializedPackageScope = Empty@174 // through LazyPackageFragmentScopeForJavaPackage@168
+    deserializedPackageScope = Empty@172 // through LazyPackageFragmentScopeForJavaPackage@168
+    functions('HashMap': Name@173) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@168
+    functions('java': Name@174) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@168
+    functions('set': Name@1) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@168
     memberIndex = computeMemberIndex$1@175 // through LazyPackageFragmentScopeForJavaPackage@168
 }
 
 LazyJavaPackageFragment@141['java'] {
-    _functions('lang': Name@176) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@177
-    _functions('util': Name@178) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@177
-    classes('lang': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@177
-    classes('util': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@177
-    deserializedPackageScope = Empty@174 // through LazyPackageFragmentScopeForJavaPackage@177
+    classes('lang': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@177
+    classes('util': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@177
+    deserializedPackageScope = Empty@172 // through LazyPackageFragmentScopeForJavaPackage@177
+    functions('lang': Name@179) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@177
+    functions('util': Name@180) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@177
     memberIndex = computeMemberIndex$1@181 // through LazyPackageFragmentScopeForJavaPackage@177
 }
 
 LazyJavaPackageFragment@145['lang'] {
-    _functions('HashMap': Name@167) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@182
-    _functions('set': Name@1) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@182
-    classes('HashMap': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@182
+    classes('HashMap': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@182
     classes('set': Name@1) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    deserializedPackageScope = Empty@174 // through LazyPackageFragmentScopeForJavaPackage@182
+    deserializedPackageScope = Empty@172 // through LazyPackageFragmentScopeForJavaPackage@182
+    functions('HashMap': Name@173) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@182
+    functions('set': Name@1) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@182
     memberIndex = computeMemberIndex$1@183 // through LazyPackageFragmentScopeForJavaPackage@182
 }
 
 LazyJavaPackageFragment@152['util'] {
-    _functions('HashMap': Name@167) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    _functions('set': Name@1) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('HashMap': Name@170) = LazyJavaClassDescriptor@6['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('MutableMap': Name@171) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('String': Name@172) = null // through LazyPackageFragmentScopeForJavaPackage@184
+    classes('HashMap': Name@167) = LazyJavaClassDescriptor@6['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@184
+    classes('MutableMap': Name@169) = null // through LazyPackageFragmentScopeForJavaPackage@184
+    classes('String': Name@170) = null // through LazyPackageFragmentScopeForJavaPackage@184
     classes('set': Name@1) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    deserializedPackageScope = Empty@174 // through LazyPackageFragmentScopeForJavaPackage@184
+    deserializedPackageScope = Empty@172 // through LazyPackageFragmentScopeForJavaPackage@184
+    functions('HashMap': Name@173) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@184
+    functions('set': Name@1) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@184
     memberIndex = computeMemberIndex$1@185 // through LazyPackageFragmentScopeForJavaPackage@184
 }
 
 LazyJavaTypeParameterDescriptor@27['K'] {
     defaultType = JetTypeImpl@186['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
     upperBounds = LinkedHashSet@187[1] { NullableType@188 }
 }
 
 LazyJavaTypeParameterDescriptor@22['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaTypeParameterDescriptor@28['V'] {
     defaultType = JetTypeImpl@189['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
     upperBounds = LinkedHashSet@190[1] { NullableType@191 }
 }
 
 LazyJavaTypeParameterDescriptor@23['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@121
 }
 
 LazyJavaTypeParameterResolver@192 {
-    resolve(JavaTypeParameterImpl@193['K']) = LazyJavaTypeParameterDescriptor@27['K']
-    resolve(JavaTypeParameterImpl@194['V']) = LazyJavaTypeParameterDescriptor@28['V']
+    resolve(JavaTypeParameterImpl@193['K']) = LazyJavaTypeParameterDescriptor@22['K']
+    resolve(JavaTypeParameterImpl@194['V']) = LazyJavaTypeParameterDescriptor@23['V']
 }
 
 LazyJavaTypeParameterResolver@195 {
-    resolve(JavaTypeParameterImpl@196['K']) = LazyJavaTypeParameterDescriptor@22['K']
-    resolve(JavaTypeParameterImpl@197['V']) = LazyJavaTypeParameterDescriptor@23['V']
+    resolve(JavaTypeParameterImpl@196['K']) = LazyJavaTypeParameterDescriptor@27['K']
+    resolve(JavaTypeParameterImpl@197['V']) = LazyJavaTypeParameterDescriptor@28['V']
 }

compiler/testData/diagnostics/tests/regressions/kt26-1.lazy.log

@@ -1,17 +1,17 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('bar': FqName@3) = null
-    _packageFragments('foo': 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('bar': FqName@3) = null
+    packageFragments('foo': 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/regressions/kt26.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt2768.lazy.log

@@ -6,165 +6,165 @@ DescriptorResolver@0 {
 }
 
 LazyJavaClassDescriptor@5['AssertionError'] {
-    _constructors = ArrayList@6[10] { JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], ... } // through LazyJavaClassMemberScope@10
-    _functionTypeForSamInterface = null
-    _typeConstructor = LazyJavaClassTypeConstructor@11['AssertionError']
-    defaultType = JetTypeImpl@12['AssertionError']
+    constructors = ArrayList@6[10] { JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], ... } // through LazyJavaClassMemberScope@10
+    defaultType = JetTypeImpl@11['AssertionError']
+    functionTypeForSamInterface = null
+    typeConstructor = LazyJavaClassTypeConstructor@12['AssertionError']
 }
 
 LazyJavaClassDescriptor@13['Error'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@14['Error']
+    typeConstructor = LazyJavaClassTypeConstructor@14['Error']
 }
 
-LazyJavaClassTypeConstructor@11['AssertionError'] {
-    _parameters = ArrayList@15[empty]
-    _supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Error'] }
+LazyJavaClassTypeConstructor@12['AssertionError'] {
+    parameters = ArrayList@15[empty]
+    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Error'] }
 }
 
 LazyJavaClassTypeConstructor@14['Error'] {
-    _parameters = ArrayList@18[empty]
-    _supertypes = ArrayList@19[1] { LazyJavaClassifierType@20['Throwable'] }
+    parameters = ArrayList@18[empty]
+    supertypes = ArrayList@19[1] { LazyJavaClassifierType@20['Throwable'] }
 }
 
 LazyJavaClassifierType@17['Error'] {
-    _arguments = ArrayList@21[empty]
-    _typeConstructor = LazyJavaClassTypeConstructor@14['Error']
+    arguments = ArrayList@21[empty]
     classifier = JavaClassImpl@22['Error']
+    typeConstructor = LazyJavaClassTypeConstructor@14['Error']
 }
 
 LazyJavaClassifierType@23['Object'] {
-    _arguments = ArrayList@24[empty]
-    _nullable = 'false': Boolean@25
-    _typeConstructor = DeserializedClassTypeConstructor@26
-    classifier = JavaClassImpl@27['Object']
+    arguments = ArrayList@24[empty]
+    classifier = JavaClassImpl@25['Object']
+    nullable = 'false': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@27
 }
 
 LazyJavaClassifierType@28['Object'] {
-    _arguments = ArrayList@29[empty]
-    _nullable = 'true': Boolean@30
-    _typeConstructor = DeserializedClassTypeConstructor@26
-    classifier = JavaClassImpl@27['Object']
+    arguments = ArrayList@29[empty]
+    classifier = JavaClassImpl@25['Object']
+    nullable = 'true': Boolean@30
+    typeConstructor = DeserializedClassTypeConstructor@27
 }
 
 LazyJavaClassifierType@31['String'] {
-    _arguments = ArrayList@32[empty]
-    _nullable = 'false': Boolean@25
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@34['String']
+    arguments = ArrayList@32[empty]
+    classifier = JavaClassImpl@33['String']
+    nullable = 'false': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@35['String'] {
-    _arguments = ArrayList@36[empty]
-    _nullable = 'false': Boolean@25
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@36[empty]
     classifier = JavaClassImpl@37['String']
+    nullable = 'false': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@38['String'] {
-    _arguments = ArrayList@39[empty]
-    _nullable = 'true': Boolean@30
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@37['String']
+    arguments = ArrayList@39[empty]
+    classifier = JavaClassImpl@33['String']
+    nullable = 'true': Boolean@30
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@40['String'] {
-    _arguments = ArrayList@41[empty]
-    _nullable = 'true': Boolean@30
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@34['String']
+    arguments = ArrayList@41[empty]
+    classifier = JavaClassImpl@37['String']
+    nullable = 'true': Boolean@30
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@42['Throwable'] {
-    _arguments = ArrayList@43[empty]
-    _nullable = 'false': Boolean@25
-    _typeConstructor = DeserializedClassTypeConstructor@44
-    classifier = JavaClassImpl@45['Throwable']
+    arguments = ArrayList@43[empty]
+    classifier = JavaClassImpl@44['Throwable']
+    nullable = 'false': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@45
 }
 
 LazyJavaClassifierType@46['Throwable'] {
-    _arguments = ArrayList@47[empty]
-    _nullable = 'true': Boolean@30
-    _typeConstructor = DeserializedClassTypeConstructor@44
-    classifier = JavaClassImpl@45['Throwable']
+    arguments = ArrayList@47[empty]
+    classifier = JavaClassImpl@44['Throwable']
+    nullable = 'true': Boolean@30
+    typeConstructor = DeserializedClassTypeConstructor@45
 }
 
 LazyJavaClassifierType@20['Throwable'] {
-    _arguments = ArrayList@48[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@44
+    arguments = ArrayList@48[empty]
     classifier = JavaClassImpl@49['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@45
 }
 
 LazyJavaPackageFragmentProvider@50 {
-    _packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
-    _packageFragments('Array': FqName@53) = null
-    _packageFragments('Byte': FqName@54) = null
-    _packageFragments('Short': FqName@55) = null
-    _packageFragments('String': FqName@56) = null
-    _packageFragments('T': FqName@57) = null
-    _packageFragments('java': FqName@58) = LazyJavaPackageFragment@59['java']
-    _packageFragments('java.lang': FqName@60) = LazyJavaPackageFragment@61['lang']
-    _packageFragments('java.lang.Array': FqName@62) = null
-    _packageFragments('java.lang.Byte': FqName@63) = null
-    _packageFragments('java.lang.Short': FqName@64) = null
-    _packageFragments('java.lang.String': FqName@65) = null
-    _packageFragments('java.lang.T': FqName@66) = null
-    _packageFragments('kotlin': FqName@67) = null
-    _packageFragments('kotlin.Array': FqName@68) = null
-    _packageFragments('kotlin.Byte': FqName@69) = null
-    _packageFragments('kotlin.Short': FqName@70) = null
-    _packageFragments('kotlin.String': FqName@71) = null
-    _packageFragments('kotlin.T': FqName@72) = null
-    _packageFragments('kotlin.io': FqName@73) = null
-    _packageFragments('kotlin.jvm': FqName@74) = null
+    packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
+    packageFragments('Array': FqName@53) = null
+    packageFragments('Byte': FqName@54) = null
+    packageFragments('Short': FqName@55) = null
+    packageFragments('String': FqName@56) = null
+    packageFragments('T': FqName@57) = null
+    packageFragments('java': FqName@58) = LazyJavaPackageFragment@59['java']
+    packageFragments('java.lang': FqName@60) = LazyJavaPackageFragment@61['lang']
+    packageFragments('java.lang.Array': FqName@62) = null
+    packageFragments('java.lang.Byte': FqName@63) = null
+    packageFragments('java.lang.Short': FqName@64) = null
+    packageFragments('java.lang.String': FqName@65) = null
+    packageFragments('java.lang.T': FqName@66) = null
+    packageFragments('kotlin': FqName@67) = null
+    packageFragments('kotlin.Array': FqName@68) = null
+    packageFragments('kotlin.Byte': FqName@69) = null
+    packageFragments('kotlin.Short': FqName@70) = null
+    packageFragments('kotlin.String': FqName@71) = null
+    packageFragments('kotlin.T': FqName@72) = null
+    packageFragments('kotlin.io': FqName@73) = null
+    packageFragments('kotlin.jvm': FqName@74) = null
     topLevelClasses(JavaClassImpl@75['AssertionError']) = LazyJavaClassDescriptor@5['AssertionError']
     topLevelClasses(JavaClassImpl@22['Error']) = LazyJavaClassDescriptor@13['Error']
 }
 
 LazyJavaPackageFragment@52['<root>'] {
-    _functions('AssertionError': Name@76) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    _functions('assertEquals': Name@79) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    _functions('equals': Name@80) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    _functions('minus': Name@81) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    _functions('toByte': Name@82) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    _functions('toInt': Name@83) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    _functions('toShort': Name@84) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('Array': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('AssertionError': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('Byte': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('Short': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('assertEquals': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('equals': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('minus': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('toByte': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('toInt': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('toShort': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('Array': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('AssertionError': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('Byte': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('Short': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('assertEquals': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('equals': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('minus': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('toByte': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('toInt': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('toShort': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('AssertionError': Name@78) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('assertEquals': Name@82) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('equals': Name@83) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('minus': Name@84) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('toByte': Name@85) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('toInt': Name@86) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('toShort': Name@87) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@77
 }
 
 LazyJavaPackageFragment@59['java'] {
-    _functions('lang': Name@91) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@92
+    functions('lang': Name@93) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
     memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
 }
 
 LazyJavaPackageFragment@61['lang'] {
-    _functions('AssertionError': Name@76) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('assertEquals': Name@79) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('equals': Name@80) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('minus': Name@81) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('toByte': Name@82) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('toInt': Name@83) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('toShort': Name@84) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('AssertionError': Name@76) = LazyJavaClassDescriptor@5['AssertionError'] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('assertEquals': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('equals': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('minus': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('toByte': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('toInt': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('toShort': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('AssertionError': Name@78) = LazyJavaClassDescriptor@5['AssertionError'] // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('assertEquals': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('equals': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('minus': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('toByte': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('toInt': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('toShort': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('AssertionError': Name@78) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('assertEquals': Name@82) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('equals': Name@83) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('minus': Name@84) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('toByte': Name@85) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('toInt': Name@86) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('toShort': Name@87) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
     memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@95
 }

compiler/testData/diagnostics/tests/regressions/kt282.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt287.lazy.log

@@ -1,215 +1,215 @@
 LazyJavaClassDescriptor@0['AbstractMap'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@1['AbstractMap']
+    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractMap']
 }
 
 LazyJavaClassDescriptor@2['HashMap'] {
-    _constructors = ArrayList@3[4] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    _functionTypeForSamInterface = null
-    _typeConstructor = LazyJavaClassTypeConstructor@8['HashMap']
-    defaultType = JetTypeImpl@9['HashMap<2>']
+    constructors = ArrayList@3[4] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
+    defaultType = JetTypeImpl@8['HashMap<2>']
+    functionTypeForSamInterface = null
+    typeConstructor = LazyJavaClassTypeConstructor@9['HashMap']
 }
 
 LazyJavaClassDescriptor@10['Serializable'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@11['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@11['Serializable']
 }
 
 LazyJavaClassTypeConstructor@1['AbstractMap'] {
-    _parameters = ArrayList@12[2] { LazyJavaTypeParameterDescriptor@13['K'], LazyJavaTypeParameterDescriptor@14['V'] }
-    _supertypes = ArrayList@15[1] { LazyJavaClassifierType@16['Map<K, V>'] }
+    parameters = ArrayList@12[2] { LazyJavaTypeParameterDescriptor@13['K'], LazyJavaTypeParameterDescriptor@14['V'] }
+    supertypes = ArrayList@15[1] { LazyJavaClassifierType@16['Map<K, V>'] }
 }
 
-LazyJavaClassTypeConstructor@8['HashMap'] {
-    _parameters = ArrayList@17[2] { LazyJavaTypeParameterDescriptor@18['K'], LazyJavaTypeParameterDescriptor@19['V'] }
-    _supertypes = ArrayList@20[4] { LazyJavaClassifierType@21['AbstractMap<K, V>'], LazyJavaClassifierType@22['Map<K, V>'], LazyJavaClassifierType@23['Cloneable'], ... }
+LazyJavaClassTypeConstructor@9['HashMap'] {
+    parameters = ArrayList@17[2] { LazyJavaTypeParameterDescriptor@18['K'], LazyJavaTypeParameterDescriptor@19['V'] }
+    supertypes = ArrayList@20[4] { LazyJavaClassifierType@21['AbstractMap<K, V>'], LazyJavaClassifierType@22['Map<K, V>'], LazyJavaClassifierType@23['Cloneable'], ... }
 }
 
 LazyJavaClassTypeConstructor@11['Serializable'] {
-    _supertypes = ArrayList@24[1] { JetTypeImpl@25['Any'] }
+    supertypes = ArrayList@24[1] { JetTypeImpl@25['Any'] }
 }
 
 LazyJavaClassifierType@21['AbstractMap<K, V>'] {
-    _arguments = ArrayList@26[2] { TypeProjectionImpl@27, TypeProjectionImpl@28 }
-    _typeConstructor = LazyJavaClassTypeConstructor@1['AbstractMap']
+    arguments = ArrayList@26[2] { TypeProjectionImpl@27, TypeProjectionImpl@28 }
     classifier = JavaClassImpl@29['AbstractMap']
+    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractMap']
 }
 
 LazyJavaClassifierType@23['Cloneable'] {
-    _typeConstructor = DeserializedClassTypeConstructor@30
-    classifier = JavaClassImpl@31['Cloneable']
+    classifier = JavaClassImpl@30['Cloneable']
+    typeConstructor = DeserializedClassTypeConstructor@31
 }
 
 LazyJavaClassifierType@32['K'] {
-    _arguments = ArrayList@33[empty]
-    _nullable = 'false': Boolean@34
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
-    classifier = JavaTypeParameterImpl@36['K']
+    arguments = ArrayList@33[empty]
+    classifier = JavaTypeParameterImpl@34['K']
+    nullable = 'false': Boolean@35
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
 LazyJavaClassifierType@37['K'] {
-    _arguments = ArrayList@38[empty]
-    _nullable = 'false': Boolean@34
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
+    arguments = ArrayList@38[empty]
     classifier = JavaTypeParameterImpl@39['K']
+    nullable = 'false': Boolean@35
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
 }
 
-LazyJavaClassifierType@40['K'] {
-    _arguments = ArrayList@41[empty]
-    _nullable = 'false': Boolean@34
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
-    classifier = JavaTypeParameterImpl@42['K']
+LazyJavaClassifierType@41['K'] {
+    arguments = ArrayList@42[empty]
+    classifier = JavaTypeParameterImpl@43['K']
+    nullable = 'false': Boolean@35
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
 }
 
-LazyJavaClassifierType@43['K'] {
-    _arguments = ArrayList@44[empty]
-    _nullable = 'false': Boolean@34
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@45
+LazyJavaClassifierType@44['K'] {
+    arguments = ArrayList@45[empty]
     classifier = JavaTypeParameterImpl@46['K']
+    nullable = 'false': Boolean@35
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
 }
 
 LazyJavaClassifierType@47['K'] {
-    _arguments = ArrayList@48[empty]
-    _nullable = 'true': Boolean@49
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@45
-    classifier = JavaTypeParameterImpl@46['K']
+    arguments = ArrayList@48[empty]
+    classifier = JavaTypeParameterImpl@39['K']
+    nullable = 'true': Boolean@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
 }
 
 LazyJavaClassifierType@50['K'] {
-    _arguments = ArrayList@51[empty]
-    _nullable = 'true': Boolean@49
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
-    classifier = JavaTypeParameterImpl@42['K']
+    arguments = ArrayList@51[empty]
+    classifier = JavaTypeParameterImpl@34['K']
+    nullable = 'true': Boolean@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
 LazyJavaClassifierType@52['K'] {
-    _arguments = ArrayList@53[empty]
-    _nullable = 'true': Boolean@49
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
-    classifier = JavaTypeParameterImpl@36['K']
+    arguments = ArrayList@53[empty]
+    classifier = JavaTypeParameterImpl@43['K']
+    nullable = 'true': Boolean@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
 }
 
 LazyJavaClassifierType@54['K'] {
-    _arguments = ArrayList@55[empty]
-    _nullable = 'true': Boolean@49
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
-    classifier = JavaTypeParameterImpl@39['K']
+    arguments = ArrayList@55[empty]
+    classifier = JavaTypeParameterImpl@46['K']
+    nullable = 'true': Boolean@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
 }
 
 LazyJavaClassifierType@56['Map<? extends K, ? extends V>'] {
-    _arguments = ArrayList@57[2] { TypeProjectionImpl@58, TypeProjectionImpl@59 }
-    _memberScope = SubstitutingScope@60
-    _nullable = 'false': Boolean@34
-    _typeConstructor = DeserializedClassTypeConstructor@61
-    classifier = JavaClassImpl@62['Map']
+    arguments = ArrayList@57[2] { TypeProjectionImpl@58, TypeProjectionImpl@59 }
+    classifier = JavaClassImpl@60['Map']
+    memberScope = SubstitutingScope@61
+    nullable = 'false': Boolean@35
+    typeConstructor = DeserializedClassTypeConstructor@62
 }
 
 LazyJavaClassifierType@63['Map<? extends K, ? extends V>'] {
-    _arguments = ArrayList@64[2] { TypeProjectionImpl@65, TypeProjectionImpl@66 }
-    _memberScope = SubstitutingScope@67
-    _nullable = 'true': Boolean@49
-    _typeConstructor = DeserializedClassTypeConstructor@68
-    classifier = JavaClassImpl@62['Map']
+    arguments = ArrayList@64[2] { TypeProjectionImpl@65, TypeProjectionImpl@66 }
+    classifier = JavaClassImpl@60['Map']
+    memberScope = SubstitutingScope@67
+    nullable = 'true': Boolean@49
+    typeConstructor = DeserializedClassTypeConstructor@68
 }
 
 LazyJavaClassifierType@16['Map<K, V>'] {
-    _arguments = ArrayList@69[2] { TypeProjectionImpl@70, TypeProjectionImpl@71 }
-    _typeConstructor = DeserializedClassTypeConstructor@61
+    arguments = ArrayList@69[2] { TypeProjectionImpl@70, TypeProjectionImpl@71 }
     classifier = JavaClassImpl@72['Map']
+    typeConstructor = DeserializedClassTypeConstructor@62
 }
 
 LazyJavaClassifierType@22['Map<K, V>'] {
-    _typeConstructor = DeserializedClassTypeConstructor@61
     classifier = JavaClassImpl@73['Map']
+    typeConstructor = DeserializedClassTypeConstructor@62
 }
 
 LazyJavaClassifierType@74['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@75
-    classifier = JavaClassImpl@76['Object']
+    classifier = JavaClassImpl@75['Object']
+    typeConstructor = DeserializedClassTypeConstructor@76
 }
 
 LazyJavaClassifierType@77['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@75
     classifier = JavaClassImpl@78['Object']
+    typeConstructor = DeserializedClassTypeConstructor@76
 }
 
 LazyJavaClassifierType@79['Serializable'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@11['Serializable']
     classifier = JavaClassImpl@80['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@11['Serializable']
 }
 
 LazyJavaClassifierType@81['V'] {
-    _arguments = ArrayList@82[empty]
-    _nullable = 'false': Boolean@34
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-    classifier = JavaTypeParameterImpl@84['V']
+    arguments = ArrayList@82[empty]
+    classifier = JavaTypeParameterImpl@83['V']
+    nullable = 'false': Boolean@35
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@85['V'] {
-    _arguments = ArrayList@86[empty]
-    _nullable = 'false': Boolean@34
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    arguments = ArrayList@86[empty]
     classifier = JavaTypeParameterImpl@87['V']
+    nullable = 'false': Boolean@35
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
-LazyJavaClassifierType@88['V'] {
-    _arguments = ArrayList@89[empty]
-    _nullable = 'false': Boolean@34
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-    classifier = JavaTypeParameterImpl@90['V']
+LazyJavaClassifierType@89['V'] {
+    arguments = ArrayList@90[empty]
+    classifier = JavaTypeParameterImpl@91['V']
+    nullable = 'false': Boolean@35
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
-LazyJavaClassifierType@91['V'] {
-    _arguments = ArrayList@92[empty]
-    _nullable = 'false': Boolean@34
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@93
+LazyJavaClassifierType@92['V'] {
+    arguments = ArrayList@93[empty]
     classifier = JavaTypeParameterImpl@94['V']
+    nullable = 'false': Boolean@35
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@95['V'] {
-    _arguments = ArrayList@96[empty]
-    _nullable = 'true': Boolean@49
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@93
-    classifier = JavaTypeParameterImpl@94['V']
+    arguments = ArrayList@96[empty]
+    classifier = JavaTypeParameterImpl@91['V']
+    nullable = 'true': Boolean@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@97['V'] {
-    _arguments = ArrayList@98[empty]
-    _nullable = 'true': Boolean@49
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-    classifier = JavaTypeParameterImpl@84['V']
+    arguments = ArrayList@98[empty]
+    classifier = JavaTypeParameterImpl@83['V']
+    nullable = 'true': Boolean@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@99['V'] {
-    _arguments = ArrayList@100[empty]
-    _nullable = 'true': Boolean@49
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    arguments = ArrayList@100[empty]
     classifier = JavaTypeParameterImpl@87['V']
+    nullable = 'true': Boolean@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
 LazyJavaClassifierType@101['V'] {
-    _arguments = ArrayList@102[empty]
-    _nullable = 'true': Boolean@49
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-    classifier = JavaTypeParameterImpl@90['V']
+    arguments = ArrayList@102[empty]
+    classifier = JavaTypeParameterImpl@94['V']
+    nullable = 'true': Boolean@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaPackageFragmentProvider@103 {
-    _packageFragments('<root>': FqName@104) = LazyJavaPackageFragment@105['<root>']
-    _packageFragments('Map': FqName@106) = null
-    _packageFragments('String': FqName@107) = null
-    _packageFragments('attributes': FqName@108) = null
-    _packageFragments('java': FqName@109) = LazyJavaPackageFragment@110['java']
-    _packageFragments('java.io': FqName@111) = LazyJavaPackageFragment@112['io']
-    _packageFragments('java.lang': FqName@113) = LazyJavaPackageFragment@114['lang']
-    _packageFragments('java.lang.Map': FqName@115) = null
-    _packageFragments('java.lang.String': FqName@116) = null
-    _packageFragments('java.util': FqName@117) = LazyJavaPackageFragment@118['util']
-    _packageFragments('java.util.Map': FqName@119) = null
-    _packageFragments('java.util.String': FqName@120) = null
-    _packageFragments('kotlin': FqName@121) = null
-    _packageFragments('kotlin.Map': FqName@122) = null
-    _packageFragments('kotlin.String': FqName@123) = null
-    _packageFragments('kotlin.io': FqName@124) = null
-    _packageFragments('kotlin.jvm': FqName@125) = null
+    packageFragments('<root>': FqName@104) = LazyJavaPackageFragment@105['<root>']
+    packageFragments('Map': FqName@106) = null
+    packageFragments('String': FqName@107) = null
+    packageFragments('attributes': FqName@108) = null
+    packageFragments('java': FqName@109) = LazyJavaPackageFragment@110['java']
+    packageFragments('java.io': FqName@111) = LazyJavaPackageFragment@112['io']
+    packageFragments('java.lang': FqName@113) = LazyJavaPackageFragment@114['lang']
+    packageFragments('java.lang.Map': FqName@115) = null
+    packageFragments('java.lang.String': FqName@116) = null
+    packageFragments('java.util': FqName@117) = LazyJavaPackageFragment@118['util']
+    packageFragments('java.util.Map': FqName@119) = null
+    packageFragments('java.util.String': FqName@120) = null
+    packageFragments('kotlin': FqName@121) = null
+    packageFragments('kotlin.Map': FqName@122) = null
+    packageFragments('kotlin.String': FqName@123) = null
+    packageFragments('kotlin.io': FqName@124) = null
+    packageFragments('kotlin.jvm': FqName@125) = null
     topLevelClasses(JavaClassImpl@29['AbstractMap']) = LazyJavaClassDescriptor@0['AbstractMap']
     topLevelClasses(JavaClassImpl@126['HashMap']) = LazyJavaClassDescriptor@2['HashMap']
     topLevelClasses(JavaClassImpl@127['Map']) = LazyJavaClassDescriptor@128['Map']
@@ -217,73 +217,73 @@ LazyJavaPackageFragmentProvider@103 {
 }
 
 LazyJavaPackageFragment@105['<root>'] {
-    _functions('HashMap': Name@129) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    _functions('foo': Name@132) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    _functions('java': Name@133) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('HashMap': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('Map': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('String': Name@135) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('foo': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('java': Name@136) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    deserializedPackageScope = Empty@137 // through LazyPackageFragmentScopeForJavaPackage@131
-    memberIndex = computeMemberIndex$1@138 // through LazyPackageFragmentScopeForJavaPackage@131
+    classes('HashMap': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('Map': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('String': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('foo': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('java': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    deserializedPackageScope = Empty@135 // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('HashMap': Name@129) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('foo': Name@133) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('java': Name@137) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    memberIndex = computeMemberIndex$1@138 // through LazyPackageFragmentScopeForJavaPackage@130
 }
 
 LazyJavaPackageFragment@110['java'] {
-    _functions('lang': Name@139) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    _functions('util': Name@141) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('lang': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('util': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    deserializedPackageScope = Empty@137 // through LazyPackageFragmentScopeForJavaPackage@140
+    classes('lang': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@140
+    classes('util': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@140
+    deserializedPackageScope = Empty@135 // through LazyPackageFragmentScopeForJavaPackage@140
+    functions('lang': Name@142) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@140
+    functions('util': Name@143) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@140
     memberIndex = computeMemberIndex$1@144 // through LazyPackageFragmentScopeForJavaPackage@140
 }
 
 LazyJavaPackageFragment@114['lang'] {
-    _functions('HashMap': Name@129) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    _functions('foo': Name@132) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@145
     classes('HashMap': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('foo': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    deserializedPackageScope = Empty@137 // through LazyPackageFragmentScopeForJavaPackage@145
+    classes('foo': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@145
+    deserializedPackageScope = Empty@135 // through LazyPackageFragmentScopeForJavaPackage@145
+    functions('HashMap': Name@129) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@145
+    functions('foo': Name@133) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@145
     memberIndex = computeMemberIndex$1@146 // through LazyPackageFragmentScopeForJavaPackage@145
 }
 
 LazyJavaPackageFragment@118['util'] {
-    _functions('HashMap': Name@129) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    _functions('foo': Name@132) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@147
     classes('HashMap': Name@129) = LazyJavaClassDescriptor@2['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('Map': Name@134) = LazyJavaClassDescriptor@128['Map'] // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('String': Name@135) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('foo': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    deserializedPackageScope = Empty@137 // through LazyPackageFragmentScopeForJavaPackage@147
+    classes('Map': Name@131) = LazyJavaClassDescriptor@128['Map'] // through LazyPackageFragmentScopeForJavaPackage@147
+    classes('String': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@147
+    classes('foo': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@147
+    deserializedPackageScope = Empty@135 // through LazyPackageFragmentScopeForJavaPackage@147
+    functions('HashMap': Name@129) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@147
+    functions('foo': Name@133) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@147
     memberIndex = computeMemberIndex$1@148 // through LazyPackageFragmentScopeForJavaPackage@147
 }
 
 LazyJavaTypeParameterDescriptor@18['K'] {
     defaultType = JetTypeImpl@149['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
     upperBounds = LinkedHashSet@150[1] { NullableType@151 }
 }
 
 LazyJavaTypeParameterDescriptor@13['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@45
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
 LazyJavaTypeParameterDescriptor@19['V'] {
     defaultType = JetTypeImpl@152['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
     upperBounds = LinkedHashSet@153[1] { NullableType@154 }
 }
 
 LazyJavaTypeParameterDescriptor@14['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@93
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
 LazyJavaTypeParameterResolver@155 {
-    resolve(JavaTypeParameterImpl@46['K']) = LazyJavaTypeParameterDescriptor@13['K']
-    resolve(JavaTypeParameterImpl@94['V']) = LazyJavaTypeParameterDescriptor@14['V']
+    resolve(JavaTypeParameterImpl@156['K']) = LazyJavaTypeParameterDescriptor@18['K']
+    resolve(JavaTypeParameterImpl@157['V']) = LazyJavaTypeParameterDescriptor@19['V']
 }
 
-LazyJavaTypeParameterResolver@156 {
-    resolve(JavaTypeParameterImpl@157['K']) = LazyJavaTypeParameterDescriptor@18['K']
-    resolve(JavaTypeParameterImpl@158['V']) = LazyJavaTypeParameterDescriptor@19['V']
+LazyJavaTypeParameterResolver@158 {
+    resolve(JavaTypeParameterImpl@34['K']) = LazyJavaTypeParameterDescriptor@13['K']
+    resolve(JavaTypeParameterImpl@87['V']) = LazyJavaTypeParameterDescriptor@14['V']
 }

compiler/testData/diagnostics/tests/regressions/kt2956.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt302.lazy.log

@@ -1,25 +1,25 @@
 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('java.lang.A': FqName@9) = null
-    _packageFragments('java.lang.B': FqName@10) = null
-    _packageFragments('kotlin': FqName@11) = null
-    _packageFragments('kotlin.A': FqName@12) = null
-    _packageFragments('kotlin.B': FqName@13) = null
-    _packageFragments('kotlin.io': FqName@14) = null
-    _packageFragments('kotlin.jvm': FqName@15) = null
-    _packageFragments('kt302': FqName@16) = null
-    _packageFragments('kt302.A': FqName@17) = null
-    _packageFragments('kt302.B': FqName@18) = null
-    _packageFragments('kt302.C': FqName@19) = 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('java.lang.A': FqName@9) = null
+    packageFragments('java.lang.B': FqName@10) = null
+    packageFragments('kotlin': FqName@11) = null
+    packageFragments('kotlin.A': FqName@12) = null
+    packageFragments('kotlin.B': FqName@13) = null
+    packageFragments('kotlin.io': FqName@14) = null
+    packageFragments('kotlin.jvm': FqName@15) = null
+    packageFragments('kt302': FqName@16) = null
+    packageFragments('kt302.A': FqName@17) = null
+    packageFragments('kt302.B': FqName@18) = null
+    packageFragments('kt302.C': FqName@19) = null
 }
 
 LazyJavaPackageFragment@6['java'] {
-    _functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
 }

compiler/testData/diagnostics/tests/regressions/kt306.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt307.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt312.lazy.log

@@ -4,64 +4,64 @@ DescriptorResolver@0 {
 }
 
 LazyJavaPackageFragmentProvider@1 {
-    _packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
-    _packageFragments('Array': FqName@4) = null
-    _packageFragments('Int': FqName@5) = null
-    _packageFragments('String': FqName@6) = null
-    _packageFragments('T': FqName@7) = null
-    _packageFragments('args': FqName@8) = null
-    _packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    _packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    _packageFragments('java.lang.Array': FqName@13) = null
-    _packageFragments('java.lang.Int': FqName@14) = null
-    _packageFragments('java.lang.String': FqName@15) = null
-    _packageFragments('java.lang.T': FqName@16) = null
-    _packageFragments('kotlin': FqName@17) = null
-    _packageFragments('kotlin.Array': FqName@18) = null
-    _packageFragments('kotlin.Int': FqName@19) = null
-    _packageFragments('kotlin.String': FqName@20) = null
-    _packageFragments('kotlin.T': FqName@21) = null
-    _packageFragments('kotlin.io': FqName@22) = null
-    _packageFragments('kotlin.jvm': FqName@23) = null
-    _packageFragments('name': FqName@24) = null
-    _packageFragments('name1': FqName@25) = null
+    packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
+    packageFragments('Array': FqName@4) = null
+    packageFragments('Int': FqName@5) = null
+    packageFragments('String': FqName@6) = null
+    packageFragments('T': FqName@7) = null
+    packageFragments('args': FqName@8) = null
+    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
+    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
+    packageFragments('java.lang.Array': FqName@13) = null
+    packageFragments('java.lang.Int': FqName@14) = null
+    packageFragments('java.lang.String': FqName@15) = null
+    packageFragments('java.lang.T': FqName@16) = null
+    packageFragments('kotlin': FqName@17) = null
+    packageFragments('kotlin.Array': FqName@18) = null
+    packageFragments('kotlin.Int': FqName@19) = null
+    packageFragments('kotlin.String': FqName@20) = null
+    packageFragments('kotlin.T': FqName@21) = null
+    packageFragments('kotlin.io': FqName@22) = null
+    packageFragments('kotlin.jvm': FqName@23) = null
+    packageFragments('name': FqName@24) = null
+    packageFragments('name1': FqName@25) = null
 }
 
 LazyJavaPackageFragment@3['<root>'] {
-    _functions('Array': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    _functions('compareTo': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    _functions('get': Name@30) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    _functions('safeGet': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Array': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Int': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('String': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('args': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('compareTo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('get': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('safeGet': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('size': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('Array': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('args': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('compareTo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('get': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('safeGet': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('size': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('Array': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('compareTo': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('get': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('safeGet': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@39) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
     memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    _functions('Array': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    _functions('compareTo': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    _functions('get': Name@30) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    _functions('safeGet': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('Array': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('args': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('compareTo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('get': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('safeGet': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('size': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('Array': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('args': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('compareTo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('get': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('safeGet': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('size': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('Array': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('compareTo': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('get': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('safeGet': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
     memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
 }

compiler/testData/diagnostics/tests/regressions/kt313.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt316.lazy.log

@@ -1,19 +1,19 @@
 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('java.lang.B': FqName@9) = null
-    _packageFragments('kotlin': FqName@10) = null
-    _packageFragments('kotlin.B': 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('B': FqName@4) = null
+    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
+    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
+    packageFragments('java.lang.B': FqName@9) = null
+    packageFragments('kotlin': FqName@10) = null
+    packageFragments('kotlin.B': 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/regressions/kt328.lazy.log

@@ -11,69 +11,69 @@ DescriptorResolver@0 {
 }
 
 LazyJavaPackageFragmentProvider@8 {
-    _packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    _packageFragments('A': FqName@11) = null
-    _packageFragments('Unit': FqName@12) = null
-    _packageFragments('foo3': FqName@13) = null
-    _packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    _packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    _packageFragments('java.lang.Unit': FqName@18) = null
-    _packageFragments('java.lang.foo3': FqName@19) = null
-    _packageFragments('kotlin': FqName@20) = null
-    _packageFragments('kotlin.Unit': FqName@21) = null
-    _packageFragments('kotlin.foo3': FqName@22) = null
-    _packageFragments('kotlin.io': FqName@23) = null
-    _packageFragments('kotlin.jvm': FqName@24) = null
-    _packageFragments('x': FqName@25) = null
-    _packageFragments('z': FqName@26) = null
+    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
+    packageFragments('A': FqName@11) = null
+    packageFragments('Unit': FqName@12) = null
+    packageFragments('foo3': FqName@13) = null
+    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
+    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
+    packageFragments('java.lang.Unit': FqName@18) = null
+    packageFragments('java.lang.foo3': FqName@19) = null
+    packageFragments('kotlin': FqName@20) = null
+    packageFragments('kotlin.Unit': FqName@21) = null
+    packageFragments('kotlin.foo3': FqName@22) = null
+    packageFragments('kotlin.io': FqName@23) = null
+    packageFragments('kotlin.jvm': FqName@24) = null
+    packageFragments('x': FqName@25) = null
+    packageFragments('z': FqName@26) = null
 }
 
 LazyJavaPackageFragment@10['<root>'] {
-    _functions('bar1': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    _functions('bar2': Name@30) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    _functions('bar3': Name@31) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    _functions('block': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    _functions('f': Name@33) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    _functions('foo3': Name@34) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    _functions('invoke': Name@35) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('Unit': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('bar1': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('bar2': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('bar3': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('block': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('f': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('foo3': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('invoke': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('x': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('z': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('Unit': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('bar1': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('bar2': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('bar3': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('block': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('f': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('foo3': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('invoke': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('x': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('z': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('bar1': Name@29) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('bar2': Name@30) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('bar3': Name@31) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('block': Name@32) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('f': Name@33) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('foo3': Name@34) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('invoke': Name@35) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@15['java'] {
-    _functions('lang': Name@41) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('lang': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
     memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
 }
 
 LazyJavaPackageFragment@17['lang'] {
-    _functions('bar1': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    _functions('bar2': Name@30) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    _functions('bar3': Name@31) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    _functions('block': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    _functions('f': Name@33) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    _functions('foo3': Name@34) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    _functions('invoke': Name@35) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('bar1': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('bar1': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('bar2': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('bar3': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('block': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('f': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('foo3': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('invoke': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('x': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('z': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('x': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('z': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('bar1': Name@29) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('bar2': Name@30) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('bar3': Name@31) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('block': Name@32) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('f': Name@33) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('foo3': Name@34) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('invoke': Name@35) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
     memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
 }

compiler/testData/diagnostics/tests/regressions/kt334.lazy.log

@@ -1,104 +1,104 @@
 LazyJavaClassDescriptor@0['Comparable'] {
-    _allDescriptors = ArrayList@1[4] { DeserializedSimpleFunctionDescriptor@2['hashCode'], DeserializedSimpleFunctionDescriptor@3['toString'], DeserializedSimpleFunctionDescriptor@4['equals'], ... } // through LazyJavaClassMemberScope@5
-    _annotations = LazyJavaAnnotations@6
-    _functionTypeForSamInterface = JetTypeImpl@7['Function1<2>']
-    _functions('clone': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5
-    _functions('compareTo': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['compareTo'] } // through LazyJavaClassMemberScope@5
-    _functions('equals': Name@13) = ArrayList@14[1] { DeserializedSimpleFunctionDescriptor@4['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('hashCode': Name@17) = ArrayList@18[1] { DeserializedSimpleFunctionDescriptor@2['hashCode'] } // through LazyJavaClassMemberScope@5
-    _functions('notify': Name@19) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5
-    _functions('notifyAll': Name@20) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5
-    _functions('toString': Name@21) = ArrayList@22[1] { DeserializedSimpleFunctionDescriptor@3['toString'] } // through LazyJavaClassMemberScope@5
-    _functions('wait': Name@23) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5
-    _typeConstructor = LazyJavaClassTypeConstructor@24['Comparable']
-    defaultType = JetTypeImpl@25['Comparable<1>']
-    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@29['<this>']
+    allDescriptors = ArrayList@1[4] { DeserializedSimpleFunctionDescriptor@2['hashCode'], DeserializedSimpleFunctionDescriptor@3['toString'], DeserializedSimpleFunctionDescriptor@4['equals'], ... } // through LazyJavaClassMemberScope@5
+    annotations = LazyJavaAnnotations@6
+    defaultType = JetTypeImpl@7['Comparable<1>']
+    enumEntryIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@5
+    functionTypeForSamInterface = JetTypeImpl@9['Function1<2>']
+    functions('clone': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
+    functions('compareTo': Name@12) = ArrayList@13[1] { JavaMethodDescriptor@14['compareTo'] } // through LazyJavaClassMemberScope@5
+    functions('equals': Name@15) = ArrayList@16[1] { DeserializedSimpleFunctionDescriptor@4['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('hashCode': Name@19) = ArrayList@20[1] { DeserializedSimpleFunctionDescriptor@2['hashCode'] } // through LazyJavaClassMemberScope@5
+    functions('notify': Name@21) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
+    functions('notifyAll': Name@22) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
+    functions('toString': Name@23) = ArrayList@24[1] { DeserializedSimpleFunctionDescriptor@3['toString'] } // through LazyJavaClassMemberScope@5
+    functions('wait': Name@25) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
+    memberIndex = computeMemberIndex$1@26 // through LazyJavaClassMemberScope@5
+    nestedClassIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@5
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@28['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@29['Comparable']
 }
 
-LazyJavaClassTypeConstructor@24['Comparable'] {
-    _parameters = ArrayList@30[1] { LazyJavaTypeParameterDescriptor@31['T'] }
-    _supertypes = ArrayList@32[1] { JetTypeImpl@33['Any'] }
+LazyJavaClassTypeConstructor@29['Comparable'] {
+    parameters = ArrayList@30[1] { LazyJavaTypeParameterDescriptor@31['T'] }
+    supertypes = ArrayList@32[1] { JetTypeImpl@33['Any'] }
 }
 
 LazyJavaClassifierType@34['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@35
-    classifier = JavaClassImpl@36['Object']
+    classifier = JavaClassImpl@35['Object']
+    typeConstructor = DeserializedClassTypeConstructor@36
 }
 
 LazyJavaClassifierType@37['T'] {
-    _arguments = ArrayList@38[empty]
-    _nullable = 'false': Boolean@39
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
-    classifier = JavaTypeParameterImpl@41['T']
+    arguments = ArrayList@38[empty]
+    classifier = JavaTypeParameterImpl@39['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@41
 }
 
 LazyJavaClassifierType@42['T'] {
-    _arguments = ArrayList@43[empty]
-    _nullable = 'false': Boolean@39
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
+    arguments = ArrayList@43[empty]
     classifier = JavaTypeParameterImpl@44['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@41
 }
 
 LazyJavaClassifierType@45['T'] {
-    _arguments = ArrayList@46[empty]
-    _nullable = 'true': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
-    classifier = JavaTypeParameterImpl@44['T']
+    arguments = ArrayList@46[empty]
+    classifier = JavaTypeParameterImpl@39['T']
+    nullable = 'true': Boolean@47
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@41
 }
 
 LazyJavaClassifierType@48['T'] {
-    _arguments = ArrayList@49[empty]
-    _nullable = 'true': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
-    classifier = JavaTypeParameterImpl@41['T']
+    arguments = ArrayList@49[empty]
+    classifier = JavaTypeParameterImpl@44['T']
+    nullable = 'true': Boolean@47
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@41
 }
 
 LazyJavaPackageFragmentProvider@50 {
-    _packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
-    _packageFragments('Comparable': FqName@53) = null
-    _packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
-    _packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
-    _packageFragments('java.lang.Comparable': FqName@58) = null
-    _packageFragments('kotlin': FqName@59) = null
-    _packageFragments('kotlin.Comparable': FqName@60) = null
-    _packageFragments('kotlin.io': FqName@61) = null
-    _packageFragments('kotlin.jvm': FqName@62) = null
+    packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
+    packageFragments('Comparable': FqName@53) = null
+    packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
+    packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
+    packageFragments('java.lang.Comparable': FqName@58) = null
+    packageFragments('kotlin': FqName@59) = null
+    packageFragments('kotlin.Comparable': FqName@60) = null
+    packageFragments('kotlin.io': FqName@61) = null
+    packageFragments('kotlin.jvm': FqName@62) = null
     topLevelClasses(JavaClassImpl@63['Comparable']) = LazyJavaClassDescriptor@0['Comparable']
 }
 
 LazyJavaPackageFragment@52['<root>'] {
-    _functions('java': Name@64) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Comparable': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('java': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('kotlin': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('Comparable': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('java': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('kotlin': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('java': Name@69) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@65
     memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@65
 }
 
 LazyJavaPackageFragment@55['java'] {
-    _functions('lang': Name@71) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('lang': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('lang': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('lang': Name@73) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@72
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
 }
 
 LazyJavaPackageFragment@57['lang'] {
-    _functions('Comparable': Name@75) = ArrayList@76[1] { SamConstructorDescriptor@77['Comparable'] } // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('Comparable': Name@79) = LazyJavaClassDescriptor@0['Comparable'] // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('java': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('kotlin': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('Comparable': Name@75) = LazyJavaClassDescriptor@0['Comparable'] // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('java': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('kotlin': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('Comparable': Name@78) = ArrayList@79[1] { SamConstructorDescriptor@80['Comparable'] } // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaTypeParameterDescriptor@31['T'] {
     defaultType = JetTypeImpl@82['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@41
     upperBounds = LinkedHashSet@83[1] { NullableType@84 }
     upperBoundsAsType = NullableType@84
 }
@@ -108,9 +108,9 @@ LazyJavaTypeParameterResolver@85 {
 }
 
 LazyJavaTypeParameterResolver@87 {
-    resolve(JavaTypeParameterImpl@44['T']) = null
+    resolve(JavaTypeParameterImpl@39['T']) = null
 }
 
 LazyJavaTypeParameterResolver@88 {
-    resolve(JavaTypeParameterImpl@41['T']) = null
+    resolve(JavaTypeParameterImpl@44['T']) = null
 }

compiler/testData/diagnostics/tests/regressions/kt335.336.lazy.log

@@ -1,522 +1,522 @@
 LazyJavaClassDescriptor@0['AbstractCollection'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
 }
 
 LazyJavaClassDescriptor@2['AbstractList'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
 }
 
 LazyJavaClassDescriptor@4['ArrayList'] {
-    _constructors = ArrayList@5[3] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'] } // through LazyJavaClassMemberScope@9
-    _functionTypeForSamInterface = null
-    _typeConstructor = LazyJavaClassTypeConstructor@10['ArrayList']
-    defaultType = JetTypeImpl@11['ArrayList<1>']
+    constructors = ArrayList@5[3] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'] } // through LazyJavaClassMemberScope@9
+    defaultType = JetTypeImpl@10['ArrayList<1>']
+    functionTypeForSamInterface = null
+    typeConstructor = LazyJavaClassTypeConstructor@11['ArrayList']
 }
 
 LazyJavaClassDescriptor@12['Collections'] {
-    _functions('sort': Name@13) = ArrayList@14[3] { JavaMethodDescriptor@15['sort'], JavaMethodDescriptor@16['sort'], SamAdapterFunctionDescriptor@17['sort'] } // through LazyJavaStaticClassScope@18
-    _functions('sort': Name@13) = EmptyList@19[empty] // through LazyJavaClassMemberScope@20
-    _properties('sort': Name@13) = EmptyList@19[empty] // through LazyJavaClassMemberScope@20
-    _properties('sort': Name@13) = EmptyList@19[empty] // through LazyJavaStaticClassScope@18
-    _typeConstructor = LazyJavaClassTypeConstructor@21['Collections']
-    enumEntryIndex = LinkedHashMap@22 // through LazyJavaClassMemberScope@20
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@20
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaStaticClassScope@18
-    nestedClassIndex = LinkedHashMap@25 // through LazyJavaClassMemberScope@20
-    nestedClasses('sort': Name@13) = null // through LazyJavaClassMemberScope@20
+    enumEntryIndex = LinkedHashMap@13 // through LazyJavaClassMemberScope@14
+    functions('sort': Name@15) = ArrayList@16[3] { JavaMethodDescriptor@17['sort'], JavaMethodDescriptor@18['sort'], SamAdapterFunctionDescriptor@19['sort'] } // through LazyJavaStaticClassScope@20
+    functions('sort': Name@15) = EmptyList@21[empty] // through LazyJavaClassMemberScope@14
+    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@14
+    memberIndex = computeMemberIndex$1@23 // through LazyJavaStaticClassScope@20
+    nestedClassIndex = LinkedHashMap@24 // through LazyJavaClassMemberScope@14
+    nestedClasses('sort': Name@15) = null // through LazyJavaClassMemberScope@14
+    properties('sort': Name@15) = EmptyList@21[empty] // through LazyJavaClassMemberScope@14
+    properties('sort': Name@15) = EmptyList@21[empty] // through LazyJavaStaticClassScope@20
+    typeConstructor = LazyJavaClassTypeConstructor@25['Collections']
 }
 
 LazyJavaClassDescriptor@26['Comparator'] {
-    _functionTypeForSamInterface = JetTypeImpl@27['Function2<3>']
-    _typeConstructor = LazyJavaClassTypeConstructor@28['Comparator']
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@29['<this>']
+    functionTypeForSamInterface = JetTypeImpl@27['Function2<3>']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@28['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@29['Comparator']
 }
 
 LazyJavaClassDescriptor@30['RandomAccess'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@31['RandomAccess']
+    typeConstructor = LazyJavaClassTypeConstructor@31['RandomAccess']
 }
 
 LazyJavaClassDescriptor@32['Serializable'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@33['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@33['Serializable']
 }
 
 LazyJavaClassTypeConstructor@1['AbstractCollection'] {
-    _supertypes = ArrayList@34[1] { LazyJavaClassifierType@35['Collection<E>'] }
+    supertypes = ArrayList@34[1] { LazyJavaClassifierType@35['Collection<E>'] }
 }
 
 LazyJavaClassTypeConstructor@3['AbstractList'] {
-    _parameters = ArrayList@36[1] { LazyJavaTypeParameterDescriptor@37['E'] }
-    _supertypes = ArrayList@38[2] { LazyJavaClassifierType@39['AbstractCollection<E>'], LazyJavaClassifierType@40['List<E>'] }
+    parameters = ArrayList@36[1] { LazyJavaTypeParameterDescriptor@37['E'] }
+    supertypes = ArrayList@38[2] { LazyJavaClassifierType@39['AbstractCollection<E>'], LazyJavaClassifierType@40['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@10['ArrayList'] {
-    _parameters = ArrayList@41[1] { LazyJavaTypeParameterDescriptor@42['E'] }
-    _supertypes = ArrayList@43[5] { LazyJavaClassifierType@44['AbstractList<E>'], LazyJavaClassifierType@45['List<E>'], LazyJavaClassifierType@46['RandomAccess'], ... }
+LazyJavaClassTypeConstructor@11['ArrayList'] {
+    parameters = ArrayList@41[1] { LazyJavaTypeParameterDescriptor@42['E'] }
+    supertypes = ArrayList@43[5] { LazyJavaClassifierType@44['AbstractList<E>'], LazyJavaClassifierType@45['List<E>'], LazyJavaClassifierType@46['RandomAccess'], ... }
 }
 
-LazyJavaClassTypeConstructor@21['Collections'] {
-    _supertypes = ArrayList@47[1] { JetTypeImpl@48['Any'] }
+LazyJavaClassTypeConstructor@25['Collections'] {
+    supertypes = ArrayList@47[1] { JetTypeImpl@48['Any'] }
 }
 
-LazyJavaClassTypeConstructor@28['Comparator'] {
-    _parameters = ArrayList@49[1] { LazyJavaTypeParameterDescriptor@50['T'] }
-    _supertypes = ArrayList@51[1] { JetTypeImpl@48['Any'] }
+LazyJavaClassTypeConstructor@29['Comparator'] {
+    parameters = ArrayList@49[1] { LazyJavaTypeParameterDescriptor@50['T'] }
+    supertypes = ArrayList@51[1] { JetTypeImpl@48['Any'] }
 }
 
 LazyJavaClassifierType@39['AbstractCollection<E>'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
     classifier = JavaClassImpl@52['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
 }
 
 LazyJavaClassifierType@44['AbstractList<E>'] {
-    _arguments = ArrayList@53[1] { TypeProjectionImpl@54 }
-    _typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
+    arguments = ArrayList@53[1] { TypeProjectionImpl@54 }
     classifier = JavaClassImpl@55['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
 }
 
 LazyJavaClassifierType@56['Cloneable'] {
-    _typeConstructor = DeserializedClassTypeConstructor@57
-    classifier = JavaClassImpl@58['Cloneable']
+    classifier = JavaClassImpl@57['Cloneable']
+    typeConstructor = DeserializedClassTypeConstructor@58
 }
 
 LazyJavaClassifierType@59['Collection<? extends E>'] {
-    _arguments = ArrayList@60[1] { TypeProjectionImpl@61 }
-    _memberScope = SubstitutingScope@62
-    _nullable = 'false': Boolean@63
-    _typeConstructor = DeserializedClassTypeConstructor@64
-    classifier = JavaClassImpl@65['Collection']
+    arguments = ArrayList@60[1] { TypeProjectionImpl@61 }
+    classifier = JavaClassImpl@62['Collection']
+    memberScope = SubstitutingScope@63
+    nullable = 'false': Boolean@64
+    typeConstructor = DeserializedClassTypeConstructor@65
 }
 
 LazyJavaClassifierType@66['Collection<? extends E>'] {
-    _arguments = ArrayList@67[1] { TypeProjectionImpl@68 }
-    _memberScope = SubstitutingScope@69
-    _nullable = 'true': Boolean@70
-    _typeConstructor = DeserializedClassTypeConstructor@71
-    classifier = JavaClassImpl@65['Collection']
+    arguments = ArrayList@67[1] { TypeProjectionImpl@68 }
+    classifier = JavaClassImpl@62['Collection']
+    memberScope = SubstitutingScope@69
+    nullable = 'true': Boolean@70
+    typeConstructor = DeserializedClassTypeConstructor@71
 }
 
 LazyJavaClassifierType@35['Collection<E>'] {
-    _typeConstructor = DeserializedClassTypeConstructor@64
     classifier = JavaClassImpl@72['Collection']
+    typeConstructor = DeserializedClassTypeConstructor@65
 }
 
 LazyJavaClassifierType@73['Comparable<? super T>'] {
-    _arguments = ArrayList@74[1] { TypeProjectionImpl@75 }
-    _memberScope = SubstitutingScope@76
-    _nullable = 'false': Boolean@63
-    _typeConstructor = DeserializedClassTypeConstructor@77
-    classifier = JavaClassImpl@78['Comparable']
+    arguments = ArrayList@74[1] { TypeProjectionImpl@75 }
+    classifier = JavaClassImpl@76['Comparable']
+    memberScope = SubstitutingScope@77
+    nullable = 'false': Boolean@64
+    typeConstructor = DeserializedClassTypeConstructor@78
 }
 
 LazyJavaClassifierType@79['Comparable<? super T>'] {
-    _arguments = ArrayList@80[1] { TypeProjectionImpl@81 }
-    _memberScope = SubstitutingScope@82
-    _nullable = 'true': Boolean@70
-    _typeConstructor = DeserializedClassTypeConstructor@77
-    classifier = JavaClassImpl@78['Comparable']
+    arguments = ArrayList@80[1] { TypeProjectionImpl@81 }
+    classifier = JavaClassImpl@76['Comparable']
+    memberScope = SubstitutingScope@82
+    nullable = 'true': Boolean@70
+    typeConstructor = DeserializedClassTypeConstructor@78
 }
 
 LazyJavaClassifierType@83['Comparator<? super T>'] {
-    _arguments = ArrayList@84[1] { TypeProjectionImpl@85 }
-    _memberScope = SubstitutingScope@86
-    _nullable = 'false': Boolean@63
-    _typeConstructor = LazyJavaClassTypeConstructor@28['Comparator']
-    classifier = JavaClassImpl@87['Comparator']
+    arguments = ArrayList@84[1] { TypeProjectionImpl@85 }
+    classifier = JavaClassImpl@86['Comparator']
+    memberScope = SubstitutingScope@87
+    nullable = 'false': Boolean@64
+    typeConstructor = LazyJavaClassTypeConstructor@29['Comparator']
 }
 
 LazyJavaClassifierType@88['Comparator<? super T>'] {
-    _arguments = ArrayList@89[1] { TypeProjectionImpl@90 }
-    _memberScope = SubstitutingScope@91
-    _nullable = 'true': Boolean@70
-    _typeConstructor = LazyJavaClassTypeConstructor@28['Comparator']
-    classifier = JavaClassImpl@87['Comparator']
+    arguments = ArrayList@89[1] { TypeProjectionImpl@90 }
+    classifier = JavaClassImpl@86['Comparator']
+    memberScope = SubstitutingScope@91
+    nullable = 'true': Boolean@70
+    typeConstructor = LazyJavaClassTypeConstructor@29['Comparator']
 }
 
 LazyJavaClassifierType@92['E'] {
-    _arguments = ArrayList@93[empty]
-    _nullable = 'false': Boolean@63
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
-    classifier = JavaTypeParameterImpl@95['E']
+    arguments = ArrayList@93[empty]
+    classifier = JavaTypeParameterImpl@94['E']
+    nullable = 'false': Boolean@64
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
 LazyJavaClassifierType@96['E'] {
-    _arguments = ArrayList@97[empty]
-    _nullable = 'false': Boolean@63
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@98
-    classifier = JavaTypeParameterImpl@99['E']
+    arguments = ArrayList@97[empty]
+    classifier = JavaTypeParameterImpl@98['E']
+    nullable = 'false': Boolean@64
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@100['E'] {
-    _arguments = ArrayList@101[empty]
-    _nullable = 'false': Boolean@63
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
+    arguments = ArrayList@101[empty]
     classifier = JavaTypeParameterImpl@102['E']
+    nullable = 'false': Boolean@64
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
 LazyJavaClassifierType@103['E'] {
-    _arguments = ArrayList@104[empty]
-    _nullable = 'false': Boolean@63
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
+    arguments = ArrayList@104[empty]
     classifier = JavaTypeParameterImpl@105['E']
+    nullable = 'false': Boolean@64
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
 LazyJavaClassifierType@106['E'] {
-    _arguments = ArrayList@107[empty]
-    _nullable = 'true': Boolean@70
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@98
-    classifier = JavaTypeParameterImpl@99['E']
+    arguments = ArrayList@107[empty]
+    classifier = JavaTypeParameterImpl@105['E']
+    nullable = 'true': Boolean@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
 LazyJavaClassifierType@108['E'] {
-    _arguments = ArrayList@109[empty]
-    _nullable = 'true': Boolean@70
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
-    classifier = JavaTypeParameterImpl@102['E']
+    arguments = ArrayList@109[empty]
+    classifier = JavaTypeParameterImpl@94['E']
+    nullable = 'true': Boolean@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
 LazyJavaClassifierType@110['E'] {
-    _arguments = ArrayList@111[empty]
-    _nullable = 'true': Boolean@70
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
-    classifier = JavaTypeParameterImpl@95['E']
+    arguments = ArrayList@111[empty]
+    classifier = JavaTypeParameterImpl@98['E']
+    nullable = 'true': Boolean@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@112['E'] {
-    _arguments = ArrayList@113[empty]
-    _nullable = 'true': Boolean@70
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
-    classifier = JavaTypeParameterImpl@105['E']
+    arguments = ArrayList@113[empty]
+    classifier = JavaTypeParameterImpl@102['E']
+    nullable = 'true': Boolean@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
 LazyJavaClassifierType@40['List<E>'] {
-    _arguments = ArrayList@114[1] { TypeProjectionImpl@115 }
-    _typeConstructor = DeserializedClassTypeConstructor@116
-    classifier = JavaClassImpl@117['List']
+    arguments = ArrayList@114[1] { TypeProjectionImpl@115 }
+    classifier = JavaClassImpl@116['List']
+    typeConstructor = DeserializedClassTypeConstructor@117
 }
 
 LazyJavaClassifierType@45['List<E>'] {
-    _typeConstructor = DeserializedClassTypeConstructor@116
     classifier = JavaClassImpl@118['List']
+    typeConstructor = DeserializedClassTypeConstructor@117
 }
 
 LazyJavaClassifierType@119['List<T>'] {
-    _arguments = ArrayList@120[1] { TypeProjectionImpl@121 }
-    _memberScope = SubstitutingScope@122
-    _nullable = 'false': Boolean@63
-    _typeConstructor = DeserializedClassTypeConstructor@116
-    classifier = JavaClassImpl@123['List']
+    arguments = ArrayList@120[1] { TypeProjectionImpl@121 }
+    classifier = JavaClassImpl@122['List']
+    memberScope = SubstitutingScope@123
+    nullable = 'false': Boolean@64
+    typeConstructor = DeserializedClassTypeConstructor@117
 }
 
 LazyJavaClassifierType@124['List<T>'] {
-    _arguments = ArrayList@125[1] { TypeProjectionImpl@126 }
-    _memberScope = SubstitutingScope@127
-    _nullable = 'false': Boolean@63
-    _typeConstructor = DeserializedClassTypeConstructor@116
-    classifier = JavaClassImpl@128['List']
+    arguments = ArrayList@125[1] { TypeProjectionImpl@126 }
+    classifier = JavaClassImpl@127['List']
+    memberScope = SubstitutingScope@128
+    nullable = 'false': Boolean@64
+    typeConstructor = DeserializedClassTypeConstructor@117
 }
 
 LazyJavaClassifierType@129['List<T>'] {
-    _arguments = ArrayList@130[1] { TypeProjectionImpl@131 }
-    _memberScope = SubstitutingScope@132
-    _nullable = 'true': Boolean@70
-    _typeConstructor = DeserializedClassTypeConstructor@133
-    classifier = JavaClassImpl@123['List']
+    arguments = ArrayList@130[1] { TypeProjectionImpl@131 }
+    classifier = JavaClassImpl@127['List']
+    memberScope = SubstitutingScope@132
+    nullable = 'true': Boolean@70
+    typeConstructor = DeserializedClassTypeConstructor@133
 }
 
 LazyJavaClassifierType@134['List<T>'] {
-    _arguments = ArrayList@135[1] { TypeProjectionImpl@136 }
-    _memberScope = SubstitutingScope@137
-    _nullable = 'true': Boolean@70
-    _typeConstructor = DeserializedClassTypeConstructor@133
-    classifier = JavaClassImpl@128['List']
+    arguments = ArrayList@135[1] { TypeProjectionImpl@136 }
+    classifier = JavaClassImpl@122['List']
+    memberScope = SubstitutingScope@137
+    nullable = 'true': Boolean@70
+    typeConstructor = DeserializedClassTypeConstructor@133
 }
 
 LazyJavaClassifierType@138['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@139
-    classifier = JavaClassImpl@140['Object']
+    classifier = JavaClassImpl@139['Object']
+    typeConstructor = DeserializedClassTypeConstructor@140
 }
 
 LazyJavaClassifierType@141['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@139
     classifier = JavaClassImpl@142['Object']
+    typeConstructor = DeserializedClassTypeConstructor@140
 }
 
 LazyJavaClassifierType@143['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@139
     classifier = JavaClassImpl@144['Object']
+    typeConstructor = DeserializedClassTypeConstructor@140
 }
 
 LazyJavaClassifierType@46['RandomAccess'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@31['RandomAccess']
     classifier = JavaClassImpl@145['RandomAccess']
+    typeConstructor = LazyJavaClassTypeConstructor@31['RandomAccess']
 }
 
 LazyJavaClassifierType@146['Serializable'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@33['Serializable']
     classifier = JavaClassImpl@147['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@33['Serializable']
 }
 
 LazyJavaClassifierType@148['T'] {
-    _arguments = ArrayList@149[empty]
-    _nullable = 'false': Boolean@63
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@150
-    classifier = JavaTypeParameterImpl@151['T']
+    arguments = ArrayList@149[empty]
+    classifier = JavaTypeParameterImpl@150['T']
+    nullable = 'false': Boolean@64
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
 }
 
 LazyJavaClassifierType@152['T'] {
-    _arguments = ArrayList@153[empty]
-    _nullable = 'false': Boolean@63
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@154
-    classifier = JavaTypeParameterImpl@155['T']
+    arguments = ArrayList@153[empty]
+    classifier = JavaTypeParameterImpl@154['T']
+    nullable = 'false': Boolean@64
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
 }
 
 LazyJavaClassifierType@156['T'] {
-    _arguments = ArrayList@157[empty]
-    _nullable = 'false': Boolean@63
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@158
-    classifier = JavaTypeParameterImpl@159['T']
+    arguments = ArrayList@157[empty]
+    classifier = JavaTypeParameterImpl@158['T']
+    nullable = 'false': Boolean@64
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
 }
 
-LazyJavaClassifierType@160['T'] {
-    _arguments = ArrayList@161[empty]
-    _nullable = 'false': Boolean@63
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@150
-    classifier = JavaTypeParameterImpl@162['T']
+LazyJavaClassifierType@159['T'] {
+    arguments = ArrayList@160[empty]
+    classifier = JavaTypeParameterImpl@161['T']
+    nullable = 'false': Boolean@64
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@162
 }
 
 LazyJavaClassifierType@163['T'] {
-    _arguments = ArrayList@164[empty]
-    _nullable = 'false': Boolean@63
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@154
+    arguments = ArrayList@164[empty]
     classifier = JavaTypeParameterImpl@165['T']
+    nullable = 'false': Boolean@64
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
 }
 
 LazyJavaClassifierType@166['T'] {
-    _arguments = ArrayList@167[empty]
-    _nullable = 'false': Boolean@63
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@150
+    arguments = ArrayList@167[empty]
     classifier = JavaTypeParameterImpl@168['T']
+    nullable = 'false': Boolean@64
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
 }
 
 LazyJavaClassifierType@169['T'] {
-    _arguments = ArrayList@170[empty]
-    _nullable = 'false': Boolean@63
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@154
+    arguments = ArrayList@170[empty]
     classifier = JavaTypeParameterImpl@171['T']
+    nullable = 'false': Boolean@64
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@162
 }
 
 LazyJavaClassifierType@172['T'] {
-    _arguments = ArrayList@173[empty]
-    _nullable = 'false': Boolean@63
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@158
+    arguments = ArrayList@173[empty]
     classifier = JavaTypeParameterImpl@174['T']
+    nullable = 'false': Boolean@64
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
 }
 
 LazyJavaClassifierType@175['T'] {
-    _arguments = ArrayList@176[empty]
-    _nullable = 'false': Boolean@63
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@154
+    arguments = ArrayList@176[empty]
     classifier = JavaTypeParameterImpl@177['T']
+    nullable = 'false': Boolean@64
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@162
 }
 
 LazyJavaClassifierType@178['T'] {
-    _arguments = ArrayList@179[empty]
-    _nullable = 'false': Boolean@63
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@150
+    arguments = ArrayList@179[empty]
     classifier = JavaTypeParameterImpl@180['T']
+    nullable = 'false': Boolean@64
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@162
 }
 
 LazyJavaClassifierType@181['T'] {
-    _arguments = ArrayList@182[empty]
-    _nullable = 'true': Boolean@70
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@150
-    classifier = JavaTypeParameterImpl@151['T']
+    arguments = ArrayList@182[empty]
+    classifier = JavaTypeParameterImpl@154['T']
+    nullable = 'true': Boolean@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
 }
 
 LazyJavaClassifierType@183['T'] {
-    _arguments = ArrayList@184[empty]
-    _nullable = 'true': Boolean@70
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@154
-    classifier = JavaTypeParameterImpl@171['T']
+    arguments = ArrayList@184[empty]
+    classifier = JavaTypeParameterImpl@177['T']
+    nullable = 'true': Boolean@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@162
 }
 
 LazyJavaClassifierType@185['T'] {
-    _arguments = ArrayList@186[empty]
-    _nullable = 'true': Boolean@70
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@154
-    classifier = JavaTypeParameterImpl@155['T']
+    arguments = ArrayList@186[empty]
+    classifier = JavaTypeParameterImpl@161['T']
+    nullable = 'true': Boolean@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@162
 }
 
 LazyJavaClassifierType@187['T'] {
-    _arguments = ArrayList@188[empty]
-    _nullable = 'true': Boolean@70
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@158
-    classifier = JavaTypeParameterImpl@174['T']
+    arguments = ArrayList@188[empty]
+    classifier = JavaTypeParameterImpl@158['T']
+    nullable = 'true': Boolean@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
 }
 
 LazyJavaClassifierType@189['T'] {
-    _arguments = ArrayList@190[empty]
-    _nullable = 'true': Boolean@70
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@154
+    arguments = ArrayList@190[empty]
     classifier = JavaTypeParameterImpl@165['T']
+    nullable = 'true': Boolean@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
 }
 
 LazyJavaClassifierType@191['T'] {
-    _arguments = ArrayList@192[empty]
-    _nullable = 'true': Boolean@70
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@150
-    classifier = JavaTypeParameterImpl@168['T']
+    arguments = ArrayList@192[empty]
+    classifier = JavaTypeParameterImpl@171['T']
+    nullable = 'true': Boolean@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@162
 }
 
 LazyJavaClassifierType@193['T'] {
-    _arguments = ArrayList@194[empty]
-    _nullable = 'true': Boolean@70
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@150
-    classifier = JavaTypeParameterImpl@180['T']
+    arguments = ArrayList@194[empty]
+    classifier = JavaTypeParameterImpl@150['T']
+    nullable = 'true': Boolean@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
 }
 
 LazyJavaClassifierType@195['T'] {
-    _arguments = ArrayList@196[empty]
-    _nullable = 'true': Boolean@70
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@150
-    classifier = JavaTypeParameterImpl@162['T']
+    arguments = ArrayList@196[empty]
+    classifier = JavaTypeParameterImpl@174['T']
+    nullable = 'true': Boolean@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
 }
 
 LazyJavaClassifierType@197['T'] {
-    _arguments = ArrayList@198[empty]
-    _nullable = 'true': Boolean@70
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@158
-    classifier = JavaTypeParameterImpl@159['T']
+    arguments = ArrayList@198[empty]
+    classifier = JavaTypeParameterImpl@180['T']
+    nullable = 'true': Boolean@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@162
 }
 
 LazyJavaClassifierType@199['T'] {
-    _arguments = ArrayList@200[empty]
-    _nullable = 'true': Boolean@70
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@154
-    classifier = JavaTypeParameterImpl@177['T']
+    arguments = ArrayList@200[empty]
+    classifier = JavaTypeParameterImpl@168['T']
+    nullable = 'true': Boolean@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
 }
 
 LazyJavaPackageFragmentProvider@201 {
-    _packageFragments('<root>': FqName@202) = LazyJavaPackageFragment@203['<root>']
-    _packageFragments('Collections': FqName@204) = null
-    _packageFragments('Comparable': FqName@205) = null
-    _packageFragments('List': FqName@206) = null
-    _packageFragments('MutableList': FqName@207) = null
-    _packageFragments('T': FqName@208) = null
-    _packageFragments('java': FqName@209) = LazyJavaPackageFragment@210['java']
-    _packageFragments('java.io': FqName@211) = LazyJavaPackageFragment@212['io']
-    _packageFragments('java.lang': FqName@213) = LazyJavaPackageFragment@214['lang']
-    _packageFragments('java.lang.Collections': FqName@215) = null
-    _packageFragments('java.lang.Comparable': FqName@216) = null
-    _packageFragments('java.lang.List': FqName@217) = null
-    _packageFragments('java.lang.MutableList': FqName@218) = null
-    _packageFragments('java.lang.T': FqName@219) = null
-    _packageFragments('java.util': FqName@220) = LazyJavaPackageFragment@221['util']
-    _packageFragments('java.util.Collections': FqName@222) = null
-    _packageFragments('java.util.Comparable': FqName@223) = null
-    _packageFragments('java.util.List': FqName@224) = null
-    _packageFragments('java.util.MutableList': FqName@225) = null
-    _packageFragments('java.util.T': FqName@226) = null
-    _packageFragments('kotlin': FqName@227) = null
-    _packageFragments('kotlin.Collections': FqName@228) = null
-    _packageFragments('kotlin.Comparable': FqName@229) = null
-    _packageFragments('kotlin.List': FqName@230) = null
-    _packageFragments('kotlin.MutableList': FqName@231) = null
-    _packageFragments('kotlin.T': FqName@232) = null
-    _packageFragments('kotlin.io': FqName@233) = null
-    _packageFragments('kotlin.jvm': FqName@234) = null
+    packageFragments('<root>': FqName@202) = LazyJavaPackageFragment@203['<root>']
+    packageFragments('Collections': FqName@204) = null
+    packageFragments('Comparable': FqName@205) = null
+    packageFragments('List': FqName@206) = null
+    packageFragments('MutableList': FqName@207) = null
+    packageFragments('T': FqName@208) = null
+    packageFragments('java': FqName@209) = LazyJavaPackageFragment@210['java']
+    packageFragments('java.io': FqName@211) = LazyJavaPackageFragment@212['io']
+    packageFragments('java.lang': FqName@213) = LazyJavaPackageFragment@214['lang']
+    packageFragments('java.lang.Collections': FqName@215) = null
+    packageFragments('java.lang.Comparable': FqName@216) = null
+    packageFragments('java.lang.List': FqName@217) = null
+    packageFragments('java.lang.MutableList': FqName@218) = null
+    packageFragments('java.lang.T': FqName@219) = null
+    packageFragments('java.util': FqName@220) = LazyJavaPackageFragment@221['util']
+    packageFragments('java.util.Collections': FqName@222) = null
+    packageFragments('java.util.Comparable': FqName@223) = null
+    packageFragments('java.util.List': FqName@224) = null
+    packageFragments('java.util.MutableList': FqName@225) = null
+    packageFragments('java.util.T': FqName@226) = null
+    packageFragments('kotlin': FqName@227) = null
+    packageFragments('kotlin.Collections': FqName@228) = null
+    packageFragments('kotlin.Comparable': FqName@229) = null
+    packageFragments('kotlin.List': FqName@230) = null
+    packageFragments('kotlin.MutableList': FqName@231) = null
+    packageFragments('kotlin.T': FqName@232) = null
+    packageFragments('kotlin.io': FqName@233) = null
+    packageFragments('kotlin.jvm': FqName@234) = null
     topLevelClasses(JavaClassImpl@52['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
     topLevelClasses(JavaClassImpl@55['AbstractList']) = LazyJavaClassDescriptor@2['AbstractList']
     topLevelClasses(JavaClassImpl@235['ArrayList']) = LazyJavaClassDescriptor@4['ArrayList']
     topLevelClasses(JavaClassImpl@236['Collections']) = LazyJavaClassDescriptor@12['Collections']
-    topLevelClasses(JavaClassImpl@87['Comparator']) = LazyJavaClassDescriptor@26['Comparator']
+    topLevelClasses(JavaClassImpl@86['Comparator']) = LazyJavaClassDescriptor@26['Comparator']
     topLevelClasses(JavaClassImpl@237['List']) = LazyJavaClassDescriptor@238['List']
     topLevelClasses(JavaClassImpl@145['RandomAccess']) = LazyJavaClassDescriptor@30['RandomAccess']
     topLevelClasses(JavaClassImpl@147['Serializable']) = LazyJavaClassDescriptor@32['Serializable']
 }
 
 LazyJavaPackageFragment@203['<root>'] {
-    _functions('ArrayList': Name@239) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@240
-    _functions('java': Name@241) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@240
     classes('ArrayList': Name@239) = null // through LazyPackageFragmentScopeForJavaPackage@240
-    classes('Collections': Name@242) = null // through LazyPackageFragmentScopeForJavaPackage@240
-    classes('Comparable': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@240
-    classes('List': Name@244) = null // through LazyPackageFragmentScopeForJavaPackage@240
-    classes('MutableList': Name@245) = null // through LazyPackageFragmentScopeForJavaPackage@240
-    classes('java': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@240
-    deserializedPackageScope = Empty@247 // through LazyPackageFragmentScopeForJavaPackage@240
+    classes('Collections': Name@241) = null // through LazyPackageFragmentScopeForJavaPackage@240
+    classes('Comparable': Name@242) = null // through LazyPackageFragmentScopeForJavaPackage@240
+    classes('List': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@240
+    classes('MutableList': Name@244) = null // through LazyPackageFragmentScopeForJavaPackage@240
+    classes('java': Name@245) = null // through LazyPackageFragmentScopeForJavaPackage@240
+    deserializedPackageScope = Empty@246 // through LazyPackageFragmentScopeForJavaPackage@240
+    functions('ArrayList': Name@239) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@240
+    functions('java': Name@247) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@240
     memberIndex = computeMemberIndex$1@248 // through LazyPackageFragmentScopeForJavaPackage@240
 }
 
 LazyJavaPackageFragment@210['java'] {
-    _functions('lang': Name@249) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@250
-    _functions('util': Name@251) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@250
-    classes('lang': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@250
-    classes('util': Name@253) = null // through LazyPackageFragmentScopeForJavaPackage@250
-    deserializedPackageScope = Empty@247 // through LazyPackageFragmentScopeForJavaPackage@250
+    classes('lang': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@250
+    classes('util': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@250
+    deserializedPackageScope = Empty@246 // through LazyPackageFragmentScopeForJavaPackage@250
+    functions('lang': Name@252) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@250
+    functions('util': Name@253) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@250
     memberIndex = computeMemberIndex$1@254 // through LazyPackageFragmentScopeForJavaPackage@250
 }
 
 LazyJavaPackageFragment@214['lang'] {
-    _functions('ArrayList': Name@239) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@255
     classes('ArrayList': Name@239) = null // through LazyPackageFragmentScopeForJavaPackage@255
-    deserializedPackageScope = Empty@247 // through LazyPackageFragmentScopeForJavaPackage@255
+    deserializedPackageScope = Empty@246 // through LazyPackageFragmentScopeForJavaPackage@255
+    functions('ArrayList': Name@239) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@255
     memberIndex = computeMemberIndex$1@256 // through LazyPackageFragmentScopeForJavaPackage@255
 }
 
 LazyJavaPackageFragment@221['util'] {
-    _functions('ArrayList': Name@239) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@257
     classes('ArrayList': Name@239) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@257
-    classes('Collections': Name@242) = LazyJavaClassDescriptor@12['Collections'] // through LazyPackageFragmentScopeForJavaPackage@257
-    classes('Comparable': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@257
-    classes('List': Name@244) = LazyJavaClassDescriptor@238['List'] // through LazyPackageFragmentScopeForJavaPackage@257
-    classes('MutableList': Name@245) = null // through LazyPackageFragmentScopeForJavaPackage@257
-    deserializedPackageScope = Empty@247 // through LazyPackageFragmentScopeForJavaPackage@257
+    classes('Collections': Name@241) = LazyJavaClassDescriptor@12['Collections'] // through LazyPackageFragmentScopeForJavaPackage@257
+    classes('Comparable': Name@242) = null // through LazyPackageFragmentScopeForJavaPackage@257
+    classes('List': Name@243) = LazyJavaClassDescriptor@238['List'] // through LazyPackageFragmentScopeForJavaPackage@257
+    classes('MutableList': Name@244) = null // through LazyPackageFragmentScopeForJavaPackage@257
+    deserializedPackageScope = Empty@246 // through LazyPackageFragmentScopeForJavaPackage@257
+    functions('ArrayList': Name@239) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@257
     memberIndex = computeMemberIndex$1@258 // through LazyPackageFragmentScopeForJavaPackage@257
 }
 
 LazyJavaTypeParameterDescriptor@42['E'] {
     defaultType = JetTypeImpl@259['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
     upperBounds = LinkedHashSet@260[1] { NullableType@261 }
 }
 
 LazyJavaTypeParameterDescriptor@37['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@98
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaTypeParameterDescriptor@262['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@150
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
     upperBounds = LinkedHashSet@263[1] { DelegatingFlexibleType@264 }
     upperBoundsAsType = DelegatingFlexibleType@264
 }
 
-LazyJavaTypeParameterDescriptor@50['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@158
-    upperBounds = LinkedHashSet@265[1] { NullableType@266 }
-    upperBoundsAsType = NullableType@266
+LazyJavaTypeParameterDescriptor@265['T'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@162
+    upperBounds = LinkedHashSet@266[1] { NullableType@267 }
+    upperBoundsAsType = NullableType@267
 }
 
-LazyJavaTypeParameterDescriptor@267['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@154
+LazyJavaTypeParameterDescriptor@50['T'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
     upperBounds = LinkedHashSet@268[1] { NullableType@269 }
     upperBoundsAsType = NullableType@269
 }
 
 LazyJavaTypeParameterResolver@270 {
-    resolve(JavaTypeParameterImpl@99['E']) = LazyJavaTypeParameterDescriptor@37['E']
+    resolve(JavaTypeParameterImpl@271['E']) = LazyJavaTypeParameterDescriptor@42['E']
 }
 
-LazyJavaTypeParameterResolver@271 {
-    resolve(JavaTypeParameterImpl@272['E']) = LazyJavaTypeParameterDescriptor@42['E']
+LazyJavaTypeParameterResolver@272 {
+    resolve(JavaTypeParameterImpl@98['E']) = LazyJavaTypeParameterDescriptor@37['E']
 }
 
 LazyJavaTypeParameterResolver@273 {
-    resolve(JavaTypeParameterImpl@274['T']) = LazyJavaTypeParameterDescriptor@50['T']
+    resolve(JavaTypeParameterImpl@274['T']) = LazyJavaTypeParameterDescriptor@265['T']
 }
 
 LazyJavaTypeParameterResolver@275 {
-    resolve(JavaTypeParameterImpl@276['T']) = LazyJavaTypeParameterDescriptor@267['T']
+    resolve(JavaTypeParameterImpl@276['T']) = LazyJavaTypeParameterDescriptor@50['T']
 }
 
 LazyJavaTypeParameterResolver@277 {
@@ -524,5 +524,5 @@ LazyJavaTypeParameterResolver@277 {
 }
 
 LazyJavaTypeParameterResolver@279 {
-    resolve(JavaTypeParameterImpl@174['T']) = null
+    resolve(JavaTypeParameterImpl@150['T']) = null
 }

compiler/testData/diagnostics/tests/regressions/kt337.lazy.log

@@ -1,34 +1,34 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('A': FqName@3) = null
-    _packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    _packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    _packageFragments('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@2['<root>'] {
-    _functions('A': Name@11) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@13
-    _functions('foo': Name@14) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@13
-    classes('A': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@13
-    classes('foo': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@13
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@13
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@13
+    classes('A': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
+    classes('foo': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@12
+    deserializedPackageScope = Empty@14 // through LazyPackageFragmentScopeForJavaPackage@12
+    functions('A': Name@11) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
+    functions('foo': Name@13) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
+    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
 }
 
 LazyJavaPackageFragment@5['java'] {
-    _functions('lang': Name@17) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@14 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('lang': Name@19) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@18
     memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@7['lang'] {
-    _functions('A': Name@11) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    _functions('foo': Name@14) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@21
     classes('A': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('foo': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('foo': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    deserializedPackageScope = Empty@14 // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('A': Name@11) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('foo': Name@13) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@21
     memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@21
 }

compiler/testData/diagnostics/tests/regressions/kt352.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt353.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt3535.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt3647.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt3731.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt385.109.441.lazy.log

@@ -1,263 +1,263 @@
 LazyAnnotationDescriptor@0 {
-    _resolutionResults = OverloadResolutionResultsImpl@1
-    _type = JetTypeImpl@2['inline']
-    _valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['inline']
+    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
 }
 
 LazyJavaClassDescriptor@4['Appendable'] {
-    _functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _properties('println': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@7
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
+    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
+    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
+    typeConstructor = LazyJavaClassTypeConstructor@10['Appendable']
 }
 
 LazyJavaClassDescriptor@11['AutoCloseable'] {
-    _functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@12
-    _properties('println': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@12
-    _typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@12
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@12
+    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@12
+    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@12
+    typeConstructor = LazyJavaClassTypeConstructor@14['AutoCloseable']
 }
 
 LazyJavaClassDescriptor@15['Closeable'] {
-    _functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@16
-    _properties('println': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@16
-    _typeConstructor = LazyJavaClassTypeConstructor@17['Closeable']
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@16
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@16
+    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@16
+    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@16
+    typeConstructor = LazyJavaClassTypeConstructor@18['Closeable']
 }
 
 LazyJavaClassDescriptor@19['FilterOutputStream'] {
-    _functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@20
-    _properties('println': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@20
-    _typeConstructor = LazyJavaClassTypeConstructor@21['FilterOutputStream']
-    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@20
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@20
+    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@20
+    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@20
+    typeConstructor = LazyJavaClassTypeConstructor@22['FilterOutputStream']
 }
 
 LazyJavaClassDescriptor@23['OutputStream'] {
-    _functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@24
-    _properties('println': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@24
-    _typeConstructor = LazyJavaClassTypeConstructor@25['OutputStream']
-    memberIndex = computeMemberIndex$1@26 // through LazyJavaClassMemberScope@24
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@24
+    memberIndex = computeMemberIndex$1@25 // through LazyJavaClassMemberScope@24
+    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@24
+    typeConstructor = LazyJavaClassTypeConstructor@26['OutputStream']
 }
 
 LazyJavaClassDescriptor@27['PrintStream'] {
-    _functions('println': Name@8) = ArrayList@28[10] { JavaMethodDescriptor@29['println'], JavaMethodDescriptor@30['println'], JavaMethodDescriptor@31['println'], ... } // through LazyJavaClassMemberScope@32
-    _properties('println': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@32
-    _typeConstructor = LazyJavaClassTypeConstructor@33['PrintStream']
-    defaultType = JetTypeImpl@34['PrintStream']
-    enumEntryIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@32
-    memberIndex = computeMemberIndex$1@36 // through LazyJavaClassMemberScope@32
-    nestedClassIndex = LinkedHashMap@37 // through LazyJavaClassMemberScope@32
-    nestedClasses('println': Name@8) = null // through LazyJavaClassMemberScope@32
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@38['<this>']
+    defaultType = JetTypeImpl@28['PrintStream']
+    enumEntryIndex = LinkedHashMap@29 // through LazyJavaClassMemberScope@30
+    functions('println': Name@9) = ArrayList@31[10] { JavaMethodDescriptor@32['println'], JavaMethodDescriptor@33['println'], JavaMethodDescriptor@34['println'], ... } // through LazyJavaClassMemberScope@30
+    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@30
+    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@30
+    nestedClasses('println': Name@9) = null // through LazyJavaClassMemberScope@30
+    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@30
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@37['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@38['PrintStream']
 }
 
 LazyJavaClassDescriptor@39['System'] {
-    _properties('out': Name@40) = ArrayList@41[1] { JavaPropertyDescriptor@42['out'] } // through LazyJavaStaticClassScope@43
-    _properties('out': Name@40) = EmptyList@6[empty] // through LazyJavaClassMemberScope@44
-    _typeConstructor = LazyJavaClassTypeConstructor@45['System']
-    enumEntryIndex = LinkedHashMap@46 // through LazyJavaClassMemberScope@44
-    memberIndex = computeMemberIndex$1@47 // through LazyJavaClassMemberScope@44
-    memberIndex = computeMemberIndex$1@48 // through LazyJavaStaticClassScope@43
-    nestedClassIndex = LinkedHashMap@49 // through LazyJavaClassMemberScope@44
-    nestedClasses('out': Name@40) = null // through LazyJavaClassMemberScope@44
+    enumEntryIndex = LinkedHashMap@40 // through LazyJavaClassMemberScope@41
+    memberIndex = computeMemberIndex$1@42 // through LazyJavaClassMemberScope@41
+    memberIndex = computeMemberIndex$1@43 // through LazyJavaStaticClassScope@44
+    nestedClassIndex = LinkedHashMap@45 // through LazyJavaClassMemberScope@41
+    nestedClasses('out': Name@46) = null // through LazyJavaClassMemberScope@41
+    properties('out': Name@46) = ArrayList@47[1] { JavaPropertyDescriptor@48['out'] } // through LazyJavaStaticClassScope@44
+    properties('out': Name@46) = EmptyList@6[empty] // through LazyJavaClassMemberScope@41
+    typeConstructor = LazyJavaClassTypeConstructor@49['System']
 }
 
-LazyJavaClassTypeConstructor@9['Appendable'] {
-    _parameters = ArrayList@50[empty]
-    _supertypes = ArrayList@51[1] { JetTypeImpl@52['Any'] }
+LazyJavaClassTypeConstructor@10['Appendable'] {
+    parameters = ArrayList@50[empty]
+    supertypes = ArrayList@51[1] { JetTypeImpl@52['Any'] }
 }
 
-LazyJavaClassTypeConstructor@13['AutoCloseable'] {
-    _parameters = ArrayList@53[empty]
-    _supertypes = ArrayList@54[1] { JetTypeImpl@52['Any'] }
+LazyJavaClassTypeConstructor@14['AutoCloseable'] {
+    parameters = ArrayList@53[empty]
+    supertypes = ArrayList@54[1] { JetTypeImpl@52['Any'] }
 }
 
-LazyJavaClassTypeConstructor@17['Closeable'] {
-    _parameters = ArrayList@55[empty]
-    _supertypes = ArrayList@56[1] { LazyJavaClassifierType@57['AutoCloseable'] }
+LazyJavaClassTypeConstructor@18['Closeable'] {
+    parameters = ArrayList@55[empty]
+    supertypes = ArrayList@56[1] { LazyJavaClassifierType@57['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@21['FilterOutputStream'] {
-    _parameters = ArrayList@58[empty]
-    _supertypes = ArrayList@59[1] { LazyJavaClassifierType@60['OutputStream'] }
+LazyJavaClassTypeConstructor@22['FilterOutputStream'] {
+    parameters = ArrayList@58[empty]
+    supertypes = ArrayList@59[1] { LazyJavaClassifierType@60['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@25['OutputStream'] {
-    _parameters = ArrayList@61[empty]
-    _supertypes = ArrayList@62[1] { LazyJavaClassifierType@63['Closeable'] }
+LazyJavaClassTypeConstructor@26['OutputStream'] {
+    parameters = ArrayList@61[empty]
+    supertypes = ArrayList@62[1] { LazyJavaClassifierType@63['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@33['PrintStream'] {
-    _parameters = ArrayList@64[empty]
-    _supertypes = ArrayList@65[3] { LazyJavaClassifierType@66['FilterOutputStream'], LazyJavaClassifierType@67['Appendable'], LazyJavaClassifierType@68['Closeable'] }
+LazyJavaClassTypeConstructor@38['PrintStream'] {
+    parameters = ArrayList@64[empty]
+    supertypes = ArrayList@65[3] { LazyJavaClassifierType@66['FilterOutputStream'], LazyJavaClassifierType@67['Appendable'], LazyJavaClassifierType@68['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@45['System'] {
-    _supertypes = ArrayList@69[1] { JetTypeImpl@52['Any'] }
+LazyJavaClassTypeConstructor@49['System'] {
+    supertypes = ArrayList@69[1] { JetTypeImpl@52['Any'] }
 }
 
 LazyJavaClassifierType@67['Appendable'] {
-    _arguments = ArrayList@70[empty]
-    _memberScope = LazyJavaClassMemberScope@7
-    _typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
+    arguments = ArrayList@70[empty]
     classifier = JavaClassImpl@71['Appendable']
+    memberScope = LazyJavaClassMemberScope@7
+    typeConstructor = LazyJavaClassTypeConstructor@10['Appendable']
 }
 
 LazyJavaClassifierType@57['AutoCloseable'] {
-    _arguments = ArrayList@72[empty]
-    _memberScope = LazyJavaClassMemberScope@12
-    _typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
+    arguments = ArrayList@72[empty]
     classifier = JavaClassImpl@73['AutoCloseable']
-}
-
-LazyJavaClassifierType@63['Closeable'] {
-    _arguments = ArrayList@74[empty]
-    _memberScope = LazyJavaClassMemberScope@16
-    _typeConstructor = LazyJavaClassTypeConstructor@17['Closeable']
-    classifier = JavaClassImpl@75['Closeable']
+    memberScope = LazyJavaClassMemberScope@12
+    typeConstructor = LazyJavaClassTypeConstructor@14['AutoCloseable']
 }
 
 LazyJavaClassifierType@68['Closeable'] {
-    _arguments = ArrayList@76[empty]
-    _memberScope = LazyJavaClassMemberScope@16
-    _typeConstructor = LazyJavaClassTypeConstructor@17['Closeable']
+    arguments = ArrayList@74[empty]
+    classifier = JavaClassImpl@75['Closeable']
+    memberScope = LazyJavaClassMemberScope@16
+    typeConstructor = LazyJavaClassTypeConstructor@18['Closeable']
+}
+
+LazyJavaClassifierType@63['Closeable'] {
+    arguments = ArrayList@76[empty]
     classifier = JavaClassImpl@77['Closeable']
+    memberScope = LazyJavaClassMemberScope@16
+    typeConstructor = LazyJavaClassTypeConstructor@18['Closeable']
 }
 
 LazyJavaClassifierType@66['FilterOutputStream'] {
-    _arguments = ArrayList@78[empty]
-    _memberScope = LazyJavaClassMemberScope@20
-    _typeConstructor = LazyJavaClassTypeConstructor@21['FilterOutputStream']
+    arguments = ArrayList@78[empty]
     classifier = JavaClassImpl@79['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@20
+    typeConstructor = LazyJavaClassTypeConstructor@22['FilterOutputStream']
 }
 
 LazyJavaClassifierType@80['Flushable'] {
-    _typeConstructor = TypeConstructorImpl$1@81
     classifier = null
+    typeConstructor = TypeConstructorImpl$1@81
 }
 
 LazyJavaClassifierType@82['Object'] {
-    _arguments = ArrayList@83[empty]
-    _nullable = 'false': Boolean@84
-    _typeConstructor = DeserializedClassTypeConstructor@85
-    classifier = JavaClassImpl@86['Object']
+    arguments = ArrayList@83[empty]
+    classifier = JavaClassImpl@84['Object']
+    nullable = 'false': Boolean@85
+    typeConstructor = DeserializedClassTypeConstructor@86
 }
 
 LazyJavaClassifierType@87['Object'] {
-    _arguments = ArrayList@88[empty]
-    _nullable = 'true': Boolean@89
-    _typeConstructor = DeserializedClassTypeConstructor@85
-    classifier = JavaClassImpl@86['Object']
+    arguments = ArrayList@88[empty]
+    classifier = JavaClassImpl@84['Object']
+    nullable = 'true': Boolean@89
+    typeConstructor = DeserializedClassTypeConstructor@86
 }
 
 LazyJavaClassifierType@90['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@85
     classifier = JavaClassImpl@91['Object']
+    typeConstructor = DeserializedClassTypeConstructor@86
 }
 
 LazyJavaClassifierType@92['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@85
     classifier = JavaClassImpl@93['Object']
+    typeConstructor = DeserializedClassTypeConstructor@86
 }
 
 LazyJavaClassifierType@94['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@85
     classifier = JavaClassImpl@95['Object']
+    typeConstructor = DeserializedClassTypeConstructor@86
 }
 
 LazyJavaClassifierType@96['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@85
     classifier = JavaClassImpl@97['Object']
+    typeConstructor = DeserializedClassTypeConstructor@86
 }
 
 LazyJavaClassifierType@60['OutputStream'] {
-    _arguments = ArrayList@98[empty]
-    _memberScope = LazyJavaClassMemberScope@24
-    _typeConstructor = LazyJavaClassTypeConstructor@25['OutputStream']
+    arguments = ArrayList@98[empty]
     classifier = JavaClassImpl@99['OutputStream']
+    memberScope = LazyJavaClassMemberScope@24
+    typeConstructor = LazyJavaClassTypeConstructor@26['OutputStream']
 }
 
 LazyJavaClassifierType@100['PrintStream'] {
-    _arguments = ArrayList@101[empty]
-    _memberScope = LazyJavaClassMemberScope@32
-    _nullable = 'false': Boolean@84
-    _typeConstructor = LazyJavaClassTypeConstructor@33['PrintStream']
+    arguments = ArrayList@101[empty]
     classifier = JavaClassImpl@102['PrintStream']
+    memberScope = LazyJavaClassMemberScope@30
+    nullable = 'false': Boolean@85
+    typeConstructor = LazyJavaClassTypeConstructor@38['PrintStream']
 }
 
 LazyJavaClassifierType@103['PrintStream'] {
-    _arguments = ArrayList@104[empty]
-    _nullable = 'true': Boolean@89
-    _typeConstructor = LazyJavaClassTypeConstructor@33['PrintStream']
+    arguments = ArrayList@104[empty]
     classifier = JavaClassImpl@102['PrintStream']
+    nullable = 'true': Boolean@89
+    typeConstructor = LazyJavaClassTypeConstructor@38['PrintStream']
 }
 
 LazyJavaClassifierType@105['String'] {
-    _arguments = ArrayList@106[empty]
-    _nullable = 'false': Boolean@84
-    _typeConstructor = DeserializedClassTypeConstructor@107
-    classifier = JavaClassImpl@108['String']
+    arguments = ArrayList@106[empty]
+    classifier = JavaClassImpl@107['String']
+    nullable = 'false': Boolean@85
+    typeConstructor = DeserializedClassTypeConstructor@108
 }
 
 LazyJavaClassifierType@109['String'] {
-    _arguments = ArrayList@110[empty]
-    _nullable = 'true': Boolean@89
-    _typeConstructor = DeserializedClassTypeConstructor@107
-    classifier = JavaClassImpl@108['String']
+    arguments = ArrayList@110[empty]
+    classifier = JavaClassImpl@107['String']
+    nullable = 'true': Boolean@89
+    typeConstructor = DeserializedClassTypeConstructor@108
 }
 
 LazyJavaPackageFragmentProvider@111 {
-    _packageFragments('<root>': FqName@112) = LazyJavaPackageFragment@113['<root>']
-    _packageFragments('Array': FqName@114) = null
-    _packageFragments('Int': FqName@115) = null
-    _packageFragments('Iterable': FqName@116) = null
-    _packageFragments('Iterator': FqName@117) = null
-    _packageFragments('Long': FqName@118) = null
-    _packageFragments('String': FqName@119) = null
-    _packageFragments('System': FqName@120) = null
-    _packageFragments('T': FqName@121) = null
-    _packageFragments('Unit': FqName@122) = null
-    _packageFragments('inline': FqName@123) = null
-    _packageFragments('java': FqName@124) = LazyJavaPackageFragment@125['java']
-    _packageFragments('java.io': FqName@126) = LazyJavaPackageFragment@127['io']
-    _packageFragments('java.lang': FqName@128) = LazyJavaPackageFragment@129['lang']
-    _packageFragments('java.lang.Array': FqName@130) = null
-    _packageFragments('java.lang.Int': FqName@131) = null
-    _packageFragments('java.lang.Iterable': FqName@132) = null
-    _packageFragments('java.lang.Iterator': FqName@133) = null
-    _packageFragments('java.lang.Long': FqName@134) = null
-    _packageFragments('java.lang.String': FqName@135) = null
-    _packageFragments('java.lang.System': FqName@136) = null
-    _packageFragments('java.lang.T': FqName@137) = null
-    _packageFragments('java.lang.Unit': FqName@138) = null
-    _packageFragments('java.lang.inline': FqName@139) = null
-    _packageFragments('java.util': FqName@140) = LazyJavaPackageFragment@141['util']
-    _packageFragments('java.util.Array': FqName@142) = null
-    _packageFragments('java.util.Int': FqName@143) = null
-    _packageFragments('java.util.Iterable': FqName@144) = null
-    _packageFragments('java.util.Iterator': FqName@145) = null
-    _packageFragments('java.util.Long': FqName@146) = null
-    _packageFragments('java.util.String': FqName@147) = null
-    _packageFragments('java.util.System': FqName@148) = null
-    _packageFragments('java.util.T': FqName@149) = null
-    _packageFragments('java.util.Unit': FqName@150) = null
-    _packageFragments('java.util.inline': FqName@151) = null
-    _packageFragments('kotlin': FqName@152) = null
-    _packageFragments('kotlin.Array': FqName@153) = null
-    _packageFragments('kotlin.Int': FqName@154) = null
-    _packageFragments('kotlin.Iterable': FqName@155) = null
-    _packageFragments('kotlin.Iterator': FqName@156) = null
-    _packageFragments('kotlin.Long': FqName@157) = null
-    _packageFragments('kotlin.String': FqName@158) = null
-    _packageFragments('kotlin.System': FqName@159) = null
-    _packageFragments('kotlin.T': FqName@160) = null
-    _packageFragments('kotlin.Unit': FqName@161) = null
-    _packageFragments('kotlin.inline': FqName@162) = null
-    _packageFragments('kotlin.io': FqName@163) = null
-    _packageFragments('kotlin.jvm': FqName@164) = null
+    packageFragments('<root>': FqName@112) = LazyJavaPackageFragment@113['<root>']
+    packageFragments('Array': FqName@114) = null
+    packageFragments('Int': FqName@115) = null
+    packageFragments('Iterable': FqName@116) = null
+    packageFragments('Iterator': FqName@117) = null
+    packageFragments('Long': FqName@118) = null
+    packageFragments('String': FqName@119) = null
+    packageFragments('System': FqName@120) = null
+    packageFragments('T': FqName@121) = null
+    packageFragments('Unit': FqName@122) = null
+    packageFragments('inline': FqName@123) = null
+    packageFragments('java': FqName@124) = LazyJavaPackageFragment@125['java']
+    packageFragments('java.io': FqName@126) = LazyJavaPackageFragment@127['io']
+    packageFragments('java.lang': FqName@128) = LazyJavaPackageFragment@129['lang']
+    packageFragments('java.lang.Array': FqName@130) = null
+    packageFragments('java.lang.Int': FqName@131) = null
+    packageFragments('java.lang.Iterable': FqName@132) = null
+    packageFragments('java.lang.Iterator': FqName@133) = null
+    packageFragments('java.lang.Long': FqName@134) = null
+    packageFragments('java.lang.String': FqName@135) = null
+    packageFragments('java.lang.System': FqName@136) = null
+    packageFragments('java.lang.T': FqName@137) = null
+    packageFragments('java.lang.Unit': FqName@138) = null
+    packageFragments('java.lang.inline': FqName@139) = null
+    packageFragments('java.util': FqName@140) = LazyJavaPackageFragment@141['util']
+    packageFragments('java.util.Array': FqName@142) = null
+    packageFragments('java.util.Int': FqName@143) = null
+    packageFragments('java.util.Iterable': FqName@144) = null
+    packageFragments('java.util.Iterator': FqName@145) = null
+    packageFragments('java.util.Long': FqName@146) = null
+    packageFragments('java.util.String': FqName@147) = null
+    packageFragments('java.util.System': FqName@148) = null
+    packageFragments('java.util.T': FqName@149) = null
+    packageFragments('java.util.Unit': FqName@150) = null
+    packageFragments('java.util.inline': FqName@151) = null
+    packageFragments('kotlin': FqName@152) = null
+    packageFragments('kotlin.Array': FqName@153) = null
+    packageFragments('kotlin.Int': FqName@154) = null
+    packageFragments('kotlin.Iterable': FqName@155) = null
+    packageFragments('kotlin.Iterator': FqName@156) = null
+    packageFragments('kotlin.Long': FqName@157) = null
+    packageFragments('kotlin.String': FqName@158) = null
+    packageFragments('kotlin.System': FqName@159) = null
+    packageFragments('kotlin.T': FqName@160) = null
+    packageFragments('kotlin.Unit': FqName@161) = null
+    packageFragments('kotlin.inline': FqName@162) = null
+    packageFragments('kotlin.io': FqName@163) = null
+    packageFragments('kotlin.jvm': FqName@164) = null
     topLevelClasses(JavaClassImpl@71['Appendable']) = LazyJavaClassDescriptor@4['Appendable']
     topLevelClasses(JavaClassImpl@73['AutoCloseable']) = LazyJavaClassDescriptor@11['AutoCloseable']
-    topLevelClasses(JavaClassImpl@77['Closeable']) = LazyJavaClassDescriptor@15['Closeable']
+    topLevelClasses(JavaClassImpl@75['Closeable']) = LazyJavaClassDescriptor@15['Closeable']
     topLevelClasses(JavaClassImpl@79['FilterOutputStream']) = LazyJavaClassDescriptor@19['FilterOutputStream']
     topLevelClasses(JavaClassImpl@165['Iterator']) = LazyJavaClassDescriptor@166['Iterator']
     topLevelClasses(JavaClassImpl@99['OutputStream']) = LazyJavaClassDescriptor@23['OutputStream']
@@ -266,118 +266,118 @@ LazyJavaPackageFragmentProvider@111 {
 }
 
 LazyJavaPackageFragment@113['<root>'] {
-    _functions('body': Name@168) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('foreach': Name@170) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('gen': Name@171) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('generic_invoker': Name@172) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('hasNext': Name@173) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('inc': Name@174) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('invoke': Name@175) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('iterator': Name@176) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('java': Name@177) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('next': Name@178) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('operation': Name@179) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('println': Name@8) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    _functions('run': Name@180) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('Array': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('Int': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('Iterable': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('Iterator': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('Long': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('String': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('System': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('Unit': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('body': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('foreach': Name@170) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('gen': Name@171) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('generic_invoker': Name@172) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('hasNext': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('inc': Name@174) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('inline': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('invoke': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('iterator': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('java': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('next': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('operation': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('println': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('run': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    deserializedPackageScope = Empty@191 // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('Array': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('Int': Name@170) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('Iterable': Name@171) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('Iterator': Name@172) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('Long': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('String': Name@174) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('System': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('Unit': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('body': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('foreach': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('gen': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('generic_invoker': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('hasNext': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('inc': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('inline': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('invoke': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('iterator': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('java': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('next': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('operation': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('println': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('run': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    deserializedPackageScope = Empty@190 // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('body': Name@177) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('foreach': Name@178) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('gen': Name@179) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('generic_invoker': Name@180) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('hasNext': Name@181) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('inc': Name@182) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('invoke': Name@184) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('iterator': Name@185) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('java': Name@191) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('next': Name@187) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('operation': Name@188) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('println': Name@9) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('run': Name@189) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
     memberIndex = computeMemberIndex$1@192 // through LazyPackageFragmentScopeForJavaPackage@169
 }
 
 LazyJavaPackageFragment@125['java'] {
-    _functions('lang': Name@193) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@194
-    _functions('util': Name@195) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@194
-    classes('lang': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    classes('util': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    deserializedPackageScope = Empty@191 // through LazyPackageFragmentScopeForJavaPackage@194
+    classes('lang': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@194
+    classes('util': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@194
+    deserializedPackageScope = Empty@190 // through LazyPackageFragmentScopeForJavaPackage@194
+    functions('lang': Name@196) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@194
+    functions('util': Name@197) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@194
     memberIndex = computeMemberIndex$1@198 // through LazyPackageFragmentScopeForJavaPackage@194
 }
 
 LazyJavaPackageFragment@129['lang'] {
-    _functions('body': Name@168) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    _functions('foreach': Name@170) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    _functions('gen': Name@171) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    _functions('generic_invoker': Name@172) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    _functions('hasNext': Name@173) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    _functions('inc': Name@174) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    _functions('invoke': Name@175) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    _functions('iterator': Name@176) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    _functions('next': Name@178) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    _functions('operation': Name@179) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    _functions('println': Name@8) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    _functions('run': Name@180) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('System': Name@187) = LazyJavaClassDescriptor@39['System'] // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('body': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('foreach': Name@170) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('gen': Name@171) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('generic_invoker': Name@172) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('hasNext': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('inc': Name@174) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('invoke': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('iterator': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('next': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('operation': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('println': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('run': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    deserializedPackageScope = Empty@191 // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('System': Name@175) = LazyJavaClassDescriptor@39['System'] // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('body': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('foreach': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('gen': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('generic_invoker': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('hasNext': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('inc': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('invoke': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('iterator': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('next': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('operation': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('println': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('run': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    deserializedPackageScope = Empty@190 // through LazyPackageFragmentScopeForJavaPackage@199
+    functions('body': Name@177) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
+    functions('foreach': Name@178) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
+    functions('gen': Name@179) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
+    functions('generic_invoker': Name@180) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
+    functions('hasNext': Name@181) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
+    functions('inc': Name@182) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
+    functions('invoke': Name@184) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
+    functions('iterator': Name@185) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
+    functions('next': Name@187) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
+    functions('operation': Name@188) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
+    functions('println': Name@9) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
+    functions('run': Name@189) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
     memberIndex = computeMemberIndex$1@200 // through LazyPackageFragmentScopeForJavaPackage@199
 }
 
 LazyJavaPackageFragment@141['util'] {
-    _functions('body': Name@168) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    _functions('foreach': Name@170) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    _functions('gen': Name@171) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    _functions('generic_invoker': Name@172) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    _functions('hasNext': Name@173) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    _functions('inc': Name@174) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    _functions('invoke': Name@175) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    _functions('iterator': Name@176) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    _functions('next': Name@178) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    _functions('operation': Name@179) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    _functions('println': Name@8) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    _functions('run': Name@180) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('Array': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('Int': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('Iterable': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('Iterator': Name@184) = LazyJavaClassDescriptor@166['Iterator'] // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('Long': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('String': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('System': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('Unit': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('body': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('foreach': Name@170) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('gen': Name@171) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('generic_invoker': Name@172) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('hasNext': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('inc': Name@174) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('inline': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('invoke': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('iterator': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('next': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('operation': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('println': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('run': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    deserializedPackageScope = Empty@191 // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('Array': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('Int': Name@170) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('Iterable': Name@171) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('Iterator': Name@172) = LazyJavaClassDescriptor@166['Iterator'] // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('Long': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('String': Name@174) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('System': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('Unit': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('body': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('foreach': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('gen': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('generic_invoker': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('hasNext': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('inc': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('inline': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('invoke': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('iterator': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('next': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('operation': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('println': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('run': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    deserializedPackageScope = Empty@190 // through LazyPackageFragmentScopeForJavaPackage@201
+    functions('body': Name@177) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
+    functions('foreach': Name@178) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
+    functions('gen': Name@179) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
+    functions('generic_invoker': Name@180) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
+    functions('hasNext': Name@181) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
+    functions('inc': Name@182) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
+    functions('invoke': Name@184) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
+    functions('iterator': Name@185) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
+    functions('next': Name@187) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
+    functions('operation': Name@188) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
+    functions('println': Name@9) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
+    functions('run': Name@189) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
     memberIndex = computeMemberIndex$1@202 // through LazyPackageFragmentScopeForJavaPackage@201
 }

compiler/testData/diagnostics/tests/regressions/kt394.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt398.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt399.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt402.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt41.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt411.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt439.lazy.log

@@ -1,58 +1,58 @@
 LazyAnnotationDescriptor@0 {
-    _resolutionResults = OverloadResolutionResultsImpl@1
-    _type = JetTypeImpl@2['inline']
-    _valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['inline']
+    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
 }
 
 LazyJavaPackageFragmentProvider@4 {
-    _packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    _packageFragments('Array': FqName@7) = null
-    _packageFragments('String': FqName@8) = null
-    _packageFragments('T': FqName@9) = null
-    _packageFragments('inline': FqName@10) = null
-    _packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    _packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    _packageFragments('java.lang.Array': FqName@15) = null
-    _packageFragments('java.lang.String': FqName@16) = null
-    _packageFragments('java.lang.T': FqName@17) = null
-    _packageFragments('java.lang.inline': FqName@18) = null
-    _packageFragments('kotlin': FqName@19) = null
-    _packageFragments('kotlin.Array': FqName@20) = null
-    _packageFragments('kotlin.String': FqName@21) = null
-    _packageFragments('kotlin.T': FqName@22) = null
-    _packageFragments('kotlin.inline': FqName@23) = null
-    _packageFragments('kotlin.io': FqName@24) = null
-    _packageFragments('kotlin.jvm': FqName@25) = null
+    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
+    packageFragments('Array': FqName@7) = null
+    packageFragments('String': FqName@8) = null
+    packageFragments('T': FqName@9) = null
+    packageFragments('inline': FqName@10) = null
+    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
+    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
+    packageFragments('java.lang.Array': FqName@15) = null
+    packageFragments('java.lang.String': FqName@16) = null
+    packageFragments('java.lang.T': FqName@17) = null
+    packageFragments('java.lang.inline': FqName@18) = null
+    packageFragments('kotlin': FqName@19) = null
+    packageFragments('kotlin.Array': FqName@20) = null
+    packageFragments('kotlin.String': FqName@21) = null
+    packageFragments('kotlin.T': FqName@22) = null
+    packageFragments('kotlin.inline': FqName@23) = null
+    packageFragments('kotlin.io': FqName@24) = null
+    packageFragments('kotlin.jvm': FqName@25) = null
 }
 
 LazyJavaPackageFragment@6['<root>'] {
-    _functions('body': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    _functions('invoke': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    _functions('run1': Name@30) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Array': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('String': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('body': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('inline': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('invoke': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('run1': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('Array': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('body': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('inline': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('invoke': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('run1': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('body': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('invoke': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('run1': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@12['java'] {
-    _functions('lang': Name@36) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
 }
 
 LazyJavaPackageFragment@14['lang'] {
-    _functions('body': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    _functions('invoke': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    _functions('run1': Name@30) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('body': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('invoke': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('run1': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('body': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('invoke': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('run1': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('body': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('invoke': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('run1': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
     memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
 }

compiler/testData/diagnostics/tests/regressions/kt442.lazy.log

@@ -1,76 +1,76 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('Array': FqName@3) = null
-    _packageFragments('Int': FqName@4) = null
-    _packageFragments('String': FqName@5) = null
-    _packageFragments('T': FqName@6) = null
-    _packageFragments('Unit': 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.Int': FqName@13) = null
-    _packageFragments('java.lang.String': FqName@14) = null
-    _packageFragments('java.lang.T': FqName@15) = null
-    _packageFragments('java.lang.Unit': FqName@16) = null
-    _packageFragments('kotlin': FqName@17) = null
-    _packageFragments('kotlin.Array': FqName@18) = null
-    _packageFragments('kotlin.Int': FqName@19) = null
-    _packageFragments('kotlin.String': FqName@20) = null
-    _packageFragments('kotlin.T': FqName@21) = null
-    _packageFragments('kotlin.Unit': FqName@22) = null
-    _packageFragments('kotlin.io': FqName@23) = null
-    _packageFragments('kotlin.jvm': FqName@24) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('Array': FqName@3) = null
+    packageFragments('Int': FqName@4) = null
+    packageFragments('String': FqName@5) = null
+    packageFragments('T': FqName@6) = null
+    packageFragments('Unit': 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.Int': FqName@13) = null
+    packageFragments('java.lang.String': FqName@14) = null
+    packageFragments('java.lang.T': FqName@15) = null
+    packageFragments('java.lang.Unit': FqName@16) = null
+    packageFragments('kotlin': FqName@17) = null
+    packageFragments('kotlin.Array': FqName@18) = null
+    packageFragments('kotlin.Int': FqName@19) = null
+    packageFragments('kotlin.String': FqName@20) = null
+    packageFragments('kotlin.T': FqName@21) = null
+    packageFragments('kotlin.Unit': FqName@22) = null
+    packageFragments('kotlin.io': FqName@23) = null
+    packageFragments('kotlin.jvm': FqName@24) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    _functions('f': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('funny': Name@28) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('funny2': Name@29) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('gen': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('generic_invoker': Name@31) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('invoke': Name@32) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('plus': Name@33) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('with': Name@34) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Array': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('String': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Unit': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('f': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('funny': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('funny2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('gen': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('generic_invoker': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('invoke': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('plus': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('with': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('Array': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('Unit': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('f': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('funny': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('funny2': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('gen': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('generic_invoker': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('invoke': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('plus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('with': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('f': Name@30) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('funny': Name@31) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('funny2': Name@32) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('gen': Name@33) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('generic_invoker': Name@34) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('invoke': Name@35) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('plus': Name@36) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('with': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@41) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('lang': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
     memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('f': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    _functions('funny': Name@28) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    _functions('funny2': Name@29) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    _functions('gen': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    _functions('generic_invoker': Name@31) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    _functions('invoke': Name@32) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    _functions('plus': Name@33) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    _functions('with': Name@34) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('f': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('funny': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('funny2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('gen': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('generic_invoker': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('invoke': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('plus': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('with': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('f': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('funny': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('funny2': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('gen': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('generic_invoker': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('invoke': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('plus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('with': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('f': Name@30) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('funny': Name@31) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('funny2': Name@32) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('gen': Name@33) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('generic_invoker': Name@34) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('invoke': Name@35) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('plus': Name@36) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('with': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
     memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
 }

compiler/testData/diagnostics/tests/regressions/kt443.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt455.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt456.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt459.lazy.log

@@ -1,332 +1,332 @@
 LazyJavaClassDescriptor@0['AbstractMap'] {
-    _functions('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    _properties('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    _typeConstructor = LazyJavaClassTypeConstructor@4['AbstractMap']
-    memberIndex = computeMemberIndex$1@5 // through LazyJavaClassMemberScope@3
+    functions('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
+    memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
+    properties('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
+    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractMap']
 }
 
 LazyJavaClassDescriptor@6['HashMap'] {
-    _constructors = ArrayList@7[4] { JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], JavaConstructorDescriptor@10['<init>'], ... } // through LazyJavaClassMemberScope@11
-    _functionTypeForSamInterface = null
-    _functions('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
-    _properties('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
-    _typeConstructor = LazyJavaClassTypeConstructor@12['HashMap']
-    defaultType = JetTypeImpl@13['HashMap<2>']
-    enumEntryIndex = LinkedHashMap@14 // through LazyJavaClassMemberScope@11
-    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@11
-    nestedClassIndex = LinkedHashMap@16 // through LazyJavaClassMemberScope@11
+    constructors = ArrayList@7[4] { JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], JavaConstructorDescriptor@10['<init>'], ... } // through LazyJavaClassMemberScope@11
+    defaultType = JetTypeImpl@12['HashMap<2>']
+    enumEntryIndex = LinkedHashMap@13 // through LazyJavaClassMemberScope@11
+    functionTypeForSamInterface = null
+    functions('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
+    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@11
+    nestedClassIndex = LinkedHashMap@15 // through LazyJavaClassMemberScope@11
     nestedClasses('set': Name@1) = null // through LazyJavaClassMemberScope@11
+    properties('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@16['HashMap']
 }
 
 LazyJavaClassDescriptor@17['Serializable'] {
-    _functions('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
-    _properties('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
-    _typeConstructor = LazyJavaClassTypeConstructor@19['Serializable']
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@18
+    functions('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
+    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
+    properties('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
+    typeConstructor = LazyJavaClassTypeConstructor@20['Serializable']
 }
 
-LazyJavaClassTypeConstructor@4['AbstractMap'] {
-    _parameters = ArrayList@21[2] { LazyJavaTypeParameterDescriptor@22['K'], LazyJavaTypeParameterDescriptor@23['V'] }
-    _supertypes = ArrayList@24[1] { LazyJavaClassifierType@25['Map<K, V>'] }
+LazyJavaClassTypeConstructor@5['AbstractMap'] {
+    parameters = ArrayList@21[2] { LazyJavaTypeParameterDescriptor@22['K'], LazyJavaTypeParameterDescriptor@23['V'] }
+    supertypes = ArrayList@24[1] { LazyJavaClassifierType@25['Map<K, V>'] }
 }
 
-LazyJavaClassTypeConstructor@12['HashMap'] {
-    _parameters = ArrayList@26[2] { LazyJavaTypeParameterDescriptor@27['K'], LazyJavaTypeParameterDescriptor@28['V'] }
-    _supertypes = ArrayList@29[4] { LazyJavaClassifierType@30['AbstractMap<K, V>'], LazyJavaClassifierType@31['Map<K, V>'], LazyJavaClassifierType@32['Cloneable'], ... }
+LazyJavaClassTypeConstructor@16['HashMap'] {
+    parameters = ArrayList@26[2] { LazyJavaTypeParameterDescriptor@27['K'], LazyJavaTypeParameterDescriptor@28['V'] }
+    supertypes = ArrayList@29[4] { LazyJavaClassifierType@30['AbstractMap<K, V>'], LazyJavaClassifierType@31['Map<K, V>'], LazyJavaClassifierType@32['Cloneable'], ... }
 }
 
-LazyJavaClassTypeConstructor@19['Serializable'] {
-    _parameters = ArrayList@33[empty]
-    _supertypes = ArrayList@34[1] { JetTypeImpl@35['Any'] }
+LazyJavaClassTypeConstructor@20['Serializable'] {
+    parameters = ArrayList@33[empty]
+    supertypes = ArrayList@34[1] { JetTypeImpl@35['Any'] }
 }
 
 LazyJavaClassifierType@30['AbstractMap<K, V>'] {
-    _arguments = ArrayList@36[2] { TypeProjectionImpl@37, TypeProjectionImpl@38 }
-    _memberScope = SubstitutingScope@39
-    _typeConstructor = LazyJavaClassTypeConstructor@4['AbstractMap']
-    classifier = JavaClassImpl@40['AbstractMap']
+    arguments = ArrayList@36[2] { TypeProjectionImpl@37, TypeProjectionImpl@38 }
+    classifier = JavaClassImpl@39['AbstractMap']
+    memberScope = SubstitutingScope@40
+    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractMap']
 }
 
 LazyJavaClassifierType@32['Cloneable'] {
-    _arguments = ArrayList@41[empty]
-    _memberScope = DeserializedClassMemberScope@42
-    _typeConstructor = DeserializedClassTypeConstructor@43
-    classifier = JavaClassImpl@44['Cloneable']
+    arguments = ArrayList@41[empty]
+    classifier = JavaClassImpl@42['Cloneable']
+    memberScope = DeserializedClassMemberScope@43
+    typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaClassifierType@45['K'] {
-    _arguments = ArrayList@46[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
-    classifier = JavaTypeParameterImpl@49['K']
+    arguments = ArrayList@46[empty]
+    classifier = JavaTypeParameterImpl@47['K']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaClassifierType@50['K'] {
-    _arguments = ArrayList@51[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-    classifier = JavaTypeParameterImpl@53['K']
+    arguments = ArrayList@51[empty]
+    classifier = JavaTypeParameterImpl@52['K']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
-LazyJavaClassifierType@54['K'] {
-    _arguments = ArrayList@55[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-    classifier = JavaTypeParameterImpl@56['K']
+LazyJavaClassifierType@53['K'] {
+    arguments = ArrayList@54[empty]
+    classifier = JavaTypeParameterImpl@55['K']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
-LazyJavaClassifierType@57['K'] {
-    _arguments = ArrayList@58[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-    classifier = JavaTypeParameterImpl@59['K']
+LazyJavaClassifierType@56['K'] {
+    arguments = ArrayList@57[empty]
+    classifier = JavaTypeParameterImpl@58['K']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
-LazyJavaClassifierType@60['K'] {
-    _arguments = ArrayList@61[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-    classifier = JavaTypeParameterImpl@62['K']
+LazyJavaClassifierType@59['K'] {
+    arguments = ArrayList@60[empty]
+    classifier = JavaTypeParameterImpl@61['K']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
 }
 
 LazyJavaClassifierType@63['K'] {
-    _arguments = ArrayList@64[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-    classifier = JavaTypeParameterImpl@56['K']
+    arguments = ArrayList@64[empty]
+    classifier = JavaTypeParameterImpl@47['K']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaClassifierType@66['K'] {
-    _arguments = ArrayList@67[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-    classifier = JavaTypeParameterImpl@62['K']
+    arguments = ArrayList@67[empty]
+    classifier = JavaTypeParameterImpl@52['K']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaClassifierType@68['K'] {
-    _arguments = ArrayList@69[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-    classifier = JavaTypeParameterImpl@59['K']
+    arguments = ArrayList@69[empty]
+    classifier = JavaTypeParameterImpl@61['K']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
 }
 
 LazyJavaClassifierType@70['K'] {
-    _arguments = ArrayList@71[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-    classifier = JavaTypeParameterImpl@53['K']
+    arguments = ArrayList@71[empty]
+    classifier = JavaTypeParameterImpl@55['K']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaClassifierType@72['K'] {
-    _arguments = ArrayList@73[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
-    classifier = JavaTypeParameterImpl@49['K']
+    arguments = ArrayList@73[empty]
+    classifier = JavaTypeParameterImpl@58['K']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaClassifierType@74['Map<? extends K, ? extends V>'] {
-    _arguments = ArrayList@75[2] { TypeProjectionImpl@76, TypeProjectionImpl@77 }
-    _memberScope = SubstitutingScope@78
-    _nullable = 'false': Boolean@47
-    _typeConstructor = DeserializedClassTypeConstructor@79
-    classifier = JavaClassImpl@80['Map']
+    arguments = ArrayList@75[2] { TypeProjectionImpl@76, TypeProjectionImpl@77 }
+    classifier = JavaClassImpl@78['Map']
+    memberScope = SubstitutingScope@79
+    nullable = 'false': Boolean@48
+    typeConstructor = DeserializedClassTypeConstructor@80
 }
 
 LazyJavaClassifierType@81['Map<? extends K, ? extends V>'] {
-    _arguments = ArrayList@82[2] { TypeProjectionImpl@83, TypeProjectionImpl@84 }
-    _memberScope = SubstitutingScope@85
-    _nullable = 'true': Boolean@65
-    _typeConstructor = DeserializedClassTypeConstructor@86
-    classifier = JavaClassImpl@80['Map']
+    arguments = ArrayList@82[2] { TypeProjectionImpl@83, TypeProjectionImpl@84 }
+    classifier = JavaClassImpl@78['Map']
+    memberScope = SubstitutingScope@85
+    nullable = 'true': Boolean@65
+    typeConstructor = DeserializedClassTypeConstructor@86
 }
 
 LazyJavaClassifierType@25['Map<K, V>'] {
-    _arguments = ArrayList@87[2] { TypeProjectionImpl@88, TypeProjectionImpl@89 }
-    _memberScope = SubstitutingScope@90
-    _typeConstructor = DeserializedClassTypeConstructor@79
-    classifier = JavaClassImpl@91['Map']
+    arguments = ArrayList@87[2] { TypeProjectionImpl@88, TypeProjectionImpl@89 }
+    classifier = JavaClassImpl@90['Map']
+    memberScope = SubstitutingScope@91
+    typeConstructor = DeserializedClassTypeConstructor@80
 }
 
 LazyJavaClassifierType@31['Map<K, V>'] {
-    _arguments = ArrayList@92[2] { TypeProjectionImpl@93, TypeProjectionImpl@94 }
-    _memberScope = SubstitutingScope@95
-    _typeConstructor = DeserializedClassTypeConstructor@79
-    classifier = JavaClassImpl@96['Map']
+    arguments = ArrayList@92[2] { TypeProjectionImpl@93, TypeProjectionImpl@94 }
+    classifier = JavaClassImpl@95['Map']
+    memberScope = SubstitutingScope@96
+    typeConstructor = DeserializedClassTypeConstructor@80
 }
 
 LazyJavaClassifierType@97['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@98
-    classifier = JavaClassImpl@99['Object']
+    classifier = JavaClassImpl@98['Object']
+    typeConstructor = DeserializedClassTypeConstructor@99
 }
 
 LazyJavaClassifierType@100['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@98
     classifier = JavaClassImpl@101['Object']
+    typeConstructor = DeserializedClassTypeConstructor@99
 }
 
 LazyJavaClassifierType@102['Serializable'] {
-    _arguments = ArrayList@103[empty]
-    _memberScope = LazyJavaClassMemberScope@18
-    _typeConstructor = LazyJavaClassTypeConstructor@19['Serializable']
+    arguments = ArrayList@103[empty]
     classifier = JavaClassImpl@104['Serializable']
+    memberScope = LazyJavaClassMemberScope@18
+    typeConstructor = LazyJavaClassTypeConstructor@20['Serializable']
 }
 
 LazyJavaClassifierType@105['V'] {
-    _arguments = ArrayList@106[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-    classifier = JavaTypeParameterImpl@108['V']
+    arguments = ArrayList@106[empty]
+    classifier = JavaTypeParameterImpl@107['V']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@109['V'] {
-    _arguments = ArrayList@110[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
-    classifier = JavaTypeParameterImpl@112['V']
+    arguments = ArrayList@110[empty]
+    classifier = JavaTypeParameterImpl@111['V']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
-LazyJavaClassifierType@113['V'] {
-    _arguments = ArrayList@114[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-    classifier = JavaTypeParameterImpl@115['V']
+LazyJavaClassifierType@112['V'] {
+    arguments = ArrayList@113[empty]
+    classifier = JavaTypeParameterImpl@114['V']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
-LazyJavaClassifierType@116['V'] {
-    _arguments = ArrayList@117[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-    classifier = JavaTypeParameterImpl@118['V']
+LazyJavaClassifierType@115['V'] {
+    arguments = ArrayList@116[empty]
+    classifier = JavaTypeParameterImpl@117['V']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
-LazyJavaClassifierType@119['V'] {
-    _arguments = ArrayList@120[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-    classifier = JavaTypeParameterImpl@121['V']
+LazyJavaClassifierType@118['V'] {
+    arguments = ArrayList@119[empty]
+    classifier = JavaTypeParameterImpl@120['V']
+    nullable = 'false': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@121
 }
 
 LazyJavaClassifierType@122['V'] {
-    _arguments = ArrayList@123[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
-    classifier = JavaTypeParameterImpl@112['V']
+    arguments = ArrayList@123[empty]
+    classifier = JavaTypeParameterImpl@107['V']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@124['V'] {
-    _arguments = ArrayList@125[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-    classifier = JavaTypeParameterImpl@118['V']
+    arguments = ArrayList@125[empty]
+    classifier = JavaTypeParameterImpl@117['V']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@126['V'] {
-    _arguments = ArrayList@127[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-    classifier = JavaTypeParameterImpl@121['V']
+    arguments = ArrayList@127[empty]
+    classifier = JavaTypeParameterImpl@111['V']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@128['V'] {
-    _arguments = ArrayList@129[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-    classifier = JavaTypeParameterImpl@108['V']
+    arguments = ArrayList@129[empty]
+    classifier = JavaTypeParameterImpl@114['V']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@130['V'] {
-    _arguments = ArrayList@131[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-    classifier = JavaTypeParameterImpl@115['V']
+    arguments = ArrayList@131[empty]
+    classifier = JavaTypeParameterImpl@120['V']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@121
 }
 
 LazyJavaPackageFragmentProvider@132 {
-    _packageFragments('<root>': FqName@133) = LazyJavaPackageFragment@134['<root>']
-    _packageFragments('K': FqName@135) = null
-    _packageFragments('Map': FqName@136) = null
-    _packageFragments('String': FqName@137) = null
-    _packageFragments('V': FqName@138) = null
-    _packageFragments('java': FqName@139) = LazyJavaPackageFragment@140['java']
-    _packageFragments('java.io': FqName@141) = LazyJavaPackageFragment@142['io']
-    _packageFragments('java.lang': FqName@143) = LazyJavaPackageFragment@144['lang']
-    _packageFragments('java.lang.K': FqName@145) = null
-    _packageFragments('java.lang.Map': FqName@146) = null
-    _packageFragments('java.lang.String': FqName@147) = null
-    _packageFragments('java.lang.V': FqName@148) = null
-    _packageFragments('java.util': FqName@149) = LazyJavaPackageFragment@150['util']
-    _packageFragments('java.util.HashMap': FqName@151) = null
-    _packageFragments('kotlin': FqName@152) = null
-    _packageFragments('kotlin.K': FqName@153) = null
-    _packageFragments('kotlin.Map': FqName@154) = null
-    _packageFragments('kotlin.String': FqName@155) = null
-    _packageFragments('kotlin.V': FqName@156) = null
-    _packageFragments('kotlin.io': FqName@157) = null
-    _packageFragments('kotlin.jvm': FqName@158) = null
-    topLevelClasses(JavaClassImpl@40['AbstractMap']) = LazyJavaClassDescriptor@0['AbstractMap']
+    packageFragments('<root>': FqName@133) = LazyJavaPackageFragment@134['<root>']
+    packageFragments('K': FqName@135) = null
+    packageFragments('Map': FqName@136) = null
+    packageFragments('String': FqName@137) = null
+    packageFragments('V': FqName@138) = null
+    packageFragments('java': FqName@139) = LazyJavaPackageFragment@140['java']
+    packageFragments('java.io': FqName@141) = LazyJavaPackageFragment@142['io']
+    packageFragments('java.lang': FqName@143) = LazyJavaPackageFragment@144['lang']
+    packageFragments('java.lang.K': FqName@145) = null
+    packageFragments('java.lang.Map': FqName@146) = null
+    packageFragments('java.lang.String': FqName@147) = null
+    packageFragments('java.lang.V': FqName@148) = null
+    packageFragments('java.util': FqName@149) = LazyJavaPackageFragment@150['util']
+    packageFragments('java.util.HashMap': FqName@151) = null
+    packageFragments('kotlin': FqName@152) = null
+    packageFragments('kotlin.K': FqName@153) = null
+    packageFragments('kotlin.Map': FqName@154) = null
+    packageFragments('kotlin.String': FqName@155) = null
+    packageFragments('kotlin.V': FqName@156) = null
+    packageFragments('kotlin.io': FqName@157) = null
+    packageFragments('kotlin.jvm': FqName@158) = null
+    topLevelClasses(JavaClassImpl@39['AbstractMap']) = LazyJavaClassDescriptor@0['AbstractMap']
     topLevelClasses(JavaClassImpl@159['HashMap']) = LazyJavaClassDescriptor@6['HashMap']
     topLevelClasses(JavaClassImpl@104['Serializable']) = LazyJavaClassDescriptor@17['Serializable']
 }
 
 LazyJavaPackageFragment@134['<root>'] {
-    _functions('set': Name@1) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('Map': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('String': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('java': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('set': Name@1) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    deserializedPackageScope = Empty@164 // through LazyPackageFragmentScopeForJavaPackage@160
-    memberIndex = computeMemberIndex$1@165 // through LazyPackageFragmentScopeForJavaPackage@160
+    classes('Map': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('String': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('java': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('set': Name@1) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    deserializedPackageScope = Empty@164 // through LazyPackageFragmentScopeForJavaPackage@161
+    functions('set': Name@1) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@161
+    memberIndex = computeMemberIndex$1@165 // through LazyPackageFragmentScopeForJavaPackage@161
 }
 
 LazyJavaPackageFragment@140['java'] {
-    _functions('lang': Name@166) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@167
-    classes('lang': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@167
-    classes('util': Name@169) = null // through LazyPackageFragmentScopeForJavaPackage@167
+    classes('lang': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@167
+    classes('util': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@167
     deserializedPackageScope = Empty@164 // through LazyPackageFragmentScopeForJavaPackage@167
+    functions('lang': Name@169) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@167
     memberIndex = computeMemberIndex$1@170 // through LazyPackageFragmentScopeForJavaPackage@167
 }
 
 LazyJavaPackageFragment@144['lang'] {
-    _functions('set': Name@1) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@171
     classes('java': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@171
     classes('set': Name@1) = null // through LazyPackageFragmentScopeForJavaPackage@171
     deserializedPackageScope = Empty@164 // through LazyPackageFragmentScopeForJavaPackage@171
+    functions('set': Name@1) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@171
     memberIndex = computeMemberIndex$1@172 // through LazyPackageFragmentScopeForJavaPackage@171
 }
 
 LazyJavaPackageFragment@150['util'] {
-    _functions('HashMap': Name@173) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('HashMap': Name@175) = LazyJavaClassDescriptor@6['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('HashMap': Name@173) = LazyJavaClassDescriptor@6['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@174
     deserializedPackageScope = Empty@164 // through LazyPackageFragmentScopeForJavaPackage@174
+    functions('HashMap': Name@175) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@174
     memberIndex = computeMemberIndex$1@176 // through LazyPackageFragmentScopeForJavaPackage@174
 }
 
 LazyJavaTypeParameterDescriptor@27['K'] {
     defaultType = JetTypeImpl@177['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
     upperBounds = LinkedHashSet@178[1] { NullableType@179 }
 }
 
 LazyJavaTypeParameterDescriptor@22['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
 }
 
 LazyJavaTypeParameterDescriptor@28['V'] {
     defaultType = JetTypeImpl@180['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
     upperBounds = LinkedHashSet@181[1] { NullableType@182 }
 }
 
 LazyJavaTypeParameterDescriptor@23['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@121
 }
 
 LazyJavaTypeParameterResolver@183 {
-    resolve(JavaTypeParameterImpl@184['K']) = LazyJavaTypeParameterDescriptor@27['K']
-    resolve(JavaTypeParameterImpl@185['V']) = LazyJavaTypeParameterDescriptor@28['V']
+    resolve(JavaTypeParameterImpl@184['K']) = LazyJavaTypeParameterDescriptor@22['K']
+    resolve(JavaTypeParameterImpl@185['V']) = LazyJavaTypeParameterDescriptor@23['V']
 }
 
 LazyJavaTypeParameterResolver@186 {
-    resolve(JavaTypeParameterImpl@187['K']) = LazyJavaTypeParameterDescriptor@22['K']
-    resolve(JavaTypeParameterImpl@188['V']) = LazyJavaTypeParameterDescriptor@23['V']
+    resolve(JavaTypeParameterImpl@187['K']) = LazyJavaTypeParameterDescriptor@27['K']
+    resolve(JavaTypeParameterImpl@188['V']) = LazyJavaTypeParameterDescriptor@28['V']
 }

compiler/testData/diagnostics/tests/regressions/kt469.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt4827.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt498.lazy.log

@@ -1,283 +1,283 @@
 LazyJavaClassDescriptor@0['AnnotatedElement'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@1['AnnotatedElement']
+    typeConstructor = LazyJavaClassTypeConstructor@1['AnnotatedElement']
 }
 
 LazyJavaClassDescriptor@2['Class'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@3['Class']
-    defaultType = JetTypeImpl@4['Class<1>']
+    defaultType = JetTypeImpl@3['Class<1>']
+    typeConstructor = LazyJavaClassTypeConstructor@4['Class']
 }
 
 LazyJavaClassDescriptor@5['Exception'] {
-    _allDescriptors = ArrayList@6[6] { DeserializedSimpleFunctionDescriptor@7['hashCode'], DeserializedSimpleFunctionDescriptor@8['getMessage'], DeserializedSimpleFunctionDescriptor@9['printStackTrace'], ... } // through LazyJavaClassMemberScope@10
-    _constructors = ArrayList@11[5] { JavaConstructorDescriptor@12['<init>'], JavaConstructorDescriptor@13['<init>'], JavaConstructorDescriptor@14['<init>'], ... } // through LazyJavaClassMemberScope@10
-    _functions('addSuppressed': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _functions('clone': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _functions('equals': Name@18) = ArrayList@19[1] { DeserializedSimpleFunctionDescriptor@20['equals'] } // through LazyJavaClassMemberScope@10
-    _functions('fillInStackTrace': Name@21) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _functions('finalize': Name@22) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _functions('getCause': Name@23) = ArrayList@24[1] { DeserializedSimpleFunctionDescriptor@25['getCause'] } // through LazyJavaClassMemberScope@10
-    _functions('getClass': Name@26) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _functions('getLocalizedMessage': Name@27) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _functions('getMessage': Name@28) = ArrayList@29[1] { DeserializedSimpleFunctionDescriptor@8['getMessage'] } // through LazyJavaClassMemberScope@10
-    _functions('getOurStackTrace': Name@30) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _functions('getStackTrace': Name@31) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _functions('getStackTraceDepth': Name@32) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _functions('getStackTraceElement': Name@33) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _functions('getSuppressed': Name@34) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _functions('hashCode': Name@35) = ArrayList@36[1] { DeserializedSimpleFunctionDescriptor@7['hashCode'] } // through LazyJavaClassMemberScope@10
-    _functions('initCause': Name@37) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _functions('notify': Name@38) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _functions('notifyAll': Name@39) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _functions('printEnclosedStackTrace': Name@40) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _functions('printStackTrace': Name@41) = ArrayList@42[1] { DeserializedSimpleFunctionDescriptor@9['printStackTrace'] } // through LazyJavaClassMemberScope@10
-    _functions('readObject': Name@43) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _functions('setStackTrace': Name@44) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _functions('toString': Name@45) = ArrayList@46[1] { DeserializedSimpleFunctionDescriptor@47['toString'] } // through LazyJavaClassMemberScope@10
-    _functions('wait': Name@48) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _functions('writeObject': Name@49) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _properties('backtrace': Name@50) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _properties('cause': Name@51) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _properties('detailMessage': Name@52) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _properties('stackTrace': Name@53) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _properties('suppressedExceptions': Name@54) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    _typeConstructor = LazyJavaClassTypeConstructor@55['Exception']
-    defaultType = JetTypeImpl@56['Exception']
-    enumEntryIndex = LinkedHashMap@57 // through LazyJavaClassMemberScope@10
-    memberIndex = computeMemberIndex$1@58 // through LazyJavaClassMemberScope@10
-    nestedClassIndex = LinkedHashMap@59 // through LazyJavaClassMemberScope@10
+    allDescriptors = ArrayList@6[6] { DeserializedSimpleFunctionDescriptor@7['hashCode'], DeserializedSimpleFunctionDescriptor@8['getMessage'], DeserializedSimpleFunctionDescriptor@9['printStackTrace'], ... } // through LazyJavaClassMemberScope@10
+    constructors = ArrayList@11[5] { JavaConstructorDescriptor@12['<init>'], JavaConstructorDescriptor@13['<init>'], JavaConstructorDescriptor@14['<init>'], ... } // through LazyJavaClassMemberScope@10
+    defaultType = JetTypeImpl@15['Exception']
+    enumEntryIndex = LinkedHashMap@16 // through LazyJavaClassMemberScope@10
+    functions('addSuppressed': Name@17) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    functions('clone': Name@19) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    functions('equals': Name@20) = ArrayList@21[1] { DeserializedSimpleFunctionDescriptor@22['equals'] } // through LazyJavaClassMemberScope@10
+    functions('fillInStackTrace': Name@23) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    functions('finalize': Name@24) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    functions('getCause': Name@25) = ArrayList@26[1] { DeserializedSimpleFunctionDescriptor@27['getCause'] } // through LazyJavaClassMemberScope@10
+    functions('getClass': Name@28) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    functions('getLocalizedMessage': Name@29) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    functions('getMessage': Name@30) = ArrayList@31[1] { DeserializedSimpleFunctionDescriptor@8['getMessage'] } // through LazyJavaClassMemberScope@10
+    functions('getOurStackTrace': Name@32) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    functions('getStackTrace': Name@33) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    functions('getStackTraceDepth': Name@34) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    functions('getStackTraceElement': Name@35) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    functions('getSuppressed': Name@36) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    functions('hashCode': Name@37) = ArrayList@38[1] { DeserializedSimpleFunctionDescriptor@7['hashCode'] } // through LazyJavaClassMemberScope@10
+    functions('initCause': Name@39) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    functions('notify': Name@40) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    functions('notifyAll': Name@41) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    functions('printEnclosedStackTrace': Name@42) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    functions('printStackTrace': Name@43) = ArrayList@44[1] { DeserializedSimpleFunctionDescriptor@9['printStackTrace'] } // through LazyJavaClassMemberScope@10
+    functions('readObject': Name@45) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    functions('setStackTrace': Name@46) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    functions('toString': Name@47) = ArrayList@48[1] { DeserializedSimpleFunctionDescriptor@49['toString'] } // through LazyJavaClassMemberScope@10
+    functions('wait': Name@50) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    functions('writeObject': Name@51) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    memberIndex = computeMemberIndex$1@52 // through LazyJavaClassMemberScope@10
+    nestedClassIndex = LinkedHashMap@53 // through LazyJavaClassMemberScope@10
+    properties('backtrace': Name@54) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    properties('cause': Name@55) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    properties('detailMessage': Name@56) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    properties('stackTrace': Name@57) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    properties('suppressedExceptions': Name@58) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
+    typeConstructor = LazyJavaClassTypeConstructor@59['Exception']
 }
 
 LazyJavaClassDescriptor@60['GenericDeclaration'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@61['GenericDeclaration']
+    typeConstructor = LazyJavaClassTypeConstructor@61['GenericDeclaration']
 }
 
 LazyJavaClassDescriptor@62['Object'] {
-    _functions('getClass': Name@63) = ArrayList@64[1] { JavaMethodDescriptor@65['getClass'] } // through LazyJavaClassMemberScope@66
-    _properties('getClass': Name@63) = EmptyList@16[empty] // through LazyJavaClassMemberScope@66
-    _typeConstructor = LazyJavaClassTypeConstructor@67['Object']
-    defaultType = JetTypeImpl@68['Object']
-    enumEntryIndex = LinkedHashMap@69 // through LazyJavaClassMemberScope@66
-    memberIndex = computeMemberIndex$1@70 // through LazyJavaClassMemberScope@66
-    nestedClassIndex = LinkedHashMap@71 // through LazyJavaClassMemberScope@66
-    nestedClasses('getClass': Name@63) = null // through LazyJavaClassMemberScope@66
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@72['<this>']
+    defaultType = JetTypeImpl@63['Object']
+    enumEntryIndex = LinkedHashMap@64 // through LazyJavaClassMemberScope@65
+    functions('getClass': Name@66) = ArrayList@67[1] { JavaMethodDescriptor@68['getClass'] } // through LazyJavaClassMemberScope@65
+    memberIndex = computeMemberIndex$1@69 // through LazyJavaClassMemberScope@65
+    nestedClassIndex = LinkedHashMap@70 // through LazyJavaClassMemberScope@65
+    nestedClasses('getClass': Name@66) = null // through LazyJavaClassMemberScope@65
+    properties('getClass': Name@66) = EmptyList@18[empty] // through LazyJavaClassMemberScope@65
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@71['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@72['Object']
 }
 
 LazyJavaClassDescriptor@73['Serializable'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@74['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@74['Serializable']
 }
 
 LazyJavaClassDescriptor@75['Type'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@76['Type']
+    typeConstructor = LazyJavaClassTypeConstructor@76['Type']
 }
 
 LazyJavaClassTypeConstructor@1['AnnotatedElement'] {
-    _supertypes = ArrayList@77[1] { JetTypeImpl@78['Any'] }
+    supertypes = ArrayList@77[1] { JetTypeImpl@78['Any'] }
 }
 
-LazyJavaClassTypeConstructor@3['Class'] {
-    _parameters = ArrayList@79[1] { LazyJavaTypeParameterDescriptor@80['T'] }
-    _supertypes = ArrayList@81[4] { LazyJavaClassifierType@82['Serializable'], LazyJavaClassifierType@83['GenericDeclaration'], LazyJavaClassifierType@84['Type'], ... }
+LazyJavaClassTypeConstructor@4['Class'] {
+    parameters = ArrayList@79[1] { LazyJavaTypeParameterDescriptor@80['T'] }
+    supertypes = ArrayList@81[4] { LazyJavaClassifierType@82['Serializable'], LazyJavaClassifierType@83['GenericDeclaration'], LazyJavaClassifierType@84['Type'], ... }
 }
 
-LazyJavaClassTypeConstructor@55['Exception'] {
-    _parameters = ArrayList@85[empty]
-    _supertypes = ArrayList@86[1] { LazyJavaClassifierType@87['Throwable'] }
+LazyJavaClassTypeConstructor@59['Exception'] {
+    parameters = ArrayList@85[empty]
+    supertypes = ArrayList@86[1] { LazyJavaClassifierType@87['Throwable'] }
 }
 
 LazyJavaClassTypeConstructor@61['GenericDeclaration'] {
-    _supertypes = ArrayList@88[1] { JetTypeImpl@78['Any'] }
+    supertypes = ArrayList@88[1] { JetTypeImpl@78['Any'] }
 }
 
-LazyJavaClassTypeConstructor@67['Object'] {
-    _parameters = ArrayList@89[empty]
-    _supertypes = ArrayList@90[1] { JetTypeImpl@78['Any'] }
+LazyJavaClassTypeConstructor@72['Object'] {
+    parameters = ArrayList@89[empty]
+    supertypes = ArrayList@90[1] { JetTypeImpl@78['Any'] }
 }
 
 LazyJavaClassTypeConstructor@74['Serializable'] {
-    _supertypes = ArrayList@91[1] { JetTypeImpl@78['Any'] }
+    supertypes = ArrayList@91[1] { JetTypeImpl@78['Any'] }
 }
 
 LazyJavaClassTypeConstructor@76['Type'] {
-    _supertypes = ArrayList@92[1] { JetTypeImpl@78['Any'] }
+    supertypes = ArrayList@92[1] { JetTypeImpl@78['Any'] }
 }
 
 LazyJavaClassifierType@93['AnnotatedElement'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@1['AnnotatedElement']
     classifier = JavaClassImpl@94['AnnotatedElement']
+    typeConstructor = LazyJavaClassTypeConstructor@1['AnnotatedElement']
 }
 
 LazyJavaClassifierType@95['Class<?>'] {
-    _arguments = ArrayList@96[1] { LazyStarProjection@97 }
-    _nullable = 'false': Boolean@98
-    _typeConstructor = LazyJavaClassTypeConstructor@3['Class']
-    classifier = JavaClassImpl@99['Class']
+    arguments = ArrayList@96[1] { LazyStarProjection@97 }
+    classifier = JavaClassImpl@98['Class']
+    nullable = 'false': Boolean@99
+    typeConstructor = LazyJavaClassTypeConstructor@4['Class']
 }
 
 LazyJavaClassifierType@100['Class<?>'] {
-    _arguments = ArrayList@101[1] { LazyStarProjection@102 }
-    _nullable = 'true': Boolean@103
-    _typeConstructor = LazyJavaClassTypeConstructor@3['Class']
-    classifier = JavaClassImpl@99['Class']
+    arguments = ArrayList@101[1] { LazyStarProjection@102 }
+    classifier = JavaClassImpl@98['Class']
+    nullable = 'true': Boolean@103
+    typeConstructor = LazyJavaClassTypeConstructor@4['Class']
 }
 
 LazyJavaClassifierType@83['GenericDeclaration'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@61['GenericDeclaration']
     classifier = JavaClassImpl@104['GenericDeclaration']
+    typeConstructor = LazyJavaClassTypeConstructor@61['GenericDeclaration']
 }
 
 LazyJavaClassifierType@105['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@106
-    classifier = JavaClassImpl@107['Object']
+    classifier = JavaClassImpl@106['Object']
+    typeConstructor = DeserializedClassTypeConstructor@107
 }
 
 LazyJavaClassifierType@108['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@106
     classifier = JavaClassImpl@109['Object']
+    typeConstructor = DeserializedClassTypeConstructor@107
 }
 
 LazyJavaClassifierType@110['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@106
     classifier = JavaClassImpl@111['Object']
+    typeConstructor = DeserializedClassTypeConstructor@107
 }
 
 LazyJavaClassifierType@112['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@106
     classifier = JavaClassImpl@113['Object']
+    typeConstructor = DeserializedClassTypeConstructor@107
 }
 
 LazyJavaClassifierType@114['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@106
     classifier = JavaClassImpl@115['Object']
+    typeConstructor = DeserializedClassTypeConstructor@107
 }
 
 LazyJavaClassifierType@82['Serializable'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@74['Serializable']
     classifier = JavaClassImpl@116['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@74['Serializable']
 }
 
 LazyJavaClassifierType@117['String'] {
-    _arguments = ArrayList@118[empty]
-    _nullable = 'false': Boolean@98
-    _typeConstructor = DeserializedClassTypeConstructor@119
-    classifier = JavaClassImpl@120['String']
+    arguments = ArrayList@118[empty]
+    classifier = JavaClassImpl@119['String']
+    nullable = 'false': Boolean@99
+    typeConstructor = DeserializedClassTypeConstructor@120
 }
 
 LazyJavaClassifierType@121['String'] {
-    _arguments = ArrayList@122[empty]
-    _nullable = 'false': Boolean@98
-    _typeConstructor = DeserializedClassTypeConstructor@119
+    arguments = ArrayList@122[empty]
     classifier = JavaClassImpl@123['String']
+    nullable = 'false': Boolean@99
+    typeConstructor = DeserializedClassTypeConstructor@120
 }
 
 LazyJavaClassifierType@124['String'] {
-    _arguments = ArrayList@125[empty]
-    _nullable = 'false': Boolean@98
-    _typeConstructor = DeserializedClassTypeConstructor@119
+    arguments = ArrayList@125[empty]
     classifier = JavaClassImpl@126['String']
+    nullable = 'false': Boolean@99
+    typeConstructor = DeserializedClassTypeConstructor@120
 }
 
 LazyJavaClassifierType@127['String'] {
-    _arguments = ArrayList@128[empty]
-    _nullable = 'true': Boolean@103
-    _typeConstructor = DeserializedClassTypeConstructor@119
-    classifier = JavaClassImpl@126['String']
+    arguments = ArrayList@128[empty]
+    classifier = JavaClassImpl@119['String']
+    nullable = 'true': Boolean@103
+    typeConstructor = DeserializedClassTypeConstructor@120
 }
 
 LazyJavaClassifierType@129['String'] {
-    _arguments = ArrayList@130[empty]
-    _nullable = 'true': Boolean@103
-    _typeConstructor = DeserializedClassTypeConstructor@119
-    classifier = JavaClassImpl@123['String']
+    arguments = ArrayList@130[empty]
+    classifier = JavaClassImpl@126['String']
+    nullable = 'true': Boolean@103
+    typeConstructor = DeserializedClassTypeConstructor@120
 }
 
 LazyJavaClassifierType@131['String'] {
-    _arguments = ArrayList@132[empty]
-    _nullable = 'true': Boolean@103
-    _typeConstructor = DeserializedClassTypeConstructor@119
-    classifier = JavaClassImpl@120['String']
+    arguments = ArrayList@132[empty]
+    classifier = JavaClassImpl@123['String']
+    nullable = 'true': Boolean@103
+    typeConstructor = DeserializedClassTypeConstructor@120
 }
 
 LazyJavaClassifierType@87['Throwable'] {
-    _arguments = ArrayList@133[empty]
-    _memberScope = DeserializedClassMemberScope@134
-    _nullable = 'false': Boolean@98
-    _typeConstructor = DeserializedClassTypeConstructor@135
-    classifier = JavaClassImpl@136['Throwable']
+    arguments = ArrayList@133[empty]
+    classifier = JavaClassImpl@134['Throwable']
+    memberScope = DeserializedClassMemberScope@135
+    nullable = 'false': Boolean@99
+    typeConstructor = DeserializedClassTypeConstructor@136
 }
 
 LazyJavaClassifierType@137['Throwable'] {
-    _arguments = ArrayList@138[empty]
-    _nullable = 'false': Boolean@98
-    _typeConstructor = DeserializedClassTypeConstructor@135
+    arguments = ArrayList@138[empty]
     classifier = JavaClassImpl@139['Throwable']
+    nullable = 'false': Boolean@99
+    typeConstructor = DeserializedClassTypeConstructor@136
 }
 
 LazyJavaClassifierType@140['Throwable'] {
-    _arguments = ArrayList@141[empty]
-    _nullable = 'false': Boolean@98
-    _typeConstructor = DeserializedClassTypeConstructor@135
+    arguments = ArrayList@141[empty]
     classifier = JavaClassImpl@142['Throwable']
+    nullable = 'false': Boolean@99
+    typeConstructor = DeserializedClassTypeConstructor@136
 }
 
 LazyJavaClassifierType@143['Throwable'] {
-    _arguments = ArrayList@144[empty]
-    _nullable = 'false': Boolean@98
-    _typeConstructor = DeserializedClassTypeConstructor@135
+    arguments = ArrayList@144[empty]
     classifier = JavaClassImpl@145['Throwable']
+    nullable = 'false': Boolean@99
+    typeConstructor = DeserializedClassTypeConstructor@136
 }
 
 LazyJavaClassifierType@146['Throwable'] {
-    _arguments = ArrayList@147[empty]
-    _nullable = 'true': Boolean@103
-    _typeConstructor = DeserializedClassTypeConstructor@135
-    classifier = JavaClassImpl@145['Throwable']
+    arguments = ArrayList@147[empty]
+    classifier = JavaClassImpl@142['Throwable']
+    nullable = 'true': Boolean@103
+    typeConstructor = DeserializedClassTypeConstructor@136
 }
 
 LazyJavaClassifierType@148['Throwable'] {
-    _arguments = ArrayList@149[empty]
-    _nullable = 'true': Boolean@103
-    _typeConstructor = DeserializedClassTypeConstructor@135
-    classifier = JavaClassImpl@139['Throwable']
+    arguments = ArrayList@149[empty]
+    classifier = JavaClassImpl@145['Throwable']
+    nullable = 'true': Boolean@103
+    typeConstructor = DeserializedClassTypeConstructor@136
 }
 
 LazyJavaClassifierType@150['Throwable'] {
-    _arguments = ArrayList@151[empty]
-    _nullable = 'true': Boolean@103
-    _typeConstructor = DeserializedClassTypeConstructor@135
-    classifier = JavaClassImpl@142['Throwable']
+    arguments = ArrayList@151[empty]
+    classifier = JavaClassImpl@139['Throwable']
+    nullable = 'true': Boolean@103
+    typeConstructor = DeserializedClassTypeConstructor@136
 }
 
 LazyJavaClassifierType@84['Type'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@76['Type']
     classifier = JavaClassImpl@152['Type']
+    typeConstructor = LazyJavaClassTypeConstructor@76['Type']
 }
 
 LazyJavaPackageFragmentProvider@153 {
-    _packageFragments('<root>': FqName@154) = LazyJavaPackageFragment@155['<root>']
-    _packageFragments('Any': FqName@156) = null
-    _packageFragments('Class': FqName@157) = null
-    _packageFragments('Exception': FqName@158) = null
-    _packageFragments('IdUnavailableException': FqName@159) = null
-    _packageFragments('Object': FqName@160) = null
-    _packageFragments('T': FqName@161) = null
-    _packageFragments('java': FqName@162) = LazyJavaPackageFragment@163['java']
-    _packageFragments('java.io': FqName@164) = LazyJavaPackageFragment@165['io']
-    _packageFragments('java.lang': FqName@166) = LazyJavaPackageFragment@167['lang']
-    _packageFragments('java.lang.Any': FqName@168) = null
-    _packageFragments('java.lang.Class': FqName@169) = null
-    _packageFragments('java.lang.Exception': FqName@170) = null
-    _packageFragments('java.lang.Object': FqName@171) = null
-    _packageFragments('java.lang.T': FqName@172) = null
-    _packageFragments('java.lang.reflect': FqName@173) = LazyJavaPackageFragment@174['reflect']
-    _packageFragments('kotlin': FqName@175) = null
-    _packageFragments('kotlin.Any': FqName@176) = null
-    _packageFragments('kotlin.Class': FqName@177) = null
-    _packageFragments('kotlin.Exception': FqName@178) = null
-    _packageFragments('kotlin.Object': FqName@179) = null
-    _packageFragments('kotlin.T': FqName@180) = null
-    _packageFragments('kotlin.io': FqName@181) = null
-    _packageFragments('kotlin.jvm': FqName@182) = null
+    packageFragments('<root>': FqName@154) = LazyJavaPackageFragment@155['<root>']
+    packageFragments('Any': FqName@156) = null
+    packageFragments('Class': FqName@157) = null
+    packageFragments('Exception': FqName@158) = null
+    packageFragments('IdUnavailableException': FqName@159) = null
+    packageFragments('Object': FqName@160) = null
+    packageFragments('T': FqName@161) = null
+    packageFragments('java': FqName@162) = LazyJavaPackageFragment@163['java']
+    packageFragments('java.io': FqName@164) = LazyJavaPackageFragment@165['io']
+    packageFragments('java.lang': FqName@166) = LazyJavaPackageFragment@167['lang']
+    packageFragments('java.lang.Any': FqName@168) = null
+    packageFragments('java.lang.Class': FqName@169) = null
+    packageFragments('java.lang.Exception': FqName@170) = null
+    packageFragments('java.lang.Object': FqName@171) = null
+    packageFragments('java.lang.T': FqName@172) = null
+    packageFragments('java.lang.reflect': FqName@173) = LazyJavaPackageFragment@174['reflect']
+    packageFragments('kotlin': FqName@175) = null
+    packageFragments('kotlin.Any': FqName@176) = null
+    packageFragments('kotlin.Class': FqName@177) = null
+    packageFragments('kotlin.Exception': FqName@178) = null
+    packageFragments('kotlin.Object': FqName@179) = null
+    packageFragments('kotlin.T': FqName@180) = null
+    packageFragments('kotlin.io': FqName@181) = null
+    packageFragments('kotlin.jvm': FqName@182) = null
     topLevelClasses(JavaClassImpl@94['AnnotatedElement']) = LazyJavaClassDescriptor@0['AnnotatedElement']
     topLevelClasses(JavaClassImpl@183['Class']) = LazyJavaClassDescriptor@2['Class']
     topLevelClasses(JavaClassImpl@184['Exception']) = LazyJavaClassDescriptor@5['Exception']
@@ -288,30 +288,30 @@ LazyJavaPackageFragmentProvider@153 {
 }
 
 LazyJavaPackageFragment@155['<root>'] {
-    _functions('getClass': Name@63) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@186
-    classes('Any': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@186
-    classes('Class': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@186
-    classes('Exception': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@186
-    classes('Object': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@186
-    classes('getClass': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@186
-    deserializedPackageScope = Empty@191 // through LazyPackageFragmentScopeForJavaPackage@186
-    memberIndex = computeMemberIndex$1@192 // through LazyPackageFragmentScopeForJavaPackage@186
+    classes('Any': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@187
+    classes('Class': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@187
+    classes('Exception': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@187
+    classes('Object': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@187
+    classes('getClass': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@187
+    deserializedPackageScope = Empty@191 // through LazyPackageFragmentScopeForJavaPackage@187
+    functions('getClass': Name@66) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@187
+    memberIndex = computeMemberIndex$1@192 // through LazyPackageFragmentScopeForJavaPackage@187
 }
 
 LazyJavaPackageFragment@163['java'] {
-    _functions('lang': Name@193) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@194
-    classes('lang': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@194
+    classes('lang': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@194
     deserializedPackageScope = Empty@191 // through LazyPackageFragmentScopeForJavaPackage@194
+    functions('lang': Name@195) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@194
     memberIndex = computeMemberIndex$1@196 // through LazyPackageFragmentScopeForJavaPackage@194
 }
 
 LazyJavaPackageFragment@167['lang'] {
-    _functions('getClass': Name@63) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@197
     classes('Class': Name@188) = LazyJavaClassDescriptor@2['Class'] // through LazyPackageFragmentScopeForJavaPackage@197
     classes('Exception': Name@189) = LazyJavaClassDescriptor@5['Exception'] // through LazyPackageFragmentScopeForJavaPackage@197
     classes('Object': Name@190) = LazyJavaClassDescriptor@62['Object'] // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('getClass': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('getClass': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@197
     deserializedPackageScope = Empty@191 // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('getClass': Name@66) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@197
     memberIndex = computeMemberIndex$1@198 // through LazyPackageFragmentScopeForJavaPackage@197
 }
 

compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt557.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt571.lazy.log

@@ -3,65 +3,65 @@ DescriptorResolver@0 {
 }
 
 LazyJavaPackageFragmentProvider@2 {
-    _packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    _packageFragments('Int': FqName@5) = null
-    _packageFragments('R': FqName@6) = null
-    _packageFragments('T': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('java.lang.R': FqName@13) = null
-    _packageFragments('java.lang.T': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.R': FqName@17) = null
-    _packageFragments('kotlin.T': FqName@18) = null
-    _packageFragments('kotlin.io': FqName@19) = null
-    _packageFragments('kotlin.jvm': FqName@20) = null
+    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
+    packageFragments('Int': FqName@5) = null
+    packageFragments('R': FqName@6) = null
+    packageFragments('T': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('java.lang.R': FqName@13) = null
+    packageFragments('java.lang.T': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.R': FqName@17) = null
+    packageFragments('kotlin.T': FqName@18) = null
+    packageFragments('kotlin.io': FqName@19) = null
+    packageFragments('kotlin.jvm': FqName@20) = null
 }
 
 LazyJavaPackageFragment@4['<root>'] {
-    _functions('body': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('div': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('invoke': Name@25) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('let': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('mod': Name@27) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('plus': Name@28) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('times': Name@29) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Int': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('body': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('div': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('invoke': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('let': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('mod': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('times': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('body': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('div': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('invoke': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('let': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('mod': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('times': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('body': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('div': Name@24) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('invoke': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('let': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('mod': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('plus': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('times': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@33) = EmptyList@22[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@11['lang'] {
-    _functions('body': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('div': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('invoke': Name@25) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('let': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('mod': Name@27) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('plus': Name@28) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('times': Name@29) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('body': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('body': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@37
     classes('div': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@37
     classes('invoke': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
     classes('let': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
     classes('mod': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
     classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
     classes('times': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('body': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('div': Name@24) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('invoke': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('let': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('mod': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('plus': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('times': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
 }

compiler/testData/diagnostics/tests/regressions/kt575.lazy.log

@@ -1,39 +1,39 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('A': FqName@3) = null
-    _packageFragments('Creature': FqName@4) = null
-    _packageFragments('Int': 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('java.lang.Creature': FqName@11) = null
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('kotlin': FqName@13) = null
-    _packageFragments('kotlin.A': FqName@14) = null
-    _packageFragments('kotlin.Creature': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.io': FqName@17) = null
-    _packageFragments('kotlin.jvm': FqName@18) = null
-    _packageFragments('kt575': FqName@19) = null
-    _packageFragments('kt575.A': FqName@20) = null
-    _packageFragments('kt575.Creature': FqName@21) = null
-    _packageFragments('kt575.Int': FqName@22) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('A': FqName@3) = null
+    packageFragments('Creature': FqName@4) = null
+    packageFragments('Int': 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('java.lang.Creature': FqName@11) = null
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('kotlin': FqName@13) = null
+    packageFragments('kotlin.A': FqName@14) = null
+    packageFragments('kotlin.Creature': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.io': FqName@17) = null
+    packageFragments('kotlin.jvm': FqName@18) = null
+    packageFragments('kt575': FqName@19) = null
+    packageFragments('kt575.A': FqName@20) = null
+    packageFragments('kt575.Creature': FqName@21) = null
+    packageFragments('kt575.Int': FqName@22) = null
 }
 
 LazyJavaPackageFragment@7['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
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    _functions('C': Name@29) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    _functions('inc': Name@31) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     classes('C': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('bbb': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('ccc': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('inc': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('bbb': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('ccc': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('inc': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('C': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('inc': Name@33) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }

compiler/testData/diagnostics/tests/regressions/kt58.lazy.log

@@ -1,102 +1,102 @@
 LazyJavaClassDescriptor@0['Exception'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
 }
 
 LazyJavaClassDescriptor@2['Lock'] {
-    _functionTypeForSamInterface = null
-    _functions('lock': Name@3) = ArrayList@4[1] { JavaMethodDescriptor@5['lock'] } // through LazyJavaClassMemberScope@6
-    _functions('unlock': Name@7) = ArrayList@8[1] { JavaMethodDescriptor@9['unlock'] } // through LazyJavaClassMemberScope@6
-    _properties('lock': Name@3) = EmptyList@10[empty] // through LazyJavaClassMemberScope@6
-    _properties('unlock': Name@7) = EmptyList@10[empty] // through LazyJavaClassMemberScope@6
-    _typeConstructor = LazyJavaClassTypeConstructor@11['Lock']
-    defaultType = JetTypeImpl@12['Lock']
-    enumEntryIndex = LinkedHashMap@13 // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@6
-    nestedClassIndex = LinkedHashMap@15 // through LazyJavaClassMemberScope@6
-    nestedClasses('lock': Name@3) = null // through LazyJavaClassMemberScope@6
-    nestedClasses('unlock': Name@7) = null // through LazyJavaClassMemberScope@6
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@16['<this>']
+    defaultType = JetTypeImpl@3['Lock']
+    enumEntryIndex = LinkedHashMap@4 // through LazyJavaClassMemberScope@5
+    functionTypeForSamInterface = null
+    functions('lock': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['lock'] } // through LazyJavaClassMemberScope@5
+    functions('unlock': Name@9) = ArrayList@10[1] { JavaMethodDescriptor@11['unlock'] } // through LazyJavaClassMemberScope@5
+    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@5
+    nestedClassIndex = LinkedHashMap@13 // through LazyJavaClassMemberScope@5
+    nestedClasses('lock': Name@6) = null // through LazyJavaClassMemberScope@5
+    nestedClasses('unlock': Name@9) = null // through LazyJavaClassMemberScope@5
+    properties('lock': Name@6) = EmptyList@14[empty] // through LazyJavaClassMemberScope@5
+    properties('unlock': Name@9) = EmptyList@14[empty] // through LazyJavaClassMemberScope@5
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@15['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
 }
 
 LazyJavaClassDescriptor@17['RuntimeException'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@18['RuntimeException']
+    typeConstructor = LazyJavaClassTypeConstructor@18['RuntimeException']
 }
 
 LazyJavaClassDescriptor@19['UnsupportedOperationException'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@20['UnsupportedOperationException']
+    typeConstructor = LazyJavaClassTypeConstructor@20['UnsupportedOperationException']
 }
 
 LazyJavaClassTypeConstructor@1['Exception'] {
-    _parameters = ArrayList@21[empty]
-    _supertypes = ArrayList@22[1] { LazyJavaClassifierType@23['Throwable'] }
+    parameters = ArrayList@21[empty]
+    supertypes = ArrayList@22[1] { LazyJavaClassifierType@23['Throwable'] }
 }
 
-LazyJavaClassTypeConstructor@11['Lock'] {
-    _parameters = ArrayList@24[empty]
-    _supertypes = ArrayList@25[1] { JetTypeImpl@26['Any'] }
+LazyJavaClassTypeConstructor@16['Lock'] {
+    parameters = ArrayList@24[empty]
+    supertypes = ArrayList@25[1] { JetTypeImpl@26['Any'] }
 }
 
 LazyJavaClassTypeConstructor@18['RuntimeException'] {
-    _parameters = ArrayList@27[empty]
-    _supertypes = ArrayList@28[1] { LazyJavaClassifierType@29['Exception'] }
+    parameters = ArrayList@27[empty]
+    supertypes = ArrayList@28[1] { LazyJavaClassifierType@29['Exception'] }
 }
 
 LazyJavaClassTypeConstructor@20['UnsupportedOperationException'] {
-    _parameters = ArrayList@30[empty]
-    _supertypes = ArrayList@31[1] { LazyJavaClassifierType@32['RuntimeException'] }
+    parameters = ArrayList@30[empty]
+    supertypes = ArrayList@31[1] { LazyJavaClassifierType@32['RuntimeException'] }
 }
 
 LazyJavaClassifierType@29['Exception'] {
-    _arguments = ArrayList@33[empty]
-    _typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
+    arguments = ArrayList@33[empty]
     classifier = JavaClassImpl@34['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
 }
 
 LazyJavaClassifierType@35['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@36
-    classifier = JavaClassImpl@37['Object']
+    classifier = JavaClassImpl@36['Object']
+    typeConstructor = DeserializedClassTypeConstructor@37
 }
 
 LazyJavaClassifierType@32['RuntimeException'] {
-    _arguments = ArrayList@38[empty]
-    _typeConstructor = LazyJavaClassTypeConstructor@18['RuntimeException']
+    arguments = ArrayList@38[empty]
     classifier = JavaClassImpl@39['RuntimeException']
+    typeConstructor = LazyJavaClassTypeConstructor@18['RuntimeException']
 }
 
 LazyJavaClassifierType@23['Throwable'] {
-    _arguments = ArrayList@40[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@41
-    classifier = JavaClassImpl@42['Throwable']
+    arguments = ArrayList@40[empty]
+    classifier = JavaClassImpl@41['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@42
 }
 
 LazyJavaPackageFragmentProvider@43 {
-    _packageFragments('<root>': FqName@44) = LazyJavaPackageFragment@45['<root>']
-    _packageFragments('Int': FqName@46) = null
-    _packageFragments('Lock': FqName@47) = null
-    _packageFragments('T': FqName@48) = null
-    _packageFragments('UnsupportedOperationException': FqName@49) = null
-    _packageFragments('java': FqName@50) = LazyJavaPackageFragment@51['java']
-    _packageFragments('java.lang': FqName@52) = LazyJavaPackageFragment@53['lang']
-    _packageFragments('java.lang.Int': FqName@54) = null
-    _packageFragments('java.lang.Lock': FqName@55) = null
-    _packageFragments('java.lang.T': FqName@56) = null
-    _packageFragments('java.lang.UnsupportedOperationException': FqName@57) = null
-    _packageFragments('java.util': FqName@58) = LazyJavaPackageFragment@59['util']
-    _packageFragments('java.util.concurrent': FqName@60) = LazyJavaPackageFragment@61['concurrent']
-    _packageFragments('java.util.concurrent.locks': FqName@62) = LazyJavaPackageFragment@63['locks']
-    _packageFragments('java.util.concurrent.locks.Lock': FqName@64) = null
-    _packageFragments('kotlin': FqName@65) = null
-    _packageFragments('kotlin.Int': FqName@66) = null
-    _packageFragments('kotlin.Lock': FqName@67) = null
-    _packageFragments('kotlin.T': FqName@68) = null
-    _packageFragments('kotlin.UnsupportedOperationException': FqName@69) = null
-    _packageFragments('kotlin.io': FqName@70) = null
-    _packageFragments('kotlin.jvm': FqName@71) = null
-    _packageFragments('kt58': FqName@72) = null
-    _packageFragments('kt58.Int': FqName@73) = null
-    _packageFragments('kt58.Lock': FqName@74) = null
-    _packageFragments('kt58.T': FqName@75) = null
-    _packageFragments('kt58.UnsupportedOperationException': FqName@76) = null
+    packageFragments('<root>': FqName@44) = LazyJavaPackageFragment@45['<root>']
+    packageFragments('Int': FqName@46) = null
+    packageFragments('Lock': FqName@47) = null
+    packageFragments('T': FqName@48) = null
+    packageFragments('UnsupportedOperationException': FqName@49) = null
+    packageFragments('java': FqName@50) = LazyJavaPackageFragment@51['java']
+    packageFragments('java.lang': FqName@52) = LazyJavaPackageFragment@53['lang']
+    packageFragments('java.lang.Int': FqName@54) = null
+    packageFragments('java.lang.Lock': FqName@55) = null
+    packageFragments('java.lang.T': FqName@56) = null
+    packageFragments('java.lang.UnsupportedOperationException': FqName@57) = null
+    packageFragments('java.util': FqName@58) = LazyJavaPackageFragment@59['util']
+    packageFragments('java.util.concurrent': FqName@60) = LazyJavaPackageFragment@61['concurrent']
+    packageFragments('java.util.concurrent.locks': FqName@62) = LazyJavaPackageFragment@63['locks']
+    packageFragments('java.util.concurrent.locks.Lock': FqName@64) = null
+    packageFragments('kotlin': FqName@65) = null
+    packageFragments('kotlin.Int': FqName@66) = null
+    packageFragments('kotlin.Lock': FqName@67) = null
+    packageFragments('kotlin.T': FqName@68) = null
+    packageFragments('kotlin.UnsupportedOperationException': FqName@69) = null
+    packageFragments('kotlin.io': FqName@70) = null
+    packageFragments('kotlin.jvm': FqName@71) = null
+    packageFragments('kt58': FqName@72) = null
+    packageFragments('kt58.Int': FqName@73) = null
+    packageFragments('kt58.Lock': FqName@74) = null
+    packageFragments('kt58.T': FqName@75) = null
+    packageFragments('kt58.UnsupportedOperationException': FqName@76) = null
     topLevelClasses(JavaClassImpl@34['Exception']) = LazyJavaClassDescriptor@0['Exception']
     topLevelClasses(JavaClassImpl@77['Lock']) = LazyJavaClassDescriptor@2['Lock']
     topLevelClasses(JavaClassImpl@39['RuntimeException']) = LazyJavaClassDescriptor@17['RuntimeException']
@@ -104,47 +104,47 @@ LazyJavaPackageFragmentProvider@43 {
 }
 
 LazyJavaPackageFragment@61['concurrent'] {
-    _functions('locks': Name@79) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('locks': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('locks': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('locks': Name@82) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@80
 }
 
 LazyJavaPackageFragment@51['java'] {
-    _functions('lang': Name@84) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    _functions('util': Name@86) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('lang': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('util': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('util': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('lang': Name@87) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('util': Name@88) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@85
     memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
 LazyJavaPackageFragment@53['lang'] {
-    _functions('body': Name@90) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    _functions('doSmth': Name@92) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    _functions('invoke': Name@93) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    _functions('lock': Name@3) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    _functions('unlock': Name@7) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('UnsupportedOperationException': Name@94) = LazyJavaClassDescriptor@19['UnsupportedOperationException'] // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('body': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('doSmth': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('invoke': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('lock': Name@3) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('unlock': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@91
+    classes('UnsupportedOperationException': Name@90) = LazyJavaClassDescriptor@19['UnsupportedOperationException'] // through LazyPackageFragmentScopeForJavaPackage@91
+    classes('body': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@91
+    classes('doSmth': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@91
+    classes('invoke': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@91
+    classes('lock': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@91
+    classes('unlock': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@91
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@91
+    functions('body': Name@92) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@91
+    functions('doSmth': Name@93) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@91
+    functions('invoke': Name@94) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@91
+    functions('lock': Name@6) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@91
+    functions('unlock': Name@9) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@91
     memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@91
 }
 
 LazyJavaPackageFragment@63['locks'] {
-    _functions('Lock': Name@96) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('Lock': Name@98) = LazyJavaClassDescriptor@2['Lock'] // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('Lock': Name@96) = LazyJavaClassDescriptor@2['Lock'] // through LazyPackageFragmentScopeForJavaPackage@97
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@97
+    functions('Lock': Name@98) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@97
     memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@97
 }
 
 LazyJavaPackageFragment@59['util'] {
-    _functions('concurrent': Name@100) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('concurrent': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@101
+    classes('concurrent': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@101
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@101
+    functions('concurrent': Name@102) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@101
     memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@101
 }

compiler/testData/diagnostics/tests/regressions/kt580.lazy.log

@@ -4,393 +4,383 @@ DescriptorResolver@0 {
 }
 
 LazyJavaClassDescriptor@3['AbstractCollection'] {
-    _functions('add': Name@4) = ArrayList@5[1] { JavaMethodDescriptor@6['add'] } // through LazyJavaClassMemberScope@7
-    _properties('add': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    _typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
-    defaultType = JetTypeImpl@11['AbstractCollection<1>']
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@13['<this>']
+    defaultType = JetTypeImpl@4['AbstractCollection<1>']
+    functions('add': Name@5) = ArrayList@6[1] { JavaMethodDescriptor@7['add'] } // through LazyJavaClassMemberScope@8
+    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@8
+    properties('add': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@8
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@13['AbstractCollection']
 }
 
 LazyJavaClassDescriptor@14['AbstractList'] {
-    _functions('add': Name@15) = ArrayList@16[2] { JavaMethodDescriptor@17['add'], JavaMethodDescriptor@18['add'] } // through LazyJavaClassMemberScope@19
-    _properties('add': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@19
-    _typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
-    defaultType = JetTypeImpl@21['AbstractList<1>']
-    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@19
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@23['<this>']
+    defaultType = JetTypeImpl@15['AbstractList<1>']
+    functions('add': Name@16) = ArrayList@17[2] { JavaMethodDescriptor@18['add'], JavaMethodDescriptor@19['add'] } // through LazyJavaClassMemberScope@20
+    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@20
+    properties('add': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@20
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@22['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@23['AbstractList']
 }
 
 LazyJavaClassDescriptor@24['ArrayList'] {
-    _constructors = ArrayList@25[3] { JavaConstructorDescriptor@26['<init>'], JavaConstructorDescriptor@27['<init>'], JavaConstructorDescriptor@28['<init>'] } // through LazyJavaClassMemberScope@29
-    _functionTypeForSamInterface = null
-    _functions('add': Name@8) = ArrayList@30[2] { JavaMethodDescriptor@31['add'], JavaMethodDescriptor@32['add'] } // through LazyJavaClassMemberScope@29
-    _properties('add': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@29
-    _typeConstructor = LazyJavaClassTypeConstructor@33['ArrayList']
-    defaultType = JetTypeImpl@34['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@29
-    memberIndex = computeMemberIndex$1@36 // through LazyJavaClassMemberScope@29
-    nestedClassIndex = LinkedHashMap@37 // through LazyJavaClassMemberScope@29
-    nestedClasses('add': Name@8) = null // through LazyJavaClassMemberScope@29
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@38['<this>']
+    constructors = ArrayList@25[3] { JavaConstructorDescriptor@26['<init>'], JavaConstructorDescriptor@27['<init>'], JavaConstructorDescriptor@28['<init>'] } // through LazyJavaClassMemberScope@29
+    defaultType = JetTypeImpl@30['ArrayList<1>']
+    enumEntryIndex = LinkedHashMap@31 // through LazyJavaClassMemberScope@29
+    functionTypeForSamInterface = null
+    functions('add': Name@10) = ArrayList@32[2] { JavaMethodDescriptor@33['add'], JavaMethodDescriptor@34['add'] } // through LazyJavaClassMemberScope@29
+    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@29
+    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@29
+    nestedClasses('add': Name@10) = null // through LazyJavaClassMemberScope@29
+    properties('add': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@29
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@37['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@38['ArrayList']
 }
 
 LazyJavaClassDescriptor@39['RandomAccess'] {
-    _functions('add': Name@15) = EmptyList@9[empty] // through LazyJavaClassMemberScope@40
-    _properties('add': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@40
-    _typeConstructor = LazyJavaClassTypeConstructor@41['RandomAccess']
-    memberIndex = computeMemberIndex$1@42 // through LazyJavaClassMemberScope@40
+    functions('add': Name@16) = EmptyList@11[empty] // through LazyJavaClassMemberScope@40
+    memberIndex = computeMemberIndex$1@41 // through LazyJavaClassMemberScope@40
+    properties('add': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@40
+    typeConstructor = LazyJavaClassTypeConstructor@42['RandomAccess']
 }
 
 LazyJavaClassDescriptor@43['Serializable'] {
-    _functions('add': Name@15) = EmptyList@9[empty] // through LazyJavaClassMemberScope@44
-    _properties('add': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@44
-    _typeConstructor = LazyJavaClassTypeConstructor@45['Serializable']
-    memberIndex = computeMemberIndex$1@46 // through LazyJavaClassMemberScope@44
+    functions('add': Name@16) = EmptyList@11[empty] // through LazyJavaClassMemberScope@44
+    memberIndex = computeMemberIndex$1@45 // through LazyJavaClassMemberScope@44
+    properties('add': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@44
+    typeConstructor = LazyJavaClassTypeConstructor@46['Serializable']
 }
 
-LazyJavaClassTypeConstructor@10['AbstractCollection'] {
-    _parameters = ArrayList@47[1] { LazyJavaTypeParameterDescriptor@48['E'] }
-    _supertypes = ArrayList@49[1] { LazyJavaClassifierType@50['Collection<E>'] }
+LazyJavaClassTypeConstructor@13['AbstractCollection'] {
+    parameters = ArrayList@47[1] { LazyJavaTypeParameterDescriptor@48['E'] }
+    supertypes = ArrayList@49[1] { LazyJavaClassifierType@50['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@20['AbstractList'] {
-    _parameters = ArrayList@51[1] { LazyJavaTypeParameterDescriptor@52['E'] }
-    _supertypes = ArrayList@53[2] { LazyJavaClassifierType@54['AbstractCollection<E>'], LazyJavaClassifierType@55['List<E>'] }
+LazyJavaClassTypeConstructor@23['AbstractList'] {
+    parameters = ArrayList@51[1] { LazyJavaTypeParameterDescriptor@52['E'] }
+    supertypes = ArrayList@53[2] { LazyJavaClassifierType@54['AbstractCollection<E>'], LazyJavaClassifierType@55['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@33['ArrayList'] {
-    _parameters = ArrayList@56[1] { LazyJavaTypeParameterDescriptor@57['E'] }
-    _supertypes = ArrayList@58[5] { LazyJavaClassifierType@59['AbstractList<E>'], LazyJavaClassifierType@60['List<E>'], LazyJavaClassifierType@61['RandomAccess'], ... }
+LazyJavaClassTypeConstructor@38['ArrayList'] {
+    parameters = ArrayList@56[1] { LazyJavaTypeParameterDescriptor@57['E'] }
+    supertypes = ArrayList@58[5] { LazyJavaClassifierType@59['AbstractList<E>'], LazyJavaClassifierType@60['List<E>'], LazyJavaClassifierType@61['RandomAccess'], ... }
 }
 
-LazyJavaClassTypeConstructor@41['RandomAccess'] {
-    _parameters = ArrayList@62[empty]
-    _supertypes = ArrayList@63[1] { JetTypeImpl@64['Any'] }
+LazyJavaClassTypeConstructor@42['RandomAccess'] {
+    parameters = ArrayList@62[empty]
+    supertypes = ArrayList@63[1] { JetTypeImpl@64['Any'] }
 }
 
-LazyJavaClassTypeConstructor@45['Serializable'] {
-    _parameters = ArrayList@65[empty]
-    _supertypes = ArrayList@66[1] { JetTypeImpl@64['Any'] }
+LazyJavaClassTypeConstructor@46['Serializable'] {
+    parameters = ArrayList@65[empty]
+    supertypes = ArrayList@66[1] { JetTypeImpl@64['Any'] }
 }
 
 LazyJavaClassifierType@54['AbstractCollection<E>'] {
-    _arguments = ArrayList@67[1] { TypeProjectionImpl@68 }
-    _memberScope = SubstitutingScope@69
-    _typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
-    classifier = JavaClassImpl@70['AbstractCollection']
+    arguments = ArrayList@67[1] { TypeProjectionImpl@68 }
+    classifier = JavaClassImpl@69['AbstractCollection']
+    memberScope = SubstitutingScope@70
+    typeConstructor = LazyJavaClassTypeConstructor@13['AbstractCollection']
 }
 
 LazyJavaClassifierType@59['AbstractList<E>'] {
-    _arguments = ArrayList@71[1] { TypeProjectionImpl@72 }
-    _memberScope = SubstitutingScope@73
-    _typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
-    classifier = JavaClassImpl@74['AbstractList']
+    arguments = ArrayList@71[1] { TypeProjectionImpl@72 }
+    classifier = JavaClassImpl@73['AbstractList']
+    memberScope = SubstitutingScope@74
+    typeConstructor = LazyJavaClassTypeConstructor@23['AbstractList']
 }
 
 LazyJavaClassifierType@75['Cloneable'] {
-    _arguments = ArrayList@76[empty]
-    _memberScope = DeserializedClassMemberScope@77
-    _typeConstructor = DeserializedClassTypeConstructor@78
-    classifier = JavaClassImpl@79['Cloneable']
+    arguments = ArrayList@76[empty]
+    classifier = JavaClassImpl@77['Cloneable']
+    memberScope = DeserializedClassMemberScope@78
+    typeConstructor = DeserializedClassTypeConstructor@79
 }
 
 LazyJavaClassifierType@80['Collection<? extends E>'] {
-    _arguments = ArrayList@81[1] { TypeProjectionImpl@82 }
-    _memberScope = SubstitutingScope@83
-    _nullable = 'false': Boolean@84
-    _typeConstructor = DeserializedClassTypeConstructor@85
-    classifier = JavaClassImpl@86['Collection']
+    arguments = ArrayList@81[1] { TypeProjectionImpl@82 }
+    classifier = JavaClassImpl@83['Collection']
+    memberScope = SubstitutingScope@84
+    nullable = 'false': Boolean@85
+    typeConstructor = DeserializedClassTypeConstructor@86
 }
 
 LazyJavaClassifierType@87['Collection<? extends E>'] {
-    _arguments = ArrayList@88[1] { TypeProjectionImpl@89 }
-    _memberScope = SubstitutingScope@90
-    _nullable = 'true': Boolean@91
-    _typeConstructor = DeserializedClassTypeConstructor@92
-    classifier = JavaClassImpl@86['Collection']
+    arguments = ArrayList@88[1] { TypeProjectionImpl@89 }
+    classifier = JavaClassImpl@83['Collection']
+    memberScope = SubstitutingScope@90
+    nullable = 'true': Boolean@91
+    typeConstructor = DeserializedClassTypeConstructor@92
 }
 
 LazyJavaClassifierType@50['Collection<E>'] {
-    _arguments = ArrayList@93[1] { TypeProjectionImpl@94 }
-    _memberScope = SubstitutingScope@95
-    _typeConstructor = DeserializedClassTypeConstructor@85
-    classifier = JavaClassImpl@96['Collection']
+    arguments = ArrayList@93[1] { TypeProjectionImpl@94 }
+    classifier = JavaClassImpl@95['Collection']
+    memberScope = SubstitutingScope@96
+    typeConstructor = DeserializedClassTypeConstructor@86
 }
 
 LazyJavaClassifierType@97['E'] {
-    _arguments = ArrayList@98[empty]
-    _nullable = 'false': Boolean@84
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-    classifier = JavaTypeParameterImpl@100['E']
+    arguments = ArrayList@98[empty]
+    classifier = JavaTypeParameterImpl@99['E']
+    nullable = 'false': Boolean@85
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
 LazyJavaClassifierType@101['E'] {
-    _arguments = ArrayList@102[empty]
-    _nullable = 'false': Boolean@84
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    arguments = ArrayList@102[empty]
     classifier = JavaTypeParameterImpl@103['E']
+    nullable = 'false': Boolean@85
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@104
 }
 
-LazyJavaClassifierType@104['E'] {
-    _arguments = ArrayList@105[empty]
-    _nullable = 'false': Boolean@84
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+LazyJavaClassifierType@105['E'] {
+    arguments = ArrayList@106[empty]
     classifier = JavaTypeParameterImpl@107['E']
+    nullable = 'false': Boolean@85
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
-LazyJavaClassifierType@108['E'] {
-    _arguments = ArrayList@109[empty]
-    _nullable = 'false': Boolean@84
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-    classifier = JavaTypeParameterImpl@110['E']
+LazyJavaClassifierType@109['E'] {
+    arguments = ArrayList@110[empty]
+    classifier = JavaTypeParameterImpl@111['E']
+    nullable = 'false': Boolean@85
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
-LazyJavaClassifierType@111['E'] {
-    _arguments = ArrayList@112[empty]
-    _nullable = 'false': Boolean@84
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-    classifier = JavaTypeParameterImpl@113['E']
+LazyJavaClassifierType@112['E'] {
+    arguments = ArrayList@113[empty]
+    classifier = JavaTypeParameterImpl@114['E']
+    nullable = 'false': Boolean@85
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
-LazyJavaClassifierType@114['E'] {
-    _arguments = ArrayList@115[empty]
-    _nullable = 'false': Boolean@84
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+LazyJavaClassifierType@115['E'] {
+    arguments = ArrayList@116[empty]
     classifier = JavaTypeParameterImpl@117['E']
+    nullable = 'false': Boolean@85
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@118['E'] {
-    _arguments = ArrayList@119[empty]
-    _nullable = 'false': Boolean@84
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    arguments = ArrayList@119[empty]
     classifier = JavaTypeParameterImpl@120['E']
+    nullable = 'false': Boolean@85
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
 LazyJavaClassifierType@121['E'] {
-    _arguments = ArrayList@122[empty]
-    _nullable = 'false': Boolean@84
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    arguments = ArrayList@122[empty]
     classifier = JavaTypeParameterImpl@123['E']
+    nullable = 'false': Boolean@85
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@124['E'] {
-    _arguments = ArrayList@125[empty]
-    _nullable = 'false': Boolean@84
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+    arguments = ArrayList@125[empty]
     classifier = JavaTypeParameterImpl@126['E']
+    nullable = 'false': Boolean@85
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@127['E'] {
-    _arguments = ArrayList@128[empty]
-    _nullable = 'false': Boolean@84
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    arguments = ArrayList@128[empty]
     classifier = JavaTypeParameterImpl@129['E']
+    nullable = 'false': Boolean@85
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@104
 }
 
 LazyJavaClassifierType@130['E'] {
-    _arguments = ArrayList@131[empty]
-    _nullable = 'false': Boolean@84
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+    arguments = ArrayList@131[empty]
     classifier = JavaTypeParameterImpl@132['E']
+    nullable = 'false': Boolean@85
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
 LazyJavaClassifierType@133['E'] {
-    _arguments = ArrayList@134[empty]
-    _nullable = 'false': Boolean@84
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    arguments = ArrayList@134[empty]
     classifier = JavaTypeParameterImpl@135['E']
+    nullable = 'false': Boolean@85
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@136['E'] {
-    _arguments = ArrayList@137[empty]
-    _nullable = 'true': Boolean@91
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-    classifier = JavaTypeParameterImpl@110['E']
+    arguments = ArrayList@137[empty]
+    classifier = JavaTypeParameterImpl@103['E']
+    nullable = 'true': Boolean@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@104
 }
 
 LazyJavaClassifierType@138['E'] {
-    _arguments = ArrayList@139[empty]
-    _nullable = 'true': Boolean@91
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-    classifier = JavaTypeParameterImpl@126['E']
+    arguments = ArrayList@139[empty]
+    classifier = JavaTypeParameterImpl@132['E']
+    nullable = 'true': Boolean@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
 LazyJavaClassifierType@140['E'] {
-    _arguments = ArrayList@141[empty]
-    _nullable = 'true': Boolean@91
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-    classifier = JavaTypeParameterImpl@120['E']
+    arguments = ArrayList@141[empty]
+    classifier = JavaTypeParameterImpl@117['E']
+    nullable = 'true': Boolean@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@142['E'] {
-    _arguments = ArrayList@143[empty]
-    _nullable = 'true': Boolean@91
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-    classifier = JavaTypeParameterImpl@103['E']
+    arguments = ArrayList@143[empty]
+    classifier = JavaTypeParameterImpl@129['E']
+    nullable = 'true': Boolean@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@104
 }
 
 LazyJavaClassifierType@144['E'] {
-    _arguments = ArrayList@145[empty]
-    _nullable = 'true': Boolean@91
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
-    classifier = JavaTypeParameterImpl@117['E']
+    arguments = ArrayList@145[empty]
+    classifier = JavaTypeParameterImpl@107['E']
+    nullable = 'true': Boolean@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@146['E'] {
-    _arguments = ArrayList@147[empty]
-    _nullable = 'true': Boolean@91
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-    classifier = JavaTypeParameterImpl@132['E']
+    arguments = ArrayList@147[empty]
+    classifier = JavaTypeParameterImpl@114['E']
+    nullable = 'true': Boolean@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
 LazyJavaClassifierType@148['E'] {
-    _arguments = ArrayList@149[empty]
-    _nullable = 'true': Boolean@91
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-    classifier = JavaTypeParameterImpl@113['E']
+    arguments = ArrayList@149[empty]
+    classifier = JavaTypeParameterImpl@111['E']
+    nullable = 'true': Boolean@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@150['E'] {
-    _arguments = ArrayList@151[empty]
-    _nullable = 'true': Boolean@91
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-    classifier = JavaTypeParameterImpl@107['E']
+    arguments = ArrayList@151[empty]
+    classifier = JavaTypeParameterImpl@123['E']
+    nullable = 'true': Boolean@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@152['E'] {
-    _arguments = ArrayList@153[empty]
-    _nullable = 'true': Boolean@91
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    arguments = ArrayList@153[empty]
     classifier = JavaTypeParameterImpl@135['E']
+    nullable = 'true': Boolean@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@154['E'] {
-    _arguments = ArrayList@155[empty]
-    _nullable = 'true': Boolean@91
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-    classifier = JavaTypeParameterImpl@100['E']
+    arguments = ArrayList@155[empty]
+    classifier = JavaTypeParameterImpl@120['E']
+    nullable = 'true': Boolean@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
 LazyJavaClassifierType@156['E'] {
-    _arguments = ArrayList@157[empty]
-    _nullable = 'true': Boolean@91
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
-    classifier = JavaTypeParameterImpl@123['E']
+    arguments = ArrayList@157[empty]
+    classifier = JavaTypeParameterImpl@99['E']
+    nullable = 'true': Boolean@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
 LazyJavaClassifierType@158['E'] {
-    _arguments = ArrayList@159[empty]
-    _nullable = 'true': Boolean@91
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-    classifier = JavaTypeParameterImpl@129['E']
+    arguments = ArrayList@159[empty]
+    classifier = JavaTypeParameterImpl@126['E']
+    nullable = 'true': Boolean@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@55['List<E>'] {
-    _arguments = ArrayList@160[1] { TypeProjectionImpl@161 }
-    _memberScope = SubstitutingScope@162
-    _typeConstructor = DeserializedClassTypeConstructor@163
-    classifier = JavaClassImpl@164['List']
+    arguments = ArrayList@160[1] { TypeProjectionImpl@161 }
+    classifier = JavaClassImpl@162['List']
+    memberScope = SubstitutingScope@163
+    typeConstructor = DeserializedClassTypeConstructor@164
 }
 
 LazyJavaClassifierType@60['List<E>'] {
-    _arguments = ArrayList@165[1] { TypeProjectionImpl@166 }
-    _memberScope = SubstitutingScope@167
-    _typeConstructor = DeserializedClassTypeConstructor@163
-    classifier = JavaClassImpl@168['List']
+    arguments = ArrayList@165[1] { TypeProjectionImpl@166 }
+    classifier = JavaClassImpl@167['List']
+    memberScope = SubstitutingScope@168
+    typeConstructor = DeserializedClassTypeConstructor@164
 }
 
 LazyJavaClassifierType@169['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@170
-    classifier = JavaClassImpl@171['Object']
+    classifier = JavaClassImpl@170['Object']
+    typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@172['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@170
     classifier = JavaClassImpl@173['Object']
+    typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@174['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@170
     classifier = JavaClassImpl@175['Object']
+    typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@61['RandomAccess'] {
-    _arguments = ArrayList@176[empty]
-    _memberScope = LazyJavaClassMemberScope@40
-    _typeConstructor = LazyJavaClassTypeConstructor@41['RandomAccess']
+    arguments = ArrayList@176[empty]
     classifier = JavaClassImpl@177['RandomAccess']
+    memberScope = LazyJavaClassMemberScope@40
+    typeConstructor = LazyJavaClassTypeConstructor@42['RandomAccess']
 }
 
 LazyJavaClassifierType@178['Serializable'] {
-    _arguments = ArrayList@179[empty]
-    _memberScope = LazyJavaClassMemberScope@44
-    _typeConstructor = LazyJavaClassTypeConstructor@45['Serializable']
+    arguments = ArrayList@179[empty]
     classifier = JavaClassImpl@180['Serializable']
+    memberScope = LazyJavaClassMemberScope@44
+    typeConstructor = LazyJavaClassTypeConstructor@46['Serializable']
 }
 
 LazyJavaPackageFragmentProvider@181 {
-    _packageFragments('<root>': FqName@182) = LazyJavaPackageFragment@183['<root>']
-    _packageFragments('Array': FqName@184) = null
-    _packageFragments('Int': FqName@185) = null
-    _packageFragments('String': FqName@186) = null
-    _packageFragments('T': FqName@187) = null
-    _packageFragments('java': FqName@188) = LazyJavaPackageFragment@189['java']
-    _packageFragments('java.io': FqName@190) = LazyJavaPackageFragment@191['io']
-    _packageFragments('java.lang': FqName@192) = LazyJavaPackageFragment@193['lang']
-    _packageFragments('java.lang.Array': FqName@194) = null
-    _packageFragments('java.lang.Int': FqName@195) = null
-    _packageFragments('java.lang.String': FqName@196) = null
-    _packageFragments('java.lang.T': FqName@197) = null
-    _packageFragments('java.util': FqName@198) = LazyJavaPackageFragment@199['util']
-    _packageFragments('java.util.Array': FqName@200) = null
-    _packageFragments('java.util.Int': FqName@201) = null
-    _packageFragments('java.util.String': FqName@202) = null
-    _packageFragments('java.util.T': FqName@203) = null
-    _packageFragments('kotlin': FqName@204) = null
-    _packageFragments('kotlin.Array': FqName@205) = null
-    _packageFragments('kotlin.Int': FqName@206) = null
-    _packageFragments('kotlin.String': FqName@207) = null
-    _packageFragments('kotlin.T': FqName@208) = null
-    _packageFragments('kotlin.io': FqName@209) = null
-    _packageFragments('kotlin.jvm': FqName@210) = null
-    _packageFragments('whats': FqName@211) = null
-    _packageFragments('whats.the': FqName@212) = null
-    _packageFragments('whats.the.difference': FqName@213) = null
-    _packageFragments('whats.the.difference.Array': FqName@214) = null
-    _packageFragments('whats.the.difference.Int': FqName@215) = null
-    _packageFragments('whats.the.difference.String': FqName@216) = null
-    _packageFragments('whats.the.difference.T': FqName@217) = null
-    _packageFragments('whats.the.difference.lastIndex': FqName@218) = null
-    topLevelClasses(JavaClassImpl@70['AbstractCollection']) = LazyJavaClassDescriptor@3['AbstractCollection']
-    topLevelClasses(JavaClassImpl@74['AbstractList']) = LazyJavaClassDescriptor@14['AbstractList']
+    packageFragments('<root>': FqName@182) = LazyJavaPackageFragment@183['<root>']
+    packageFragments('Array': FqName@184) = null
+    packageFragments('Int': FqName@185) = null
+    packageFragments('String': FqName@186) = null
+    packageFragments('T': FqName@187) = null
+    packageFragments('java': FqName@188) = LazyJavaPackageFragment@189['java']
+    packageFragments('java.io': FqName@190) = LazyJavaPackageFragment@191['io']
+    packageFragments('java.lang': FqName@192) = LazyJavaPackageFragment@193['lang']
+    packageFragments('java.lang.Array': FqName@194) = null
+    packageFragments('java.lang.Int': FqName@195) = null
+    packageFragments('java.lang.String': FqName@196) = null
+    packageFragments('java.lang.T': FqName@197) = null
+    packageFragments('java.util': FqName@198) = LazyJavaPackageFragment@199['util']
+    packageFragments('java.util.Array': FqName@200) = null
+    packageFragments('java.util.Int': FqName@201) = null
+    packageFragments('java.util.String': FqName@202) = null
+    packageFragments('java.util.T': FqName@203) = null
+    packageFragments('kotlin': FqName@204) = null
+    packageFragments('kotlin.Array': FqName@205) = null
+    packageFragments('kotlin.Int': FqName@206) = null
+    packageFragments('kotlin.String': FqName@207) = null
+    packageFragments('kotlin.T': FqName@208) = null
+    packageFragments('kotlin.io': FqName@209) = null
+    packageFragments('kotlin.jvm': FqName@210) = null
+    packageFragments('whats': FqName@211) = null
+    packageFragments('whats.the': FqName@212) = null
+    packageFragments('whats.the.difference': FqName@213) = null
+    packageFragments('whats.the.difference.Array': FqName@214) = null
+    packageFragments('whats.the.difference.Int': FqName@215) = null
+    packageFragments('whats.the.difference.String': FqName@216) = null
+    packageFragments('whats.the.difference.T': FqName@217) = null
+    packageFragments('whats.the.difference.lastIndex': FqName@218) = null
+    topLevelClasses(JavaClassImpl@69['AbstractCollection']) = LazyJavaClassDescriptor@3['AbstractCollection']
+    topLevelClasses(JavaClassImpl@73['AbstractList']) = LazyJavaClassDescriptor@14['AbstractList']
     topLevelClasses(JavaClassImpl@219['ArrayList']) = LazyJavaClassDescriptor@24['ArrayList']
     topLevelClasses(JavaClassImpl@177['RandomAccess']) = LazyJavaClassDescriptor@39['RandomAccess']
     topLevelClasses(JavaClassImpl@180['Serializable']) = LazyJavaClassDescriptor@43['Serializable']
 }
 
 LazyJavaPackageFragment@189['java'] {
-    _functions('lang': Name@220) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    _functions('util': Name@222) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('lang': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('util': Name@224) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    deserializedPackageScope = Empty@225 // through LazyPackageFragmentScopeForJavaPackage@221
+    classes('lang': Name@220) = null // through LazyPackageFragmentScopeForJavaPackage@221
+    classes('util': Name@222) = null // through LazyPackageFragmentScopeForJavaPackage@221
+    deserializedPackageScope = Empty@223 // through LazyPackageFragmentScopeForJavaPackage@221
+    functions('lang': Name@224) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@221
+    functions('util': Name@225) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@221
     memberIndex = computeMemberIndex$1@226 // through LazyPackageFragmentScopeForJavaPackage@221
 }
 
 LazyJavaPackageFragment@193['lang'] {
-    _functions('ArrayList': Name@227) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    _functions('add': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    _functions('get': Name@229) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    _functions('hasNext': Name@230) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    _functions('iarray': Name@231) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    _functions('iterator': Name@232) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    _functions('lastIndex': Name@233) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    _functions('minus': Name@234) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    _functions('next': Name@235) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    _functions('rangeTo': Name@236) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@228
     classes('ArrayList': Name@227) = null // through LazyPackageFragmentScopeForJavaPackage@228
-    classes('add': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@228
+    classes('add': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@228
     classes('get': Name@229) = null // through LazyPackageFragmentScopeForJavaPackage@228
     classes('hasNext': Name@230) = null // through LazyPackageFragmentScopeForJavaPackage@228
     classes('iarray': Name@231) = null // through LazyPackageFragmentScopeForJavaPackage@228
@@ -400,56 +390,66 @@ LazyJavaPackageFragment@193['lang'] {
     classes('next': Name@235) = null // through LazyPackageFragmentScopeForJavaPackage@228
     classes('rangeTo': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@228
     classes('size': Name@237) = null // through LazyPackageFragmentScopeForJavaPackage@228
-    deserializedPackageScope = Empty@225 // through LazyPackageFragmentScopeForJavaPackage@228
+    deserializedPackageScope = Empty@223 // through LazyPackageFragmentScopeForJavaPackage@228
+    functions('ArrayList': Name@227) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@228
+    functions('add': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@228
+    functions('get': Name@229) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@228
+    functions('hasNext': Name@230) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@228
+    functions('iarray': Name@231) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@228
+    functions('iterator': Name@232) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@228
+    functions('lastIndex': Name@233) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@228
+    functions('minus': Name@234) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@228
+    functions('next': Name@235) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@228
+    functions('rangeTo': Name@236) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@228
     memberIndex = computeMemberIndex$1@238 // through LazyPackageFragmentScopeForJavaPackage@228
 }
 
 LazyJavaPackageFragment@199['util'] {
-    _functions('ArrayList': Name@227) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    _functions('add': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    _functions('get': Name@229) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    _functions('hasNext': Name@230) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    _functions('iarray': Name@231) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    _functions('iterator': Name@232) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    _functions('lastIndex': Name@233) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    _functions('minus': Name@234) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    _functions('next': Name@235) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    _functions('rangeTo': Name@236) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('Array': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('ArrayList': Name@227) = LazyJavaClassDescriptor@24['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('Int': Name@241) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('String': Name@242) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('add': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('get': Name@229) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('hasNext': Name@230) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('iarray': Name@231) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('iterator': Name@232) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('lastIndex': Name@233) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('minus': Name@234) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('next': Name@235) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('rangeTo': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('size': Name@237) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    deserializedPackageScope = Empty@225 // through LazyPackageFragmentScopeForJavaPackage@239
-    memberIndex = computeMemberIndex$1@243 // through LazyPackageFragmentScopeForJavaPackage@239
+    classes('Array': Name@239) = null // through LazyPackageFragmentScopeForJavaPackage@240
+    classes('ArrayList': Name@227) = LazyJavaClassDescriptor@24['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@240
+    classes('Int': Name@241) = null // through LazyPackageFragmentScopeForJavaPackage@240
+    classes('String': Name@242) = null // through LazyPackageFragmentScopeForJavaPackage@240
+    classes('add': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@240
+    classes('get': Name@229) = null // through LazyPackageFragmentScopeForJavaPackage@240
+    classes('hasNext': Name@230) = null // through LazyPackageFragmentScopeForJavaPackage@240
+    classes('iarray': Name@231) = null // through LazyPackageFragmentScopeForJavaPackage@240
+    classes('iterator': Name@232) = null // through LazyPackageFragmentScopeForJavaPackage@240
+    classes('lastIndex': Name@233) = null // through LazyPackageFragmentScopeForJavaPackage@240
+    classes('minus': Name@234) = null // through LazyPackageFragmentScopeForJavaPackage@240
+    classes('next': Name@235) = null // through LazyPackageFragmentScopeForJavaPackage@240
+    classes('rangeTo': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@240
+    classes('size': Name@237) = null // through LazyPackageFragmentScopeForJavaPackage@240
+    deserializedPackageScope = Empty@223 // through LazyPackageFragmentScopeForJavaPackage@240
+    functions('ArrayList': Name@227) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@240
+    functions('add': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@240
+    functions('get': Name@229) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@240
+    functions('hasNext': Name@230) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@240
+    functions('iarray': Name@231) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@240
+    functions('iterator': Name@232) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@240
+    functions('lastIndex': Name@233) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@240
+    functions('minus': Name@234) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@240
+    functions('next': Name@235) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@240
+    functions('rangeTo': Name@236) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@240
+    memberIndex = computeMemberIndex$1@243 // through LazyPackageFragmentScopeForJavaPackage@240
 }
 
-LazyJavaTypeParameterDescriptor@48['E'] {
+LazyJavaTypeParameterDescriptor@57['E'] {
     defaultType = JetTypeImpl@244['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
     upperBounds = LinkedHashSet@245[1] { NullableType@246 }
     upperBoundsAsType = NullableType@246
 }
 
 LazyJavaTypeParameterDescriptor@52['E'] {
     defaultType = JetTypeImpl@247['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
     upperBounds = LinkedHashSet@248[1] { NullableType@249 }
     upperBoundsAsType = NullableType@249
 }
 
-LazyJavaTypeParameterDescriptor@57['E'] {
+LazyJavaTypeParameterDescriptor@48['E'] {
     defaultType = JetTypeImpl@250['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@104
     upperBounds = LinkedHashSet@251[1] { NullableType@252 }
     upperBoundsAsType = NullableType@252
 }
@@ -459,29 +459,29 @@ LazyJavaTypeParameterResolver@253 {
 }
 
 LazyJavaTypeParameterResolver@255 {
-    resolve(JavaTypeParameterImpl@256['E']) = LazyJavaTypeParameterDescriptor@52['E']
+    resolve(JavaTypeParameterImpl@256['E']) = LazyJavaTypeParameterDescriptor@57['E']
 }
 
 LazyJavaTypeParameterResolver@257 {
-    resolve(JavaTypeParameterImpl@258['E']) = LazyJavaTypeParameterDescriptor@57['E']
+    resolve(JavaTypeParameterImpl@258['E']) = LazyJavaTypeParameterDescriptor@52['E']
 }
 
 LazyJavaTypeParameterResolver@259 {
-    resolve(JavaTypeParameterImpl@113['E']) = null
+    resolve(JavaTypeParameterImpl@114['E']) = null
 }
 
 LazyJavaTypeParameterResolver@260 {
-    resolve(JavaTypeParameterImpl@126['E']) = null
+    resolve(JavaTypeParameterImpl@135['E']) = null
 }
 
 LazyJavaTypeParameterResolver@261 {
-    resolve(JavaTypeParameterImpl@120['E']) = null
+    resolve(JavaTypeParameterImpl@129['E']) = null
 }
 
 LazyJavaTypeParameterResolver@262 {
-    resolve(JavaTypeParameterImpl@123['E']) = null
+    resolve(JavaTypeParameterImpl@126['E']) = null
 }
 
 LazyJavaTypeParameterResolver@263 {
-    resolve(JavaTypeParameterImpl@135['E']) = null
+    resolve(JavaTypeParameterImpl@132['E']) = null
 }

compiler/testData/diagnostics/tests/regressions/kt597.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt600.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt604.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt618.lazy.log

@@ -1,44 +1,33 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('Array': FqName@3) = null
-    _packageFragments('B': FqName@4) = null
-    _packageFragments('String': FqName@5) = null
-    _packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    _packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    _packageFragments('java.lang.Array': FqName@10) = null
-    _packageFragments('java.lang.B': FqName@11) = null
-    _packageFragments('java.lang.String': FqName@12) = null
-    _packageFragments('kotlin': FqName@13) = null
-    _packageFragments('kotlin.Array': FqName@14) = null
-    _packageFragments('kotlin.B': FqName@15) = null
-    _packageFragments('kotlin.String': FqName@16) = null
-    _packageFragments('kotlin.io': FqName@17) = null
-    _packageFragments('kotlin.jvm': FqName@18) = null
-    _packageFragments('lol': FqName@19) = null
-    _packageFragments('lol.Array': FqName@20) = null
-    _packageFragments('lol.B': FqName@21) = null
-    _packageFragments('lol.String': FqName@22) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('Array': FqName@3) = null
+    packageFragments('B': FqName@4) = null
+    packageFragments('String': FqName@5) = null
+    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
+    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
+    packageFragments('java.lang.Array': FqName@10) = null
+    packageFragments('java.lang.B': FqName@11) = null
+    packageFragments('java.lang.String': FqName@12) = null
+    packageFragments('kotlin': FqName@13) = null
+    packageFragments('kotlin.Array': FqName@14) = null
+    packageFragments('kotlin.B': FqName@15) = null
+    packageFragments('kotlin.String': FqName@16) = null
+    packageFragments('kotlin.io': FqName@17) = null
+    packageFragments('kotlin.jvm': FqName@18) = null
+    packageFragments('lol': FqName@19) = null
+    packageFragments('lol.Array': FqName@20) = null
+    packageFragments('lol.B': FqName@21) = null
+    packageFragments('lol.String': FqName@22) = null
 }
 
 LazyJavaPackageFragment@7['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
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    _functions('B': Name@29) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    _functions('div': Name@31) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    _functions('divAssign': Name@32) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    _functions('minus': Name@33) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    _functions('minusAssign': Name@34) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    _functions('mod': Name@35) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    _functions('modAssign': Name@36) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    _functions('plus': Name@37) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    _functions('plusAssign': Name@38) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    _functions('times': Name@39) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    _functions('timesAssign': Name@40) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     classes('B': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('div': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('divAssign': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
@@ -50,6 +39,17 @@ LazyJavaPackageFragment@9['lang'] {
     classes('plusAssign': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('times': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('timesAssign': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('B': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('div': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('divAssign': Name@32) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('minus': Name@33) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('minusAssign': Name@34) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('mod': Name@35) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('modAssign': Name@36) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('plus': Name@37) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('plusAssign': Name@38) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('times': Name@39) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('timesAssign': Name@40) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@30
 }

compiler/testData/diagnostics/tests/regressions/kt629.lazy.log

@@ -3,39 +3,39 @@ DescriptorResolver@0 {
 }
 
 LazyJavaPackageFragmentProvider@2 {
-    _packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    _packageFragments('A': FqName@5) = null
-    _packageFragments('Boolean': 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.Boolean': FqName@12) = null
-    _packageFragments('kotlin': FqName@13) = null
-    _packageFragments('kotlin.A': FqName@14) = null
-    _packageFragments('kotlin.Boolean': FqName@15) = null
-    _packageFragments('kotlin.io': FqName@16) = null
-    _packageFragments('kotlin.jvm': FqName@17) = null
-    _packageFragments('kt629': FqName@18) = null
-    _packageFragments('kt629.A': FqName@19) = null
-    _packageFragments('kt629.Boolean': FqName@20) = null
+    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
+    packageFragments('A': FqName@5) = null
+    packageFragments('Boolean': 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.Boolean': FqName@12) = null
+    packageFragments('kotlin': FqName@13) = null
+    packageFragments('kotlin.A': FqName@14) = null
+    packageFragments('kotlin.Boolean': FqName@15) = null
+    packageFragments('kotlin.io': FqName@16) = null
+    packageFragments('kotlin.jvm': FqName@17) = null
+    packageFragments('kt629': FqName@18) = null
+    packageFragments('kt629.A': FqName@19) = null
+    packageFragments('kt629.Boolean': FqName@20) = null
 }
 
 LazyJavaPackageFragment@8['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@10['lang'] {
-    _functions('A': Name@27) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    _functions('equals': Name@29) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    _functions('mod': Name@30) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    _functions('modAssign': Name@31) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     classes('A': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('mod': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('modAssign': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('A': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('equals': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('mod': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('modAssign': Name@31) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
 }

compiler/testData/diagnostics/tests/regressions/kt630.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt688.lazy.log

@@ -1,55 +1,55 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('A': FqName@3) = null
-    _packageFragments('B': FqName@4) = null
-    _packageFragments('C': FqName@5) = null
-    _packageFragments('T': 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('java.lang.T': FqName@13) = null
-    _packageFragments('kotlin': FqName@14) = null
-    _packageFragments('kotlin.A': FqName@15) = null
-    _packageFragments('kotlin.B': FqName@16) = null
-    _packageFragments('kotlin.T': FqName@17) = null
-    _packageFragments('kotlin.io': FqName@18) = null
-    _packageFragments('kotlin.jvm': FqName@19) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('A': FqName@3) = null
+    packageFragments('B': FqName@4) = null
+    packageFragments('C': FqName@5) = null
+    packageFragments('T': 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('java.lang.T': FqName@13) = null
+    packageFragments('kotlin': FqName@14) = null
+    packageFragments('kotlin.A': FqName@15) = null
+    packageFragments('kotlin.B': FqName@16) = null
+    packageFragments('kotlin.T': FqName@17) = null
+    packageFragments('kotlin.io': FqName@18) = null
+    packageFragments('kotlin.jvm': FqName@19) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    _functions('B': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    _functions('a': Name@23) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    _functions('b': Name@24) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    _functions('invoke': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    _functions('x': Name@26) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('B': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('a': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('b': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('invoke': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('x': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('B': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('a': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('b': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('x': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('B': Name@20) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('a': Name@22) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('b': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('invoke': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('x': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@21
 }
 
 LazyJavaPackageFragment@8['java'] {
-    _functions('lang': Name@29) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    _functions('B': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    _functions('a': Name@23) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    _functions('b': Name@24) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    _functions('invoke': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    _functions('x': Name@26) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     classes('B': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('a': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('b': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('invoke': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('x': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('a': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('b': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('x': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('B': Name@20) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('a': Name@22) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('b': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('invoke': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('x': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
 }

compiler/testData/diagnostics/tests/regressions/kt691.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt701.lazy.log

@@ -1,251 +1,251 @@
 LazyJavaClassDescriptor@0['AnnotatedElement'] {
-    _functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    _functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    _properties('cast': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    _properties('isInstance': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    _typeConstructor = LazyJavaClassTypeConstructor@7['AnnotatedElement']
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@3
+    functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
+    functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
+    memberIndex = computeMemberIndex$1@5 // through LazyJavaClassMemberScope@3
+    properties('cast': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
+    properties('isInstance': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
+    typeConstructor = LazyJavaClassTypeConstructor@8['AnnotatedElement']
 }
 
 LazyJavaClassDescriptor@9['Class'] {
-    _functions('cast': Name@5) = ArrayList@10[1] { JavaMethodDescriptor@11['cast'] } // through LazyJavaClassMemberScope@12
-    _functions('isInstance': Name@6) = ArrayList@13[1] { JavaMethodDescriptor@14['isInstance'] } // through LazyJavaClassMemberScope@12
-    _properties('cast': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    _properties('isInstance': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    _typeConstructor = LazyJavaClassTypeConstructor@15['Class']
-    defaultType = JetTypeImpl@16['Class<1>']
-    enumEntryIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@12
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@12
-    nestedClassIndex = LinkedHashMap@19 // through LazyJavaClassMemberScope@12
-    nestedClasses('cast': Name@5) = null // through LazyJavaClassMemberScope@12
-    nestedClasses('isInstance': Name@6) = null // through LazyJavaClassMemberScope@12
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@20['<this>']
+    defaultType = JetTypeImpl@10['Class<1>']
+    enumEntryIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@12
+    functions('cast': Name@6) = ArrayList@13[1] { JavaMethodDescriptor@14['cast'] } // through LazyJavaClassMemberScope@12
+    functions('isInstance': Name@7) = ArrayList@15[1] { JavaMethodDescriptor@16['isInstance'] } // through LazyJavaClassMemberScope@12
+    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@12
+    nestedClassIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@12
+    nestedClasses('cast': Name@6) = null // through LazyJavaClassMemberScope@12
+    nestedClasses('isInstance': Name@7) = null // through LazyJavaClassMemberScope@12
+    properties('cast': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
+    properties('isInstance': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@20['Class']
 }
 
 LazyJavaClassDescriptor@21['Error'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@22['Error']
+    typeConstructor = LazyJavaClassTypeConstructor@22['Error']
 }
 
 LazyJavaClassDescriptor@23['Exception'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@24['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@24['Exception']
 }
 
 LazyJavaClassDescriptor@25['GenericDeclaration'] {
-    _functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
-    _functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
-    _properties('cast': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
-    _properties('isInstance': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
-    _typeConstructor = LazyJavaClassTypeConstructor@27['GenericDeclaration']
-    memberIndex = computeMemberIndex$1@28 // through LazyJavaClassMemberScope@26
+    functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
+    functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
+    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@26
+    properties('cast': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
+    properties('isInstance': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
+    typeConstructor = LazyJavaClassTypeConstructor@28['GenericDeclaration']
 }
 
 LazyJavaClassDescriptor@29['RuntimeException'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@30['RuntimeException']
+    typeConstructor = LazyJavaClassTypeConstructor@30['RuntimeException']
 }
 
 LazyJavaClassDescriptor@31['Serializable'] {
-    _functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
-    _functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
-    _properties('cast': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
-    _properties('isInstance': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
-    _typeConstructor = LazyJavaClassTypeConstructor@33['Serializable']
-    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@32
+    functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
+    functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
+    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@32
+    properties('cast': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
+    properties('isInstance': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
+    typeConstructor = LazyJavaClassTypeConstructor@34['Serializable']
 }
 
 LazyJavaClassDescriptor@35['Type'] {
-    _functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
-    _functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
-    _properties('cast': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
-    _properties('isInstance': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
-    _typeConstructor = LazyJavaClassTypeConstructor@37['Type']
-    memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@36
+    functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
+    functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
+    memberIndex = computeMemberIndex$1@37 // through LazyJavaClassMemberScope@36
+    properties('cast': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
+    properties('isInstance': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
+    typeConstructor = LazyJavaClassTypeConstructor@38['Type']
 }
 
-LazyJavaClassTypeConstructor@7['AnnotatedElement'] {
-    _parameters = ArrayList@39[empty]
-    _supertypes = ArrayList@40[1] { JetTypeImpl@41['Any'] }
+LazyJavaClassTypeConstructor@8['AnnotatedElement'] {
+    parameters = ArrayList@39[empty]
+    supertypes = ArrayList@40[1] { JetTypeImpl@41['Any'] }
 }
 
-LazyJavaClassTypeConstructor@15['Class'] {
-    _parameters = ArrayList@42[1] { LazyJavaTypeParameterDescriptor@43['T'] }
-    _supertypes = ArrayList@44[4] { LazyJavaClassifierType@45['Serializable'], LazyJavaClassifierType@46['GenericDeclaration'], LazyJavaClassifierType@47['Type'], ... }
+LazyJavaClassTypeConstructor@20['Class'] {
+    parameters = ArrayList@42[1] { LazyJavaTypeParameterDescriptor@43['T'] }
+    supertypes = ArrayList@44[4] { LazyJavaClassifierType@45['Serializable'], LazyJavaClassifierType@46['GenericDeclaration'], LazyJavaClassifierType@47['Type'], ... }
 }
 
 LazyJavaClassTypeConstructor@22['Error'] {
-    _parameters = ArrayList@48[empty]
-    _supertypes = ArrayList@49[1] { LazyJavaClassifierType@50['Throwable'] }
+    parameters = ArrayList@48[empty]
+    supertypes = ArrayList@49[1] { LazyJavaClassifierType@50['Throwable'] }
 }
 
 LazyJavaClassTypeConstructor@24['Exception'] {
-    _parameters = ArrayList@51[empty]
-    _supertypes = ArrayList@52[1] { LazyJavaClassifierType@53['Throwable'] }
+    parameters = ArrayList@51[empty]
+    supertypes = ArrayList@52[1] { LazyJavaClassifierType@53['Throwable'] }
 }
 
-LazyJavaClassTypeConstructor@27['GenericDeclaration'] {
-    _parameters = ArrayList@54[empty]
-    _supertypes = ArrayList@55[1] { JetTypeImpl@41['Any'] }
+LazyJavaClassTypeConstructor@28['GenericDeclaration'] {
+    parameters = ArrayList@54[empty]
+    supertypes = ArrayList@55[1] { JetTypeImpl@41['Any'] }
 }
 
 LazyJavaClassTypeConstructor@30['RuntimeException'] {
-    _parameters = ArrayList@56[empty]
-    _supertypes = ArrayList@57[1] { LazyJavaClassifierType@58['Exception'] }
+    parameters = ArrayList@56[empty]
+    supertypes = ArrayList@57[1] { LazyJavaClassifierType@58['Exception'] }
 }
 
-LazyJavaClassTypeConstructor@33['Serializable'] {
-    _parameters = ArrayList@59[empty]
-    _supertypes = ArrayList@60[1] { JetTypeImpl@41['Any'] }
+LazyJavaClassTypeConstructor@34['Serializable'] {
+    parameters = ArrayList@59[empty]
+    supertypes = ArrayList@60[1] { JetTypeImpl@41['Any'] }
 }
 
-LazyJavaClassTypeConstructor@37['Type'] {
-    _parameters = ArrayList@61[empty]
-    _supertypes = ArrayList@62[1] { JetTypeImpl@41['Any'] }
+LazyJavaClassTypeConstructor@38['Type'] {
+    parameters = ArrayList@61[empty]
+    supertypes = ArrayList@62[1] { JetTypeImpl@41['Any'] }
 }
 
 LazyJavaClassifierType@63['AnnotatedElement'] {
-    _arguments = ArrayList@64[empty]
-    _memberScope = LazyJavaClassMemberScope@3
-    _typeConstructor = LazyJavaClassTypeConstructor@7['AnnotatedElement']
+    arguments = ArrayList@64[empty]
     classifier = JavaClassImpl@65['AnnotatedElement']
+    memberScope = LazyJavaClassMemberScope@3
+    typeConstructor = LazyJavaClassTypeConstructor@8['AnnotatedElement']
 }
 
 LazyJavaClassifierType@58['Exception'] {
-    _arguments = ArrayList@66[empty]
-    _typeConstructor = LazyJavaClassTypeConstructor@24['Exception']
+    arguments = ArrayList@66[empty]
     classifier = JavaClassImpl@67['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@24['Exception']
 }
 
 LazyJavaClassifierType@46['GenericDeclaration'] {
-    _arguments = ArrayList@68[empty]
-    _memberScope = LazyJavaClassMemberScope@26
-    _typeConstructor = LazyJavaClassTypeConstructor@27['GenericDeclaration']
+    arguments = ArrayList@68[empty]
     classifier = JavaClassImpl@69['GenericDeclaration']
+    memberScope = LazyJavaClassMemberScope@26
+    typeConstructor = LazyJavaClassTypeConstructor@28['GenericDeclaration']
 }
 
 LazyJavaClassifierType@70['Object'] {
-    _arguments = ArrayList@71[empty]
-    _memberScope = DeserializedClassMemberScope@72
-    _nullable = 'false': Boolean@73
-    _typeConstructor = DeserializedClassTypeConstructor@74
-    classifier = JavaClassImpl@75['Object']
+    arguments = ArrayList@71[empty]
+    classifier = JavaClassImpl@72['Object']
+    memberScope = DeserializedClassMemberScope@73
+    nullable = 'false': Boolean@74
+    typeConstructor = DeserializedClassTypeConstructor@75
 }
 
 LazyJavaClassifierType@76['Object'] {
-    _arguments = ArrayList@77[empty]
-    _memberScope = DeserializedClassMemberScope@72
-    _nullable = 'false': Boolean@73
-    _typeConstructor = DeserializedClassTypeConstructor@74
+    arguments = ArrayList@77[empty]
     classifier = JavaClassImpl@78['Object']
+    memberScope = DeserializedClassMemberScope@73
+    nullable = 'false': Boolean@74
+    typeConstructor = DeserializedClassTypeConstructor@75
 }
 
 LazyJavaClassifierType@79['Object'] {
-    _arguments = ArrayList@80[empty]
-    _memberScope = DeserializedClassMemberScope@72
-    _nullable = 'true': Boolean@81
-    _typeConstructor = DeserializedClassTypeConstructor@74
-    classifier = JavaClassImpl@75['Object']
+    arguments = ArrayList@80[empty]
+    classifier = JavaClassImpl@78['Object']
+    memberScope = DeserializedClassMemberScope@73
+    nullable = 'true': Boolean@81
+    typeConstructor = DeserializedClassTypeConstructor@75
 }
 
 LazyJavaClassifierType@82['Object'] {
-    _arguments = ArrayList@83[empty]
-    _memberScope = DeserializedClassMemberScope@72
-    _nullable = 'true': Boolean@81
-    _typeConstructor = DeserializedClassTypeConstructor@74
-    classifier = JavaClassImpl@78['Object']
+    arguments = ArrayList@83[empty]
+    classifier = JavaClassImpl@72['Object']
+    memberScope = DeserializedClassMemberScope@73
+    nullable = 'true': Boolean@81
+    typeConstructor = DeserializedClassTypeConstructor@75
 }
 
 LazyJavaClassifierType@84['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@74
     classifier = JavaClassImpl@85['Object']
+    typeConstructor = DeserializedClassTypeConstructor@75
 }
 
 LazyJavaClassifierType@86['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@74
     classifier = JavaClassImpl@87['Object']
+    typeConstructor = DeserializedClassTypeConstructor@75
 }
 
 LazyJavaClassifierType@88['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@74
     classifier = JavaClassImpl@89['Object']
+    typeConstructor = DeserializedClassTypeConstructor@75
 }
 
 LazyJavaClassifierType@90['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@74
     classifier = JavaClassImpl@91['Object']
+    typeConstructor = DeserializedClassTypeConstructor@75
 }
 
 LazyJavaClassifierType@92['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@74
     classifier = JavaClassImpl@93['Object']
+    typeConstructor = DeserializedClassTypeConstructor@75
 }
 
 LazyJavaClassifierType@45['Serializable'] {
-    _arguments = ArrayList@94[empty]
-    _memberScope = LazyJavaClassMemberScope@32
-    _typeConstructor = LazyJavaClassTypeConstructor@33['Serializable']
+    arguments = ArrayList@94[empty]
     classifier = JavaClassImpl@95['Serializable']
+    memberScope = LazyJavaClassMemberScope@32
+    typeConstructor = LazyJavaClassTypeConstructor@34['Serializable']
 }
 
 LazyJavaClassifierType@96['T'] {
-    _arguments = ArrayList@97[empty]
-    _nullable = 'false': Boolean@73
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@98
-    classifier = JavaTypeParameterImpl@99['T']
+    arguments = ArrayList@97[empty]
+    classifier = JavaTypeParameterImpl@98['T']
+    nullable = 'false': Boolean@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@100['T'] {
-    _arguments = ArrayList@101[empty]
-    _nullable = 'true': Boolean@81
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@98
-    classifier = JavaTypeParameterImpl@99['T']
-}
-
-LazyJavaClassifierType@50['Throwable'] {
-    _arguments = ArrayList@102[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@103
-    classifier = JavaClassImpl@104['Throwable']
+    arguments = ArrayList@101[empty]
+    classifier = JavaTypeParameterImpl@98['T']
+    nullable = 'true': Boolean@81
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@53['Throwable'] {
-    _arguments = ArrayList@105[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@103
+    arguments = ArrayList@102[empty]
+    classifier = JavaClassImpl@103['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@104
+}
+
+LazyJavaClassifierType@50['Throwable'] {
+    arguments = ArrayList@105[empty]
     classifier = JavaClassImpl@106['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@104
 }
 
 LazyJavaClassifierType@47['Type'] {
-    _arguments = ArrayList@107[empty]
-    _memberScope = LazyJavaClassMemberScope@36
-    _typeConstructor = LazyJavaClassTypeConstructor@37['Type']
+    arguments = ArrayList@107[empty]
     classifier = JavaClassImpl@108['Type']
+    memberScope = LazyJavaClassMemberScope@36
+    typeConstructor = LazyJavaClassTypeConstructor@38['Type']
 }
 
 LazyJavaPackageFragmentProvider@109 {
-    _packageFragments('<root>': FqName@110) = LazyJavaPackageFragment@111['<root>']
-    _packageFragments('Class': FqName@112) = null
-    _packageFragments('Error': FqName@113) = null
-    _packageFragments('RuntimeException': FqName@114) = null
-    _packageFragments('T': FqName@115) = null
-    _packageFragments('Throwable': FqName@116) = null
-    _packageFragments('Throwables': FqName@117) = null
-    _packageFragments('X': FqName@118) = null
-    _packageFragments('java': FqName@119) = LazyJavaPackageFragment@120['java']
-    _packageFragments('java.io': FqName@121) = LazyJavaPackageFragment@122['io']
-    _packageFragments('java.lang': FqName@123) = LazyJavaPackageFragment@124['lang']
-    _packageFragments('java.lang.Class': FqName@125) = null
-    _packageFragments('java.lang.Error': FqName@126) = null
-    _packageFragments('java.lang.RuntimeException': FqName@127) = null
-    _packageFragments('java.lang.T': FqName@128) = null
-    _packageFragments('java.lang.Throwable': FqName@129) = null
-    _packageFragments('java.lang.X': FqName@130) = null
-    _packageFragments('java.lang.reflect': FqName@131) = LazyJavaPackageFragment@132['reflect']
-    _packageFragments('kotlin': FqName@133) = null
-    _packageFragments('kotlin.Class': FqName@134) = null
-    _packageFragments('kotlin.Error': FqName@135) = null
-    _packageFragments('kotlin.RuntimeException': FqName@136) = null
-    _packageFragments('kotlin.T': FqName@137) = null
-    _packageFragments('kotlin.Throwable': FqName@138) = null
-    _packageFragments('kotlin.X': FqName@139) = null
-    _packageFragments('kotlin.io': FqName@140) = null
-    _packageFragments('kotlin.jvm': FqName@141) = null
+    packageFragments('<root>': FqName@110) = LazyJavaPackageFragment@111['<root>']
+    packageFragments('Class': FqName@112) = null
+    packageFragments('Error': FqName@113) = null
+    packageFragments('RuntimeException': FqName@114) = null
+    packageFragments('T': FqName@115) = null
+    packageFragments('Throwable': FqName@116) = null
+    packageFragments('Throwables': FqName@117) = null
+    packageFragments('X': FqName@118) = null
+    packageFragments('java': FqName@119) = LazyJavaPackageFragment@120['java']
+    packageFragments('java.io': FqName@121) = LazyJavaPackageFragment@122['io']
+    packageFragments('java.lang': FqName@123) = LazyJavaPackageFragment@124['lang']
+    packageFragments('java.lang.Class': FqName@125) = null
+    packageFragments('java.lang.Error': FqName@126) = null
+    packageFragments('java.lang.RuntimeException': FqName@127) = null
+    packageFragments('java.lang.T': FqName@128) = null
+    packageFragments('java.lang.Throwable': FqName@129) = null
+    packageFragments('java.lang.X': FqName@130) = null
+    packageFragments('java.lang.reflect': FqName@131) = LazyJavaPackageFragment@132['reflect']
+    packageFragments('kotlin': FqName@133) = null
+    packageFragments('kotlin.Class': FqName@134) = null
+    packageFragments('kotlin.Error': FqName@135) = null
+    packageFragments('kotlin.RuntimeException': FqName@136) = null
+    packageFragments('kotlin.T': FqName@137) = null
+    packageFragments('kotlin.Throwable': FqName@138) = null
+    packageFragments('kotlin.X': FqName@139) = null
+    packageFragments('kotlin.io': FqName@140) = null
+    packageFragments('kotlin.jvm': FqName@141) = null
     topLevelClasses(JavaClassImpl@65['AnnotatedElement']) = LazyJavaClassDescriptor@0['AnnotatedElement']
     topLevelClasses(JavaClassImpl@142['Class']) = LazyJavaClassDescriptor@9['Class']
     topLevelClasses(JavaClassImpl@143['Error']) = LazyJavaClassDescriptor@21['Error']
@@ -257,54 +257,54 @@ LazyJavaPackageFragmentProvider@109 {
 }
 
 LazyJavaPackageFragment@111['<root>'] {
-    _functions('cast': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    _functions('equals': Name@146) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    _functions('getJavaClass': Name@147) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    _functions('isInstance': Name@6) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    _functions('propagateIfInstanceOf': Name@148) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('Class': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('Error': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('RuntimeException': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('Throwable': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('cast': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('equals': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('getJavaClass': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('isInstance': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('java': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('propagateIfInstanceOf': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@145
-    memberIndex = computeMemberIndex$1@155 // through LazyPackageFragmentScopeForJavaPackage@145
+    classes('Class': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('Error': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('RuntimeException': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('Throwable': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('cast': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('equals': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('getJavaClass': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('isInstance': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('java': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('propagateIfInstanceOf': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@146
+    functions('cast': Name@6) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@146
+    functions('equals': Name@150) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@146
+    functions('getJavaClass': Name@151) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@146
+    functions('isInstance': Name@7) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@146
+    functions('propagateIfInstanceOf': Name@153) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@146
+    memberIndex = computeMemberIndex$1@155 // through LazyPackageFragmentScopeForJavaPackage@146
 }
 
 LazyJavaPackageFragment@120['java'] {
-    _functions('lang': Name@156) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('lang': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@157
+    classes('lang': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@157
     deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@157
+    functions('lang': Name@158) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@157
     memberIndex = computeMemberIndex$1@159 // through LazyPackageFragmentScopeForJavaPackage@157
 }
 
 LazyJavaPackageFragment@124['lang'] {
-    _functions('cast': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@160
-    _functions('equals': Name@146) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@160
-    _functions('getJavaClass': Name@147) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@160
-    _functions('isInstance': Name@6) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@160
-    _functions('propagateIfInstanceOf': Name@148) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('Class': Name@161) = LazyJavaClassDescriptor@9['Class'] // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('Error': Name@150) = LazyJavaClassDescriptor@21['Error'] // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('RuntimeException': Name@151) = LazyJavaClassDescriptor@29['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('cast': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('equals': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('getJavaClass': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('isInstance': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('java': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('propagateIfInstanceOf': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@160
-    memberIndex = computeMemberIndex$1@162 // through LazyPackageFragmentScopeForJavaPackage@160
+    classes('Class': Name@160) = LazyJavaClassDescriptor@9['Class'] // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('Error': Name@147) = LazyJavaClassDescriptor@21['Error'] // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('RuntimeException': Name@148) = LazyJavaClassDescriptor@29['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('cast': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('equals': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('getJavaClass': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('isInstance': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('java': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('propagateIfInstanceOf': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@161
+    functions('cast': Name@6) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@161
+    functions('equals': Name@150) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@161
+    functions('getJavaClass': Name@151) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@161
+    functions('isInstance': Name@7) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@161
+    functions('propagateIfInstanceOf': Name@153) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@161
+    memberIndex = computeMemberIndex$1@162 // through LazyPackageFragmentScopeForJavaPackage@161
 }
 
 LazyJavaTypeParameterDescriptor@43['T'] {
     defaultType = JetTypeImpl@163['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@98
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
     upperBounds = LinkedHashSet@164[1] { NullableType@165 }
 }
 
@@ -313,5 +313,5 @@ LazyJavaTypeParameterResolver@166 {
 }
 
 LazyJavaTypeParameterResolver@168 {
-    resolve(JavaTypeParameterImpl@99['T']) = null
+    resolve(JavaTypeParameterImpl@98['T']) = null
 }

compiler/testData/diagnostics/tests/regressions/kt716.lazy.log

@@ -3,355 +3,355 @@ DescriptorResolver@0 {
 }
 
 LazyJavaClassDescriptor@2['AnnotatedElement'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@3['AnnotatedElement']
+    typeConstructor = LazyJavaClassTypeConstructor@3['AnnotatedElement']
 }
 
 LazyJavaClassDescriptor@4['Appendable'] {
-    _functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _properties('println': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@7
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
+    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
+    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
+    typeConstructor = LazyJavaClassTypeConstructor@10['Appendable']
 }
 
 LazyJavaClassDescriptor@11['AutoCloseable'] {
-    _functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@12
-    _properties('println': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@12
-    _typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@12
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@12
+    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@12
+    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@12
+    typeConstructor = LazyJavaClassTypeConstructor@14['AutoCloseable']
 }
 
 LazyJavaClassDescriptor@15['Class'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@16['Class']
-    defaultType = JetTypeImpl@17['Class<1>']
+    defaultType = JetTypeImpl@16['Class<1>']
+    typeConstructor = LazyJavaClassTypeConstructor@17['Class']
 }
 
 LazyJavaClassDescriptor@18['Closeable'] {
-    _functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@19
-    _properties('println': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@19
-    _typeConstructor = LazyJavaClassTypeConstructor@20['Closeable']
-    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@19
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@19
+    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
+    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@19
+    typeConstructor = LazyJavaClassTypeConstructor@21['Closeable']
 }
 
 LazyJavaClassDescriptor@22['FilterOutputStream'] {
-    _functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@23
-    _properties('println': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@23
-    _typeConstructor = LazyJavaClassTypeConstructor@24['FilterOutputStream']
-    memberIndex = computeMemberIndex$1@25 // through LazyJavaClassMemberScope@23
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@23
+    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@23
+    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@23
+    typeConstructor = LazyJavaClassTypeConstructor@25['FilterOutputStream']
 }
 
 LazyJavaClassDescriptor@26['GenericDeclaration'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@27['GenericDeclaration']
+    typeConstructor = LazyJavaClassTypeConstructor@27['GenericDeclaration']
 }
 
 LazyJavaClassDescriptor@28['Object'] {
-    _functions('getClass': Name@29) = ArrayList@30[1] { JavaMethodDescriptor@31['getClass'] } // through LazyJavaClassMemberScope@32
-    _properties('getClass': Name@29) = EmptyList@6[empty] // through LazyJavaClassMemberScope@32
-    _properties('t': Name@33) = EmptyList@6[empty] // through LazyJavaClassMemberScope@32
-    _typeConstructor = LazyJavaClassTypeConstructor@34['Object']
-    defaultType = JetTypeImpl@35['Object']
-    enumEntryIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@32
-    memberIndex = computeMemberIndex$1@37 // through LazyJavaClassMemberScope@32
-    nestedClassIndex = LinkedHashMap@38 // through LazyJavaClassMemberScope@32
-    nestedClasses('getClass': Name@29) = null // through LazyJavaClassMemberScope@32
-    nestedClasses('t': Name@33) = null // through LazyJavaClassMemberScope@32
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@39['<this>']
+    defaultType = JetTypeImpl@29['Object']
+    enumEntryIndex = LinkedHashMap@30 // through LazyJavaClassMemberScope@31
+    functions('getClass': Name@32) = ArrayList@33[1] { JavaMethodDescriptor@34['getClass'] } // through LazyJavaClassMemberScope@31
+    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@31
+    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@31
+    nestedClasses('getClass': Name@32) = null // through LazyJavaClassMemberScope@31
+    nestedClasses('t': Name@37) = null // through LazyJavaClassMemberScope@31
+    properties('getClass': Name@32) = EmptyList@6[empty] // through LazyJavaClassMemberScope@31
+    properties('t': Name@37) = EmptyList@6[empty] // through LazyJavaClassMemberScope@31
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@38['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@39['Object']
 }
 
 LazyJavaClassDescriptor@40['OutputStream'] {
-    _functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@41
-    _properties('println': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@41
-    _typeConstructor = LazyJavaClassTypeConstructor@42['OutputStream']
-    memberIndex = computeMemberIndex$1@43 // through LazyJavaClassMemberScope@41
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@41
+    memberIndex = computeMemberIndex$1@42 // through LazyJavaClassMemberScope@41
+    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@41
+    typeConstructor = LazyJavaClassTypeConstructor@43['OutputStream']
 }
 
 LazyJavaClassDescriptor@44['PrintStream'] {
-    _functions('println': Name@8) = ArrayList@45[10] { JavaMethodDescriptor@46['println'], JavaMethodDescriptor@47['println'], JavaMethodDescriptor@48['println'], ... } // through LazyJavaClassMemberScope@49
-    _properties('println': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@49
-    _typeConstructor = LazyJavaClassTypeConstructor@50['PrintStream']
-    defaultType = JetTypeImpl@51['PrintStream']
-    enumEntryIndex = LinkedHashMap@52 // through LazyJavaClassMemberScope@49
-    memberIndex = computeMemberIndex$1@53 // through LazyJavaClassMemberScope@49
-    nestedClassIndex = LinkedHashMap@54 // through LazyJavaClassMemberScope@49
-    nestedClasses('println': Name@8) = null // through LazyJavaClassMemberScope@49
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@55['<this>']
+    defaultType = JetTypeImpl@45['PrintStream']
+    enumEntryIndex = LinkedHashMap@46 // through LazyJavaClassMemberScope@47
+    functions('println': Name@9) = ArrayList@48[10] { JavaMethodDescriptor@49['println'], JavaMethodDescriptor@50['println'], JavaMethodDescriptor@51['println'], ... } // through LazyJavaClassMemberScope@47
+    memberIndex = computeMemberIndex$1@52 // through LazyJavaClassMemberScope@47
+    nestedClassIndex = LinkedHashMap@53 // through LazyJavaClassMemberScope@47
+    nestedClasses('println': Name@9) = null // through LazyJavaClassMemberScope@47
+    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@47
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@54['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@55['PrintStream']
 }
 
 LazyJavaClassDescriptor@56['Serializable'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@57['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@57['Serializable']
 }
 
 LazyJavaClassDescriptor@58['System'] {
-    _properties('out': Name@59) = ArrayList@60[1] { JavaPropertyDescriptor@61['out'] } // through LazyJavaStaticClassScope@62
-    _properties('out': Name@59) = EmptyList@6[empty] // through LazyJavaClassMemberScope@63
-    _typeConstructor = LazyJavaClassTypeConstructor@64['System']
-    enumEntryIndex = LinkedHashMap@65 // through LazyJavaClassMemberScope@63
-    memberIndex = computeMemberIndex$1@66 // through LazyJavaClassMemberScope@63
-    memberIndex = computeMemberIndex$1@67 // through LazyJavaStaticClassScope@62
-    nestedClassIndex = LinkedHashMap@68 // through LazyJavaClassMemberScope@63
-    nestedClasses('out': Name@59) = null // through LazyJavaClassMemberScope@63
+    enumEntryIndex = LinkedHashMap@59 // through LazyJavaClassMemberScope@60
+    memberIndex = computeMemberIndex$1@61 // through LazyJavaClassMemberScope@60
+    memberIndex = computeMemberIndex$1@62 // through LazyJavaStaticClassScope@63
+    nestedClassIndex = LinkedHashMap@64 // through LazyJavaClassMemberScope@60
+    nestedClasses('out': Name@65) = null // through LazyJavaClassMemberScope@60
+    properties('out': Name@65) = ArrayList@66[1] { JavaPropertyDescriptor@67['out'] } // through LazyJavaStaticClassScope@63
+    properties('out': Name@65) = EmptyList@6[empty] // through LazyJavaClassMemberScope@60
+    typeConstructor = LazyJavaClassTypeConstructor@68['System']
 }
 
 LazyJavaClassDescriptor@69['Type'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@70['Type']
+    typeConstructor = LazyJavaClassTypeConstructor@70['Type']
 }
 
 LazyJavaClassTypeConstructor@3['AnnotatedElement'] {
-    _supertypes = ArrayList@71[1] { JetTypeImpl@72['Any'] }
+    supertypes = ArrayList@71[1] { JetTypeImpl@72['Any'] }
 }
 
-LazyJavaClassTypeConstructor@9['Appendable'] {
-    _parameters = ArrayList@73[empty]
-    _supertypes = ArrayList@74[1] { JetTypeImpl@72['Any'] }
+LazyJavaClassTypeConstructor@10['Appendable'] {
+    parameters = ArrayList@73[empty]
+    supertypes = ArrayList@74[1] { JetTypeImpl@72['Any'] }
 }
 
-LazyJavaClassTypeConstructor@13['AutoCloseable'] {
-    _parameters = ArrayList@75[empty]
-    _supertypes = ArrayList@76[1] { JetTypeImpl@72['Any'] }
+LazyJavaClassTypeConstructor@14['AutoCloseable'] {
+    parameters = ArrayList@75[empty]
+    supertypes = ArrayList@76[1] { JetTypeImpl@72['Any'] }
 }
 
-LazyJavaClassTypeConstructor@16['Class'] {
-    _parameters = ArrayList@77[1] { LazyJavaTypeParameterDescriptor@78['T'] }
-    _supertypes = ArrayList@79[4] { LazyJavaClassifierType@80['Serializable'], LazyJavaClassifierType@81['GenericDeclaration'], LazyJavaClassifierType@82['Type'], ... }
+LazyJavaClassTypeConstructor@17['Class'] {
+    parameters = ArrayList@77[1] { LazyJavaTypeParameterDescriptor@78['T'] }
+    supertypes = ArrayList@79[4] { LazyJavaClassifierType@80['Serializable'], LazyJavaClassifierType@81['GenericDeclaration'], LazyJavaClassifierType@82['Type'], ... }
 }
 
-LazyJavaClassTypeConstructor@20['Closeable'] {
-    _parameters = ArrayList@83[empty]
-    _supertypes = ArrayList@84[1] { LazyJavaClassifierType@85['AutoCloseable'] }
+LazyJavaClassTypeConstructor@21['Closeable'] {
+    parameters = ArrayList@83[empty]
+    supertypes = ArrayList@84[1] { LazyJavaClassifierType@85['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@24['FilterOutputStream'] {
-    _parameters = ArrayList@86[empty]
-    _supertypes = ArrayList@87[1] { LazyJavaClassifierType@88['OutputStream'] }
+LazyJavaClassTypeConstructor@25['FilterOutputStream'] {
+    parameters = ArrayList@86[empty]
+    supertypes = ArrayList@87[1] { LazyJavaClassifierType@88['OutputStream'] }
 }
 
 LazyJavaClassTypeConstructor@27['GenericDeclaration'] {
-    _supertypes = ArrayList@89[1] { JetTypeImpl@72['Any'] }
+    supertypes = ArrayList@89[1] { JetTypeImpl@72['Any'] }
 }
 
-LazyJavaClassTypeConstructor@34['Object'] {
-    _parameters = ArrayList@90[empty]
-    _supertypes = ArrayList@91[1] { JetTypeImpl@72['Any'] }
+LazyJavaClassTypeConstructor@39['Object'] {
+    parameters = ArrayList@90[empty]
+    supertypes = ArrayList@91[1] { JetTypeImpl@72['Any'] }
 }
 
-LazyJavaClassTypeConstructor@42['OutputStream'] {
-    _parameters = ArrayList@92[empty]
-    _supertypes = ArrayList@93[1] { LazyJavaClassifierType@94['Closeable'] }
+LazyJavaClassTypeConstructor@43['OutputStream'] {
+    parameters = ArrayList@92[empty]
+    supertypes = ArrayList@93[1] { LazyJavaClassifierType@94['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@50['PrintStream'] {
-    _parameters = ArrayList@95[empty]
-    _supertypes = ArrayList@96[3] { LazyJavaClassifierType@97['FilterOutputStream'], LazyJavaClassifierType@98['Appendable'], LazyJavaClassifierType@99['Closeable'] }
+LazyJavaClassTypeConstructor@55['PrintStream'] {
+    parameters = ArrayList@95[empty]
+    supertypes = ArrayList@96[3] { LazyJavaClassifierType@97['FilterOutputStream'], LazyJavaClassifierType@98['Appendable'], LazyJavaClassifierType@99['Closeable'] }
 }
 
 LazyJavaClassTypeConstructor@57['Serializable'] {
-    _parameters = ArrayList@100[empty]
-    _supertypes = ArrayList@101[1] { JetTypeImpl@72['Any'] }
+    parameters = ArrayList@100[empty]
+    supertypes = ArrayList@101[1] { JetTypeImpl@72['Any'] }
 }
 
-LazyJavaClassTypeConstructor@64['System'] {
-    _supertypes = ArrayList@102[1] { JetTypeImpl@72['Any'] }
+LazyJavaClassTypeConstructor@68['System'] {
+    supertypes = ArrayList@102[1] { JetTypeImpl@72['Any'] }
 }
 
 LazyJavaClassTypeConstructor@70['Type'] {
-    _supertypes = ArrayList@103[1] { JetTypeImpl@72['Any'] }
+    supertypes = ArrayList@103[1] { JetTypeImpl@72['Any'] }
 }
 
 LazyJavaClassifierType@104['AnnotatedElement'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@3['AnnotatedElement']
     classifier = JavaClassImpl@105['AnnotatedElement']
+    typeConstructor = LazyJavaClassTypeConstructor@3['AnnotatedElement']
 }
 
 LazyJavaClassifierType@98['Appendable'] {
-    _arguments = ArrayList@106[empty]
-    _memberScope = LazyJavaClassMemberScope@7
-    _typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
+    arguments = ArrayList@106[empty]
     classifier = JavaClassImpl@107['Appendable']
+    memberScope = LazyJavaClassMemberScope@7
+    typeConstructor = LazyJavaClassTypeConstructor@10['Appendable']
 }
 
 LazyJavaClassifierType@85['AutoCloseable'] {
-    _arguments = ArrayList@108[empty]
-    _memberScope = LazyJavaClassMemberScope@12
-    _typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
+    arguments = ArrayList@108[empty]
     classifier = JavaClassImpl@109['AutoCloseable']
+    memberScope = LazyJavaClassMemberScope@12
+    typeConstructor = LazyJavaClassTypeConstructor@14['AutoCloseable']
 }
 
 LazyJavaClassifierType@110['Class<?>'] {
-    _arguments = ArrayList@111[1] { LazyStarProjection@112 }
-    _nullable = 'false': Boolean@113
-    _typeConstructor = LazyJavaClassTypeConstructor@16['Class']
-    classifier = JavaClassImpl@114['Class']
+    arguments = ArrayList@111[1] { LazyStarProjection@112 }
+    classifier = JavaClassImpl@113['Class']
+    nullable = 'false': Boolean@114
+    typeConstructor = LazyJavaClassTypeConstructor@17['Class']
 }
 
 LazyJavaClassifierType@115['Class<?>'] {
-    _arguments = ArrayList@116[1] { LazyStarProjection@117 }
-    _nullable = 'true': Boolean@118
-    _typeConstructor = LazyJavaClassTypeConstructor@16['Class']
-    classifier = JavaClassImpl@114['Class']
+    arguments = ArrayList@116[1] { LazyStarProjection@117 }
+    classifier = JavaClassImpl@113['Class']
+    nullable = 'true': Boolean@118
+    typeConstructor = LazyJavaClassTypeConstructor@17['Class']
 }
 
 LazyJavaClassifierType@99['Closeable'] {
-    _arguments = ArrayList@119[empty]
-    _memberScope = LazyJavaClassMemberScope@19
-    _typeConstructor = LazyJavaClassTypeConstructor@20['Closeable']
+    arguments = ArrayList@119[empty]
     classifier = JavaClassImpl@120['Closeable']
+    memberScope = LazyJavaClassMemberScope@19
+    typeConstructor = LazyJavaClassTypeConstructor@21['Closeable']
 }
 
 LazyJavaClassifierType@94['Closeable'] {
-    _arguments = ArrayList@121[empty]
-    _memberScope = LazyJavaClassMemberScope@19
-    _typeConstructor = LazyJavaClassTypeConstructor@20['Closeable']
+    arguments = ArrayList@121[empty]
     classifier = JavaClassImpl@122['Closeable']
+    memberScope = LazyJavaClassMemberScope@19
+    typeConstructor = LazyJavaClassTypeConstructor@21['Closeable']
 }
 
 LazyJavaClassifierType@97['FilterOutputStream'] {
-    _arguments = ArrayList@123[empty]
-    _memberScope = LazyJavaClassMemberScope@23
-    _typeConstructor = LazyJavaClassTypeConstructor@24['FilterOutputStream']
+    arguments = ArrayList@123[empty]
     classifier = JavaClassImpl@124['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@23
+    typeConstructor = LazyJavaClassTypeConstructor@25['FilterOutputStream']
 }
 
 LazyJavaClassifierType@125['Flushable'] {
-    _typeConstructor = TypeConstructorImpl$1@126
     classifier = null
+    typeConstructor = TypeConstructorImpl$1@126
 }
 
 LazyJavaClassifierType@81['GenericDeclaration'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@27['GenericDeclaration']
     classifier = JavaClassImpl@127['GenericDeclaration']
+    typeConstructor = LazyJavaClassTypeConstructor@27['GenericDeclaration']
 }
 
 LazyJavaClassifierType@128['Object'] {
-    _arguments = ArrayList@129[empty]
-    _nullable = 'false': Boolean@113
-    _typeConstructor = DeserializedClassTypeConstructor@130
-    classifier = JavaClassImpl@131['Object']
+    arguments = ArrayList@129[empty]
+    classifier = JavaClassImpl@130['Object']
+    nullable = 'false': Boolean@114
+    typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@132['Object'] {
-    _arguments = ArrayList@133[empty]
-    _nullable = 'true': Boolean@118
-    _typeConstructor = DeserializedClassTypeConstructor@130
-    classifier = JavaClassImpl@131['Object']
+    arguments = ArrayList@133[empty]
+    classifier = JavaClassImpl@130['Object']
+    nullable = 'true': Boolean@118
+    typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@134['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@130
     classifier = JavaClassImpl@135['Object']
+    typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@136['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@130
     classifier = JavaClassImpl@137['Object']
+    typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@138['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@130
     classifier = JavaClassImpl@139['Object']
+    typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@140['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@130
     classifier = JavaClassImpl@141['Object']
+    typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@142['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@130
     classifier = JavaClassImpl@143['Object']
+    typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@144['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@130
     classifier = JavaClassImpl@145['Object']
+    typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@146['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@130
     classifier = JavaClassImpl@147['Object']
+    typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@148['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@130
     classifier = JavaClassImpl@149['Object']
+    typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@150['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@130
     classifier = JavaClassImpl@151['Object']
+    typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@88['OutputStream'] {
-    _arguments = ArrayList@152[empty]
-    _memberScope = LazyJavaClassMemberScope@41
-    _typeConstructor = LazyJavaClassTypeConstructor@42['OutputStream']
+    arguments = ArrayList@152[empty]
     classifier = JavaClassImpl@153['OutputStream']
+    memberScope = LazyJavaClassMemberScope@41
+    typeConstructor = LazyJavaClassTypeConstructor@43['OutputStream']
 }
 
 LazyJavaClassifierType@154['PrintStream'] {
-    _arguments = ArrayList@155[empty]
-    _memberScope = LazyJavaClassMemberScope@49
-    _nullable = 'false': Boolean@113
-    _typeConstructor = LazyJavaClassTypeConstructor@50['PrintStream']
+    arguments = ArrayList@155[empty]
     classifier = JavaClassImpl@156['PrintStream']
+    memberScope = LazyJavaClassMemberScope@47
+    nullable = 'false': Boolean@114
+    typeConstructor = LazyJavaClassTypeConstructor@55['PrintStream']
 }
 
 LazyJavaClassifierType@157['PrintStream'] {
-    _arguments = ArrayList@158[empty]
-    _nullable = 'true': Boolean@118
-    _typeConstructor = LazyJavaClassTypeConstructor@50['PrintStream']
+    arguments = ArrayList@158[empty]
     classifier = JavaClassImpl@156['PrintStream']
+    nullable = 'true': Boolean@118
+    typeConstructor = LazyJavaClassTypeConstructor@55['PrintStream']
 }
 
 LazyJavaClassifierType@80['Serializable'] {
-    _arguments = ArrayList@159[empty]
-    _typeConstructor = LazyJavaClassTypeConstructor@57['Serializable']
+    arguments = ArrayList@159[empty]
     classifier = JavaClassImpl@160['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@57['Serializable']
 }
 
 LazyJavaClassifierType@161['String'] {
-    _arguments = ArrayList@162[empty]
-    _nullable = 'false': Boolean@113
-    _typeConstructor = DeserializedClassTypeConstructor@163
-    classifier = JavaClassImpl@164['String']
+    arguments = ArrayList@162[empty]
+    classifier = JavaClassImpl@163['String']
+    nullable = 'false': Boolean@114
+    typeConstructor = DeserializedClassTypeConstructor@164
 }
 
 LazyJavaClassifierType@165['String'] {
-    _arguments = ArrayList@166[empty]
-    _nullable = 'true': Boolean@118
-    _typeConstructor = DeserializedClassTypeConstructor@163
-    classifier = JavaClassImpl@164['String']
+    arguments = ArrayList@166[empty]
+    classifier = JavaClassImpl@163['String']
+    nullable = 'true': Boolean@118
+    typeConstructor = DeserializedClassTypeConstructor@164
 }
 
 LazyJavaClassifierType@82['Type'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@70['Type']
     classifier = JavaClassImpl@167['Type']
+    typeConstructor = LazyJavaClassTypeConstructor@70['Type']
 }
 
 LazyJavaPackageFragmentProvider@168 {
-    _packageFragments('<root>': FqName@169) = LazyJavaPackageFragment@170['<root>']
-    _packageFragments('Array': FqName@171) = null
-    _packageFragments('String': FqName@172) = null
-    _packageFragments('System': FqName@173) = null
-    _packageFragments('T': FqName@174) = null
-    _packageFragments('TypeInfo': FqName@175) = null
-    _packageFragments('java': FqName@176) = LazyJavaPackageFragment@177['java']
-    _packageFragments('java.io': FqName@178) = LazyJavaPackageFragment@179['io']
-    _packageFragments('java.lang': FqName@180) = LazyJavaPackageFragment@181['lang']
-    _packageFragments('java.lang.Array': FqName@182) = null
-    _packageFragments('java.lang.Class': FqName@183) = null
-    _packageFragments('java.lang.Object': FqName@184) = null
-    _packageFragments('java.lang.String': FqName@185) = null
-    _packageFragments('java.lang.System': FqName@186) = null
-    _packageFragments('java.lang.T': FqName@187) = null
-    _packageFragments('java.lang.TypeInfo': FqName@188) = null
-    _packageFragments('java.lang.reflect': FqName@189) = LazyJavaPackageFragment@190['reflect']
-    _packageFragments('kotlin': FqName@191) = null
-    _packageFragments('kotlin.Array': FqName@192) = null
-    _packageFragments('kotlin.String': FqName@193) = null
-    _packageFragments('kotlin.System': FqName@194) = null
-    _packageFragments('kotlin.T': FqName@195) = null
-    _packageFragments('kotlin.TypeInfo': FqName@196) = null
-    _packageFragments('kotlin.io': FqName@197) = null
-    _packageFragments('kotlin.jvm': FqName@198) = null
+    packageFragments('<root>': FqName@169) = LazyJavaPackageFragment@170['<root>']
+    packageFragments('Array': FqName@171) = null
+    packageFragments('String': FqName@172) = null
+    packageFragments('System': FqName@173) = null
+    packageFragments('T': FqName@174) = null
+    packageFragments('TypeInfo': FqName@175) = null
+    packageFragments('java': FqName@176) = LazyJavaPackageFragment@177['java']
+    packageFragments('java.io': FqName@178) = LazyJavaPackageFragment@179['io']
+    packageFragments('java.lang': FqName@180) = LazyJavaPackageFragment@181['lang']
+    packageFragments('java.lang.Array': FqName@182) = null
+    packageFragments('java.lang.Class': FqName@183) = null
+    packageFragments('java.lang.Object': FqName@184) = null
+    packageFragments('java.lang.String': FqName@185) = null
+    packageFragments('java.lang.System': FqName@186) = null
+    packageFragments('java.lang.T': FqName@187) = null
+    packageFragments('java.lang.TypeInfo': FqName@188) = null
+    packageFragments('java.lang.reflect': FqName@189) = LazyJavaPackageFragment@190['reflect']
+    packageFragments('kotlin': FqName@191) = null
+    packageFragments('kotlin.Array': FqName@192) = null
+    packageFragments('kotlin.String': FqName@193) = null
+    packageFragments('kotlin.System': FqName@194) = null
+    packageFragments('kotlin.T': FqName@195) = null
+    packageFragments('kotlin.TypeInfo': FqName@196) = null
+    packageFragments('kotlin.io': FqName@197) = null
+    packageFragments('kotlin.jvm': FqName@198) = null
     topLevelClasses(JavaClassImpl@105['AnnotatedElement']) = LazyJavaClassDescriptor@2['AnnotatedElement']
     topLevelClasses(JavaClassImpl@107['Appendable']) = LazyJavaClassDescriptor@4['Appendable']
     topLevelClasses(JavaClassImpl@109['AutoCloseable']) = LazyJavaClassDescriptor@11['AutoCloseable']
@@ -368,44 +368,44 @@ LazyJavaPackageFragmentProvider@168 {
 }
 
 LazyJavaPackageFragment@170['<root>'] {
-    _functions('getClass': Name@29) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    _functions('getJavaClass': Name@203) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    _functions('println': Name@8) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    _functions('typeinfo': Name@204) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('Array': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('String': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('System': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('getClass': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('getJavaClass': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('java': Name@208) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('println': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('typeinfo': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    deserializedPackageScope = Empty@209 // through LazyPackageFragmentScopeForJavaPackage@202
-    memberIndex = computeMemberIndex$1@210 // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('Array': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@203
+    classes('String': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@203
+    classes('System': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@203
+    classes('getClass': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@203
+    classes('getJavaClass': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@203
+    classes('java': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@203
+    classes('println': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@203
+    classes('typeinfo': Name@208) = null // through LazyPackageFragmentScopeForJavaPackage@203
+    deserializedPackageScope = Empty@209 // through LazyPackageFragmentScopeForJavaPackage@203
+    functions('getClass': Name@32) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@203
+    functions('getJavaClass': Name@206) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@203
+    functions('println': Name@9) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@203
+    functions('typeinfo': Name@208) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@203
+    memberIndex = computeMemberIndex$1@210 // through LazyPackageFragmentScopeForJavaPackage@203
 }
 
 LazyJavaPackageFragment@177['java'] {
-    _functions('lang': Name@211) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@212
-    classes('lang': Name@213) = null // through LazyPackageFragmentScopeForJavaPackage@212
+    classes('lang': Name@211) = null // through LazyPackageFragmentScopeForJavaPackage@212
     deserializedPackageScope = Empty@209 // through LazyPackageFragmentScopeForJavaPackage@212
+    functions('lang': Name@213) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@212
     memberIndex = computeMemberIndex$1@214 // through LazyPackageFragmentScopeForJavaPackage@212
 }
 
 LazyJavaPackageFragment@181['lang'] {
-    _functions('getClass': Name@29) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    _functions('getJavaClass': Name@203) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    _functions('println': Name@8) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    _functions('typeinfo': Name@204) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('Class': Name@216) = LazyJavaClassDescriptor@15['Class'] // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('Object': Name@217) = LazyJavaClassDescriptor@28['Object'] // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('System': Name@207) = LazyJavaClassDescriptor@58['System'] // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('getClass': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('getJavaClass': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('java': Name@208) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('println': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('typeinfo': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    deserializedPackageScope = Empty@209 // through LazyPackageFragmentScopeForJavaPackage@215
-    memberIndex = computeMemberIndex$1@218 // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('Class': Name@215) = LazyJavaClassDescriptor@15['Class'] // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('Object': Name@217) = LazyJavaClassDescriptor@28['Object'] // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('System': Name@205) = LazyJavaClassDescriptor@58['System'] // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('getClass': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('getJavaClass': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('java': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('println': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('typeinfo': Name@208) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    deserializedPackageScope = Empty@209 // through LazyPackageFragmentScopeForJavaPackage@216
+    functions('getClass': Name@32) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@216
+    functions('getJavaClass': Name@206) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@216
+    functions('println': Name@9) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@216
+    functions('typeinfo': Name@208) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@216
+    memberIndex = computeMemberIndex$1@218 // through LazyPackageFragmentScopeForJavaPackage@216
 }
 
 LazyJavaTypeParameterDescriptor@78['T'] {

compiler/testData/diagnostics/tests/regressions/kt743.lazy.log

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

compiler/testData/diagnostics/tests/regressions/kt750.lazy.log

@@ -1,352 +1,352 @@
 LazyJavaClassDescriptor@0['Appendable'] {
-    _functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    _properties('println': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    _typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
-    memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@3
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
+    memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
+    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
+    typeConstructor = LazyJavaClassTypeConstructor@6['Appendable']
 }
 
 LazyJavaClassDescriptor@7['AutoCloseable'] {
-    _functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
-    _properties('println': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
-    _typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@8
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
+    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@8
+    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
+    typeConstructor = LazyJavaClassTypeConstructor@10['AutoCloseable']
 }
 
 LazyJavaClassDescriptor@11['Closeable'] {
-    _functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    _properties('println': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    _typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@12
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
+    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@12
+    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
+    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
 }
 
 LazyJavaClassDescriptor@15['FilterOutputStream'] {
-    _functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@16
-    _properties('println': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@16
-    _typeConstructor = LazyJavaClassTypeConstructor@17['FilterOutputStream']
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@16
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@16
+    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@16
+    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@16
+    typeConstructor = LazyJavaClassTypeConstructor@18['FilterOutputStream']
 }
 
 LazyJavaClassDescriptor@19['Integer'] {
-    _functions('valueOf': Name@20) = ArrayList@21[3] { JavaMethodDescriptor@22['valueOf'], JavaMethodDescriptor@23['valueOf'], JavaMethodDescriptor@24['valueOf'] } // through LazyJavaStaticClassScope@25
-    _functions('valueOf': Name@20) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
-    _properties('valueOf': Name@20) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
-    _properties('valueOf': Name@20) = EmptyList@2[empty] // through LazyJavaStaticClassScope@25
-    _typeConstructor = LazyJavaClassTypeConstructor@27['Integer']
-    enumEntryIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@29 // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@30 // through LazyJavaStaticClassScope@25
-    nestedClassIndex = LinkedHashMap@31 // through LazyJavaClassMemberScope@26
-    nestedClasses('valueOf': Name@20) = null // through LazyJavaClassMemberScope@26
+    enumEntryIndex = LinkedHashMap@20 // through LazyJavaClassMemberScope@21
+    functions('valueOf': Name@22) = ArrayList@23[3] { JavaMethodDescriptor@24['valueOf'], JavaMethodDescriptor@25['valueOf'], JavaMethodDescriptor@26['valueOf'] } // through LazyJavaStaticClassScope@27
+    functions('valueOf': Name@22) = EmptyList@2[empty] // through LazyJavaClassMemberScope@21
+    memberIndex = computeMemberIndex$1@28 // through LazyJavaClassMemberScope@21
+    memberIndex = computeMemberIndex$1@29 // through LazyJavaStaticClassScope@27
+    nestedClassIndex = LinkedHashMap@30 // through LazyJavaClassMemberScope@21
+    nestedClasses('valueOf': Name@22) = null // through LazyJavaClassMemberScope@21
+    properties('valueOf': Name@22) = EmptyList@2[empty] // through LazyJavaClassMemberScope@21
+    properties('valueOf': Name@22) = EmptyList@2[empty] // through LazyJavaStaticClassScope@27
+    typeConstructor = LazyJavaClassTypeConstructor@31['Integer']
 }
 
 LazyJavaClassDescriptor@32['OutputStream'] {
-    _functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@33
-    _properties('println': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@33
-    _typeConstructor = LazyJavaClassTypeConstructor@34['OutputStream']
-    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@33
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@33
+    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@33
+    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@33
+    typeConstructor = LazyJavaClassTypeConstructor@35['OutputStream']
 }
 
 LazyJavaClassDescriptor@36['PrintStream'] {
-    _functions('println': Name@4) = ArrayList@37[10] { JavaMethodDescriptor@38['println'], JavaMethodDescriptor@39['println'], JavaMethodDescriptor@40['println'], ... } // through LazyJavaClassMemberScope@41
-    _properties('println': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@41
-    _typeConstructor = LazyJavaClassTypeConstructor@42['PrintStream']
-    defaultType = JetTypeImpl@43['PrintStream']
-    enumEntryIndex = LinkedHashMap@44 // through LazyJavaClassMemberScope@41
-    memberIndex = computeMemberIndex$1@45 // through LazyJavaClassMemberScope@41
-    nestedClassIndex = LinkedHashMap@46 // through LazyJavaClassMemberScope@41
-    nestedClasses('println': Name@4) = null // through LazyJavaClassMemberScope@41
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@47['<this>']
+    defaultType = JetTypeImpl@37['PrintStream']
+    enumEntryIndex = LinkedHashMap@38 // through LazyJavaClassMemberScope@39
+    functions('println': Name@5) = ArrayList@40[10] { JavaMethodDescriptor@41['println'], JavaMethodDescriptor@42['println'], JavaMethodDescriptor@43['println'], ... } // through LazyJavaClassMemberScope@39
+    memberIndex = computeMemberIndex$1@44 // through LazyJavaClassMemberScope@39
+    nestedClassIndex = LinkedHashMap@45 // through LazyJavaClassMemberScope@39
+    nestedClasses('println': Name@5) = null // through LazyJavaClassMemberScope@39
+    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@39
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@46['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@47['PrintStream']
 }
 
 LazyJavaClassDescriptor@48['System'] {
-    _properties('out': Name@49) = ArrayList@50[1] { JavaPropertyDescriptor@51['out'] } // through LazyJavaStaticClassScope@52
-    _properties('out': Name@49) = EmptyList@2[empty] // through LazyJavaClassMemberScope@53
-    _typeConstructor = LazyJavaClassTypeConstructor@54['System']
-    enumEntryIndex = LinkedHashMap@55 // through LazyJavaClassMemberScope@53
-    memberIndex = computeMemberIndex$1@56 // through LazyJavaClassMemberScope@53
-    memberIndex = computeMemberIndex$1@57 // through LazyJavaStaticClassScope@52
-    nestedClassIndex = LinkedHashMap@58 // through LazyJavaClassMemberScope@53
-    nestedClasses('out': Name@49) = null // through LazyJavaClassMemberScope@53
+    enumEntryIndex = LinkedHashMap@49 // through LazyJavaClassMemberScope@50
+    memberIndex = computeMemberIndex$1@51 // through LazyJavaClassMemberScope@50
+    memberIndex = computeMemberIndex$1@52 // through LazyJavaStaticClassScope@53
+    nestedClassIndex = LinkedHashMap@54 // through LazyJavaClassMemberScope@50
+    nestedClasses('out': Name@55) = null // through LazyJavaClassMemberScope@50
+    properties('out': Name@55) = ArrayList@56[1] { JavaPropertyDescriptor@57['out'] } // through LazyJavaStaticClassScope@53
+    properties('out': Name@55) = EmptyList@2[empty] // through LazyJavaClassMemberScope@50
+    typeConstructor = LazyJavaClassTypeConstructor@58['System']
 }
 
-LazyJavaClassTypeConstructor@5['Appendable'] {
-    _parameters = ArrayList@59[empty]
-    _supertypes = ArrayList@60[1] { JetTypeImpl@61['Any'] }
+LazyJavaClassTypeConstructor@6['Appendable'] {
+    parameters = ArrayList@59[empty]
+    supertypes = ArrayList@60[1] { JetTypeImpl@61['Any'] }
 }
 
-LazyJavaClassTypeConstructor@9['AutoCloseable'] {
-    _parameters = ArrayList@62[empty]
-    _supertypes = ArrayList@63[1] { JetTypeImpl@61['Any'] }
+LazyJavaClassTypeConstructor@10['AutoCloseable'] {
+    parameters = ArrayList@62[empty]
+    supertypes = ArrayList@63[1] { JetTypeImpl@61['Any'] }
 }
 
-LazyJavaClassTypeConstructor@13['Closeable'] {
-    _parameters = ArrayList@64[empty]
-    _supertypes = ArrayList@65[1] { LazyJavaClassifierType@66['AutoCloseable'] }
+LazyJavaClassTypeConstructor@14['Closeable'] {
+    parameters = ArrayList@64[empty]
+    supertypes = ArrayList@65[1] { LazyJavaClassifierType@66['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@17['FilterOutputStream'] {
-    _parameters = ArrayList@67[empty]
-    _supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['OutputStream'] }
+LazyJavaClassTypeConstructor@18['FilterOutputStream'] {
+    parameters = ArrayList@67[empty]
+    supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@27['Integer'] {
-    _supertypes = ArrayList@70[2] { LazyJavaClassifierType@71['Number'], LazyJavaClassifierType@72['Comparable<Integer>'] }
+LazyJavaClassTypeConstructor@31['Integer'] {
+    supertypes = ArrayList@70[2] { LazyJavaClassifierType@71['Number'], LazyJavaClassifierType@72['Comparable<Integer>'] }
 }
 
-LazyJavaClassTypeConstructor@34['OutputStream'] {
-    _parameters = ArrayList@73[empty]
-    _supertypes = ArrayList@74[1] { LazyJavaClassifierType@75['Closeable'] }
+LazyJavaClassTypeConstructor@35['OutputStream'] {
+    parameters = ArrayList@73[empty]
+    supertypes = ArrayList@74[1] { LazyJavaClassifierType@75['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@42['PrintStream'] {
-    _parameters = ArrayList@76[empty]
-    _supertypes = ArrayList@77[3] { LazyJavaClassifierType@78['FilterOutputStream'], LazyJavaClassifierType@79['Appendable'], LazyJavaClassifierType@80['Closeable'] }
+LazyJavaClassTypeConstructor@47['PrintStream'] {
+    parameters = ArrayList@76[empty]
+    supertypes = ArrayList@77[3] { LazyJavaClassifierType@78['FilterOutputStream'], LazyJavaClassifierType@79['Appendable'], LazyJavaClassifierType@80['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@54['System'] {
-    _supertypes = ArrayList@81[1] { JetTypeImpl@61['Any'] }
+LazyJavaClassTypeConstructor@58['System'] {
+    supertypes = ArrayList@81[1] { JetTypeImpl@61['Any'] }
 }
 
 LazyJavaClassifierType@79['Appendable'] {
-    _arguments = ArrayList@82[empty]
-    _memberScope = LazyJavaClassMemberScope@3
-    _typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
+    arguments = ArrayList@82[empty]
     classifier = JavaClassImpl@83['Appendable']
+    memberScope = LazyJavaClassMemberScope@3
+    typeConstructor = LazyJavaClassTypeConstructor@6['Appendable']
 }
 
 LazyJavaClassifierType@66['AutoCloseable'] {
-    _arguments = ArrayList@84[empty]
-    _memberScope = LazyJavaClassMemberScope@8
-    _typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
+    arguments = ArrayList@84[empty]
     classifier = JavaClassImpl@85['AutoCloseable']
-}
-
-LazyJavaClassifierType@75['Closeable'] {
-    _arguments = ArrayList@86[empty]
-    _memberScope = LazyJavaClassMemberScope@12
-    _typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
-    classifier = JavaClassImpl@87['Closeable']
+    memberScope = LazyJavaClassMemberScope@8
+    typeConstructor = LazyJavaClassTypeConstructor@10['AutoCloseable']
 }
 
 LazyJavaClassifierType@80['Closeable'] {
-    _arguments = ArrayList@88[empty]
-    _memberScope = LazyJavaClassMemberScope@12
-    _typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
+    arguments = ArrayList@86[empty]
+    classifier = JavaClassImpl@87['Closeable']
+    memberScope = LazyJavaClassMemberScope@12
+    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+}
+
+LazyJavaClassifierType@75['Closeable'] {
+    arguments = ArrayList@88[empty]
     classifier = JavaClassImpl@89['Closeable']
+    memberScope = LazyJavaClassMemberScope@12
+    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
 }
 
 LazyJavaClassifierType@72['Comparable<Integer>'] {
-    _arguments = ArrayList@90[1] { TypeProjectionImpl@91 }
-    _memberScope = SubstitutingScope@92
-    _typeConstructor = DeserializedClassTypeConstructor@93
-    classifier = JavaClassImpl@94['Comparable']
+    arguments = ArrayList@90[1] { TypeProjectionImpl@91 }
+    classifier = JavaClassImpl@92['Comparable']
+    memberScope = SubstitutingScope@93
+    typeConstructor = DeserializedClassTypeConstructor@94
 }
 
 LazyJavaClassifierType@78['FilterOutputStream'] {
-    _arguments = ArrayList@95[empty]
-    _memberScope = LazyJavaClassMemberScope@16
-    _typeConstructor = LazyJavaClassTypeConstructor@17['FilterOutputStream']
+    arguments = ArrayList@95[empty]
     classifier = JavaClassImpl@96['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@16
+    typeConstructor = LazyJavaClassTypeConstructor@18['FilterOutputStream']
 }
 
 LazyJavaClassifierType@97['Flushable'] {
-    _typeConstructor = TypeConstructorImpl$1@98
     classifier = null
+    typeConstructor = TypeConstructorImpl$1@98
 }
 
 LazyJavaClassifierType@99['Integer'] {
-    _arguments = ArrayList@100[empty]
-    _nullable = 'false': Boolean@101
-    _typeConstructor = DeserializedClassTypeConstructor@102
-    classifier = JavaClassImpl@103['Integer']
+    arguments = ArrayList@100[empty]
+    classifier = JavaClassImpl@101['Integer']
+    nullable = 'false': Boolean@102
+    typeConstructor = DeserializedClassTypeConstructor@103
 }
 
 LazyJavaClassifierType@104['Integer'] {
-    _arguments = ArrayList@105[empty]
-    _nullable = 'false': Boolean@101
-    _typeConstructor = DeserializedClassTypeConstructor@102
+    arguments = ArrayList@105[empty]
     classifier = JavaClassImpl@106['Integer']
+    nullable = 'false': Boolean@102
+    typeConstructor = DeserializedClassTypeConstructor@103
 }
 
 LazyJavaClassifierType@107['Integer'] {
-    _arguments = ArrayList@108[empty]
-    _nullable = 'false': Boolean@101
-    _typeConstructor = DeserializedClassTypeConstructor@102
+    arguments = ArrayList@108[empty]
     classifier = JavaClassImpl@109['Integer']
+    nullable = 'false': Boolean@102
+    typeConstructor = DeserializedClassTypeConstructor@103
 }
 
 LazyJavaClassifierType@110['Integer'] {
-    _arguments = ArrayList@111[empty]
-    _nullable = 'false': Boolean@101
-    _typeConstructor = DeserializedClassTypeConstructor@102
+    arguments = ArrayList@111[empty]
     classifier = JavaClassImpl@112['Integer']
+    nullable = 'false': Boolean@102
+    typeConstructor = DeserializedClassTypeConstructor@103
 }
 
 LazyJavaClassifierType@113['Integer'] {
-    _arguments = ArrayList@114[empty]
-    _nullable = 'true': Boolean@115
-    _typeConstructor = DeserializedClassTypeConstructor@102
-    classifier = JavaClassImpl@106['Integer']
+    arguments = ArrayList@114[empty]
+    classifier = JavaClassImpl@112['Integer']
+    nullable = 'true': Boolean@115
+    typeConstructor = DeserializedClassTypeConstructor@103
 }
 
 LazyJavaClassifierType@116['Integer'] {
-    _arguments = ArrayList@117[empty]
-    _nullable = 'true': Boolean@115
-    _typeConstructor = DeserializedClassTypeConstructor@102
+    arguments = ArrayList@117[empty]
     classifier = JavaClassImpl@109['Integer']
+    nullable = 'true': Boolean@115
+    typeConstructor = DeserializedClassTypeConstructor@103
 }
 
 LazyJavaClassifierType@118['Integer'] {
-    _arguments = ArrayList@119[empty]
-    _nullable = 'true': Boolean@115
-    _typeConstructor = DeserializedClassTypeConstructor@102
-    classifier = JavaClassImpl@112['Integer']
+    arguments = ArrayList@119[empty]
+    classifier = JavaClassImpl@106['Integer']
+    nullable = 'true': Boolean@115
+    typeConstructor = DeserializedClassTypeConstructor@103
 }
 
 LazyJavaClassifierType@120['Integer'] {
-    _arguments = ArrayList@121[empty]
-    _nullable = 'true': Boolean@115
-    _typeConstructor = DeserializedClassTypeConstructor@102
-    classifier = JavaClassImpl@103['Integer']
+    arguments = ArrayList@121[empty]
+    classifier = JavaClassImpl@101['Integer']
+    nullable = 'true': Boolean@115
+    typeConstructor = DeserializedClassTypeConstructor@103
 }
 
 LazyJavaClassifierType@71['Number'] {
-    _arguments = ArrayList@122[empty]
-    _memberScope = DeserializedClassMemberScope@123
-    _typeConstructor = DeserializedClassTypeConstructor@124
-    classifier = JavaClassImpl@125['Number']
+    arguments = ArrayList@122[empty]
+    classifier = JavaClassImpl@123['Number']
+    memberScope = DeserializedClassMemberScope@124
+    typeConstructor = DeserializedClassTypeConstructor@125
 }
 
 LazyJavaClassifierType@126['Object'] {
-    _arguments = ArrayList@127[empty]
-    _nullable = 'false': Boolean@101
-    _typeConstructor = DeserializedClassTypeConstructor@128
-    classifier = JavaClassImpl@129['Object']
+    arguments = ArrayList@127[empty]
+    classifier = JavaClassImpl@128['Object']
+    nullable = 'false': Boolean@102
+    typeConstructor = DeserializedClassTypeConstructor@129
 }
 
 LazyJavaClassifierType@130['Object'] {
-    _arguments = ArrayList@131[empty]
-    _nullable = 'true': Boolean@115
-    _typeConstructor = DeserializedClassTypeConstructor@128
-    classifier = JavaClassImpl@129['Object']
+    arguments = ArrayList@131[empty]
+    classifier = JavaClassImpl@128['Object']
+    nullable = 'true': Boolean@115
+    typeConstructor = DeserializedClassTypeConstructor@129
 }
 
 LazyJavaClassifierType@132['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@128
     classifier = JavaClassImpl@133['Object']
+    typeConstructor = DeserializedClassTypeConstructor@129
 }
 
 LazyJavaClassifierType@134['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@128
     classifier = JavaClassImpl@135['Object']
+    typeConstructor = DeserializedClassTypeConstructor@129
 }
 
 LazyJavaClassifierType@136['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@128
     classifier = JavaClassImpl@137['Object']
+    typeConstructor = DeserializedClassTypeConstructor@129
 }
 
 LazyJavaClassifierType@138['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@128
     classifier = JavaClassImpl@139['Object']
+    typeConstructor = DeserializedClassTypeConstructor@129
 }
 
 LazyJavaClassifierType@69['OutputStream'] {
-    _arguments = ArrayList@140[empty]
-    _memberScope = LazyJavaClassMemberScope@33
-    _typeConstructor = LazyJavaClassTypeConstructor@34['OutputStream']
+    arguments = ArrayList@140[empty]
     classifier = JavaClassImpl@141['OutputStream']
+    memberScope = LazyJavaClassMemberScope@33
+    typeConstructor = LazyJavaClassTypeConstructor@35['OutputStream']
 }
 
 LazyJavaClassifierType@142['PrintStream'] {
-    _arguments = ArrayList@143[empty]
-    _memberScope = LazyJavaClassMemberScope@41
-    _nullable = 'false': Boolean@101
-    _typeConstructor = LazyJavaClassTypeConstructor@42['PrintStream']
+    arguments = ArrayList@143[empty]
     classifier = JavaClassImpl@144['PrintStream']
+    memberScope = LazyJavaClassMemberScope@39
+    nullable = 'false': Boolean@102
+    typeConstructor = LazyJavaClassTypeConstructor@47['PrintStream']
 }
 
 LazyJavaClassifierType@145['PrintStream'] {
-    _arguments = ArrayList@146[empty]
-    _nullable = 'true': Boolean@115
-    _typeConstructor = LazyJavaClassTypeConstructor@42['PrintStream']
+    arguments = ArrayList@146[empty]
     classifier = JavaClassImpl@144['PrintStream']
+    nullable = 'true': Boolean@115
+    typeConstructor = LazyJavaClassTypeConstructor@47['PrintStream']
 }
 
 LazyJavaClassifierType@147['String'] {
-    _arguments = ArrayList@148[empty]
-    _nullable = 'false': Boolean@101
-    _typeConstructor = DeserializedClassTypeConstructor@149
-    classifier = JavaClassImpl@150['String']
+    arguments = ArrayList@148[empty]
+    classifier = JavaClassImpl@149['String']
+    nullable = 'false': Boolean@102
+    typeConstructor = DeserializedClassTypeConstructor@150
 }
 
 LazyJavaClassifierType@151['String'] {
-    _arguments = ArrayList@152[empty]
-    _nullable = 'false': Boolean@101
-    _typeConstructor = DeserializedClassTypeConstructor@149
+    arguments = ArrayList@152[empty]
     classifier = JavaClassImpl@153['String']
+    nullable = 'false': Boolean@102
+    typeConstructor = DeserializedClassTypeConstructor@150
 }
 
 LazyJavaClassifierType@154['String'] {
-    _arguments = ArrayList@155[empty]
-    _nullable = 'false': Boolean@101
-    _typeConstructor = DeserializedClassTypeConstructor@149
+    arguments = ArrayList@155[empty]
     classifier = JavaClassImpl@156['String']
+    nullable = 'false': Boolean@102
+    typeConstructor = DeserializedClassTypeConstructor@150
 }
 
 LazyJavaClassifierType@157['String'] {
-    _arguments = ArrayList@158[empty]
-    _nullable = 'true': Boolean@115
-    _typeConstructor = DeserializedClassTypeConstructor@149
-    classifier = JavaClassImpl@150['String']
+    arguments = ArrayList@158[empty]
+    classifier = JavaClassImpl@153['String']
+    nullable = 'true': Boolean@115
+    typeConstructor = DeserializedClassTypeConstructor@150
 }
 
 LazyJavaClassifierType@159['String'] {
-    _arguments = ArrayList@160[empty]
-    _nullable = 'true': Boolean@115
-    _typeConstructor = DeserializedClassTypeConstructor@149
-    classifier = JavaClassImpl@156['String']
+    arguments = ArrayList@160[empty]
+    classifier = JavaClassImpl@149['String']
+    nullable = 'true': Boolean@115
+    typeConstructor = DeserializedClassTypeConstructor@150
 }
 
 LazyJavaClassifierType@161['String'] {
-    _arguments = ArrayList@162[empty]
-    _nullable = 'true': Boolean@115
-    _typeConstructor = DeserializedClassTypeConstructor@149
-    classifier = JavaClassImpl@153['String']
+    arguments = ArrayList@162[empty]
+    classifier = JavaClassImpl@156['String']
+    nullable = 'true': Boolean@115
+    typeConstructor = DeserializedClassTypeConstructor@150
 }
 
 LazyJavaPackageFragmentProvider@163 {
-    _packageFragments('<root>': FqName@164) = LazyJavaPackageFragment@165['<root>']
-    _packageFragments('Any': FqName@166) = null
-    _packageFragments('Array': FqName@167) = null
-    _packageFragments('Int': FqName@168) = null
-    _packageFragments('Integer': FqName@169) = null
-    _packageFragments('String': FqName@170) = null
-    _packageFragments('System': FqName@171) = null
-    _packageFragments('T': FqName@172) = null
-    _packageFragments('java': FqName@173) = LazyJavaPackageFragment@174['java']
-    _packageFragments('java.io': FqName@175) = LazyJavaPackageFragment@176['io']
-    _packageFragments('java.lang': FqName@177) = LazyJavaPackageFragment@178['lang']
-    _packageFragments('java.lang.Any': FqName@179) = null
-    _packageFragments('java.lang.Array': FqName@180) = null
-    _packageFragments('java.lang.Int': FqName@181) = null
-    _packageFragments('java.lang.Integer': FqName@182) = null
-    _packageFragments('java.lang.String': FqName@183) = null
-    _packageFragments('java.lang.System': FqName@184) = null
-    _packageFragments('java.lang.T': FqName@185) = null
-    _packageFragments('kotlin': FqName@186) = null
-    _packageFragments('kotlin.Any': FqName@187) = null
-    _packageFragments('kotlin.Array': FqName@188) = null
-    _packageFragments('kotlin.Int': FqName@189) = null
-    _packageFragments('kotlin.Integer': FqName@190) = null
-    _packageFragments('kotlin.String': FqName@191) = null
-    _packageFragments('kotlin.System': FqName@192) = null
-    _packageFragments('kotlin.T': FqName@193) = null
-    _packageFragments('kotlin.io': FqName@194) = null
-    _packageFragments('kotlin.jvm': FqName@195) = null
+    packageFragments('<root>': FqName@164) = LazyJavaPackageFragment@165['<root>']
+    packageFragments('Any': FqName@166) = null
+    packageFragments('Array': FqName@167) = null
+    packageFragments('Int': FqName@168) = null
+    packageFragments('Integer': FqName@169) = null
+    packageFragments('String': FqName@170) = null
+    packageFragments('System': FqName@171) = null
+    packageFragments('T': FqName@172) = null
+    packageFragments('java': FqName@173) = LazyJavaPackageFragment@174['java']
+    packageFragments('java.io': FqName@175) = LazyJavaPackageFragment@176['io']
+    packageFragments('java.lang': FqName@177) = LazyJavaPackageFragment@178['lang']
+    packageFragments('java.lang.Any': FqName@179) = null
+    packageFragments('java.lang.Array': FqName@180) = null
+    packageFragments('java.lang.Int': FqName@181) = null
+    packageFragments('java.lang.Integer': FqName@182) = null
+    packageFragments('java.lang.String': FqName@183) = null
+    packageFragments('java.lang.System': FqName@184) = null
+    packageFragments('java.lang.T': FqName@185) = null
+    packageFragments('kotlin': FqName@186) = null
+    packageFragments('kotlin.Any': FqName@187) = null
+    packageFragments('kotlin.Array': FqName@188) = null
+    packageFragments('kotlin.Int': FqName@189) = null
+    packageFragments('kotlin.Integer': FqName@190) = null
+    packageFragments('kotlin.String': FqName@191) = null
+    packageFragments('kotlin.System': FqName@192) = null
+    packageFragments('kotlin.T': FqName@193) = null
+    packageFragments('kotlin.io': FqName@194) = null
+    packageFragments('kotlin.jvm': FqName@195) = null
     topLevelClasses(JavaClassImpl@83['Appendable']) = LazyJavaClassDescriptor@0['Appendable']
     topLevelClasses(JavaClassImpl@85['AutoCloseable']) = LazyJavaClassDescriptor@7['AutoCloseable']
-    topLevelClasses(JavaClassImpl@89['Closeable']) = LazyJavaClassDescriptor@11['Closeable']
+    topLevelClasses(JavaClassImpl@87['Closeable']) = LazyJavaClassDescriptor@11['Closeable']
     topLevelClasses(JavaClassImpl@96['FilterOutputStream']) = LazyJavaClassDescriptor@15['FilterOutputStream']
     topLevelClasses(JavaClassImpl@196['Integer']) = LazyJavaClassDescriptor@19['Integer']
     topLevelClasses(JavaClassImpl@141['OutputStream']) = LazyJavaClassDescriptor@32['OutputStream']
@@ -355,38 +355,38 @@ LazyJavaPackageFragmentProvider@163 {
 }
 
 LazyJavaPackageFragment@165['<root>'] {
-    _functions('plus': Name@198) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    _functions('println': Name@4) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    _functions('sure': Name@200) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('Any': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('Array': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('Int': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('Integer': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('String': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('System': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('plus': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('println': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('sure': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('Any': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('Array': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('Int': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('Integer': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('String': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('System': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('plus': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('println': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('sure': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@199
     deserializedPackageScope = Empty@207 // through LazyPackageFragmentScopeForJavaPackage@199
+    functions('plus': Name@205) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@199
+    functions('println': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@199
+    functions('sure': Name@206) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@199
     memberIndex = computeMemberIndex$1@208 // through LazyPackageFragmentScopeForJavaPackage@199
 }
 
 LazyJavaPackageFragment@174['java'] {
-    _functions('lang': Name@209) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@210
-    classes('lang': Name@211) = null // through LazyPackageFragmentScopeForJavaPackage@210
+    classes('lang': Name@209) = null // through LazyPackageFragmentScopeForJavaPackage@210
     deserializedPackageScope = Empty@207 // through LazyPackageFragmentScopeForJavaPackage@210
+    functions('lang': Name@211) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@210
     memberIndex = computeMemberIndex$1@212 // through LazyPackageFragmentScopeForJavaPackage@210
 }
 
 LazyJavaPackageFragment@178['lang'] {
-    _functions('plus': Name@198) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    _functions('println': Name@4) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    _functions('sure': Name@200) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('Integer': Name@204) = LazyJavaClassDescriptor@19['Integer'] // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('System': Name@206) = LazyJavaClassDescriptor@48['System'] // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('plus': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('println': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('sure': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@213
+    classes('Integer': Name@202) = LazyJavaClassDescriptor@19['Integer'] // through LazyPackageFragmentScopeForJavaPackage@213
+    classes('System': Name@204) = LazyJavaClassDescriptor@48['System'] // through LazyPackageFragmentScopeForJavaPackage@213
+    classes('plus': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@213
+    classes('println': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@213
+    classes('sure': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@213
     deserializedPackageScope = Empty@207 // through LazyPackageFragmentScopeForJavaPackage@213
+    functions('plus': Name@205) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@213
+    functions('println': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@213
+    functions('sure': Name@206) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@213
     memberIndex = computeMemberIndex$1@214 // through LazyPackageFragmentScopeForJavaPackage@213
 }