Update lazy logs after field rename

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject1.lazy.log

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

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject2.lazy.log

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

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.lazy.log

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

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.lazy.log

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

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.lazy.log

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

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.lazy.log

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

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.lazy.log

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

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.lazy.log

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

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject1.lazy.log

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

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject2.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/defaultArgs.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/extensionTailCall.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.lazy.log

@@ -1,72 +1,72 @@
 LazyAnnotationDescriptor@0 {
-    _resolutionResults = OverloadResolutionResultsImpl@1
+    resolutionResults = OverloadResolutionResultsImpl@1
-    _type = JetTypeImpl@2['suppress']
+    type = JetTypeImpl@2['suppress']
-    _valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
+    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
 }
 
 LazyAnnotationDescriptor@5 {
-    _resolutionResults = OverloadResolutionResultsImpl@6
+    resolutionResults = OverloadResolutionResultsImpl@6
-    _type = JetTypeImpl@7['tailRecursive']
+    type = JetTypeImpl@7['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@8 {
-    _packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
+    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    _packageFragments('Int': FqName@11) = null
+    packageFragments('Int': FqName@11) = null
-    _packageFragments('String': FqName@12) = null
+    packageFragments('String': FqName@12) = null
-    _packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
+    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    _packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
+    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    _packageFragments('java.lang.Int': FqName@17) = null
+    packageFragments('java.lang.Int': FqName@17) = null
-    _packageFragments('java.lang.String': FqName@18) = null
+    packageFragments('java.lang.String': FqName@18) = null
-    _packageFragments('java.lang.suppress': FqName@19) = null
+    packageFragments('java.lang.suppress': FqName@19) = null
-    _packageFragments('java.lang.tailRecursive': FqName@20) = null
+    packageFragments('java.lang.tailRecursive': FqName@20) = null
-    _packageFragments('kotlin': FqName@21) = null
+    packageFragments('kotlin': FqName@21) = null
-    _packageFragments('kotlin.Int': FqName@22) = null
+    packageFragments('kotlin.Int': FqName@22) = null
-    _packageFragments('kotlin.String': FqName@23) = null
+    packageFragments('kotlin.String': FqName@23) = null
-    _packageFragments('kotlin.io': FqName@24) = null
+    packageFragments('kotlin.io': FqName@24) = null
-    _packageFragments('kotlin.jvm': FqName@25) = null
+    packageFragments('kotlin.jvm': FqName@25) = null
-    _packageFragments('kotlin.suppress': FqName@26) = null
+    packageFragments('kotlin.suppress': FqName@26) = null
-    _packageFragments('kotlin.tailRecursive': FqName@27) = null
+    packageFragments('kotlin.tailRecursive': FqName@27) = null
-    _packageFragments('suppress': FqName@28) = null
+    packageFragments('suppress': FqName@28) = null
-    _packageFragments('tailRecursive': FqName@29) = null
+    packageFragments('tailRecursive': FqName@29) = null
 }
 
 LazyJavaPackageFragment@10['<root>'] {
-    _functions('badTails': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('Int': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    _functions('compareTo': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('String': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    _functions('equals': Name@34) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('badTails': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    _functions('minus': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('compareTo': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    _functions('plus': Name@36) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('equals': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('Int': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('minus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('String': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('plus': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('badTails': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('suppress': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('compareTo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('tailRecursive': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('equals': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('minus': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('badTails': Name@33) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('plus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('compareTo': Name@34) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('suppress': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('equals': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('tailRecursive': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('minus': Name@36) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('plus': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@14['java'] {
-    _functions('lang': Name@43) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('lang': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('lang': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
     memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
 }
 
 LazyJavaPackageFragment@16['lang'] {
-    _functions('badTails': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('badTails': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    _functions('compareTo': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('compareTo': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    _functions('equals': Name@34) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('equals': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    _functions('minus': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('minus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    _functions('plus': Name@36) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('plus': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('badTails': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('compareTo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('badTails': Name@33) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('equals': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('compareTo': Name@34) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('minus': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('equals': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('plus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('minus': Name@36) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('plus': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
     memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
 }

compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/infixCall.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/insideElvis.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.lazy.log

@@ -1,83 +1,83 @@
 LazyAnnotationDescriptor@0 {
-    _resolutionResults = OverloadResolutionResultsImpl@1
+    resolutionResults = OverloadResolutionResultsImpl@1
-    _type = JetTypeImpl@2['tailRecursive']
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyAnnotationDescriptor@3 {
-    _resolutionResults = OverloadResolutionResultsImpl@4
+    resolutionResults = OverloadResolutionResultsImpl@4
-    _type = JetTypeImpl@5['tailRecursive']
+    type = JetTypeImpl@5['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@6 {
-    _packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
+    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    _packageFragments('Any': FqName@9) = null
+    packageFragments('Any': FqName@9) = null
-    _packageFragments('B': FqName@10) = null
+    packageFragments('B': FqName@10) = null
-    _packageFragments('C': FqName@11) = null
+    packageFragments('C': FqName@11) = null
-    _packageFragments('Int': FqName@12) = null
+    packageFragments('Int': FqName@12) = null
-    _packageFragments('String': FqName@13) = null
+    packageFragments('String': FqName@13) = null
-    _packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
+    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    _packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
+    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    _packageFragments('java.lang.Any': FqName@18) = null
+    packageFragments('java.lang.Any': FqName@18) = null
-    _packageFragments('java.lang.C': FqName@19) = null
+    packageFragments('java.lang.C': FqName@19) = null
-    _packageFragments('java.lang.Int': FqName@20) = null
+    packageFragments('java.lang.Int': FqName@20) = null
-    _packageFragments('java.lang.String': FqName@21) = null
+    packageFragments('java.lang.String': FqName@21) = null
-    _packageFragments('java.lang.tailRecursive': FqName@22) = null
+    packageFragments('java.lang.tailRecursive': FqName@22) = null
-    _packageFragments('kotlin': FqName@23) = null
+    packageFragments('kotlin': FqName@23) = null
-    _packageFragments('kotlin.Any': FqName@24) = null
+    packageFragments('kotlin.Any': FqName@24) = null
-    _packageFragments('kotlin.C': FqName@25) = null
+    packageFragments('kotlin.C': FqName@25) = null
-    _packageFragments('kotlin.Int': FqName@26) = null
+    packageFragments('kotlin.Int': FqName@26) = null
-    _packageFragments('kotlin.String': FqName@27) = null
+    packageFragments('kotlin.String': FqName@27) = null
-    _packageFragments('kotlin.io': FqName@28) = null
+    packageFragments('kotlin.io': FqName@28) = null
-    _packageFragments('kotlin.jvm': FqName@29) = null
+    packageFragments('kotlin.jvm': FqName@29) = null
-    _packageFragments('kotlin.tailRecursive': FqName@30) = null
+    packageFragments('kotlin.tailRecursive': FqName@30) = null
-    _packageFragments('tailRecursive': FqName@31) = null
+    packageFragments('tailRecursive': FqName@31) = null
 }
 
 LazyJavaPackageFragment@8['<root>'] {
-    _functions('B': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('Any': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    _functions('C': Name@35) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('B': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    _functions('compareTo': Name@36) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('C': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    _functions('h': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    _functions('h2': Name@38) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('String': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    _functions('makeC': Name@39) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('compareTo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    _functions('minus': Name@40) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('h': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('Any': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('h2': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('B': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('makeC': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('C': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('minus': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('tailRecursive': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('String': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('compareTo': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('B': Name@34) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('h': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('C': Name@35) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('h2': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('compareTo': Name@38) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('makeC': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('h': Name@39) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('minus': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('h2': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('tailRecursive': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('makeC': Name@41) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('minus': Name@42) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@15['java'] {
-    _functions('lang': Name@47) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('lang': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('lang': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('lang': Name@49) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
     memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
 }
 
 LazyJavaPackageFragment@17['lang'] {
-    _functions('B': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('B': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    _functions('C': Name@35) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    _functions('compareTo': Name@36) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    _functions('h': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    _functions('h2': Name@38) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    _functions('makeC': Name@39) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    _functions('minus': Name@40) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('B': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@51
     classes('C': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('compareTo': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('compareTo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('h': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('h': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('h2': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('h2': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('makeC': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('makeC': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('minus': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('minus': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@51
+    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('B': Name@34) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('C': Name@35) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('compareTo': Name@38) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('h': Name@39) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('h2': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('makeC': Name@41) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('minus': Name@42) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
     memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@51
 }

compiler/testData/codegen/box/functions/tailRecursion/loops.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.lazy.log

@@ -3,98 +3,98 @@ DescriptorResolver@0 {
 }
 
 LazyAnnotationDescriptor@1 {
-    _resolutionResults = OverloadResolutionResultsImpl@2
+    resolutionResults = OverloadResolutionResultsImpl@2
-    _type = JetTypeImpl@3['tailRecursive']
+    type = JetTypeImpl@3['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@4 {
-    _packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
+    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    _packageFragments('A': FqName@7) = null
+    packageFragments('A': FqName@7) = null
-    _packageFragments('Int': FqName@8) = null
+    packageFragments('Int': FqName@8) = null
-    _packageFragments('Iterator': FqName@9) = null
+    packageFragments('Iterator': FqName@9) = null
-    _packageFragments('Long': FqName@10) = null
+    packageFragments('Long': FqName@10) = null
-    _packageFragments('String': FqName@11) = null
+    packageFragments('String': FqName@11) = null
-    _packageFragments('T': FqName@12) = null
+    packageFragments('T': FqName@12) = null
-    _packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
+    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    _packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
+    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    _packageFragments('java.lang.A': FqName@17) = null
+    packageFragments('java.lang.A': FqName@17) = null
-    _packageFragments('java.lang.Int': FqName@18) = null
+    packageFragments('java.lang.Int': FqName@18) = null
-    _packageFragments('java.lang.Iterator': FqName@19) = null
+    packageFragments('java.lang.Iterator': FqName@19) = null
-    _packageFragments('java.lang.Long': FqName@20) = null
+    packageFragments('java.lang.Long': FqName@20) = null
-    _packageFragments('java.lang.String': FqName@21) = null
+    packageFragments('java.lang.String': FqName@21) = null
-    _packageFragments('java.lang.T': FqName@22) = null
+    packageFragments('java.lang.T': FqName@22) = null
-    _packageFragments('java.lang.tailRecursive': FqName@23) = null
+    packageFragments('java.lang.tailRecursive': FqName@23) = null
-    _packageFragments('kotlin': FqName@24) = null
+    packageFragments('kotlin': FqName@24) = null
-    _packageFragments('kotlin.A': FqName@25) = null
+    packageFragments('kotlin.A': FqName@25) = null
-    _packageFragments('kotlin.Int': FqName@26) = null
+    packageFragments('kotlin.Int': FqName@26) = null
-    _packageFragments('kotlin.Iterator': FqName@27) = null
+    packageFragments('kotlin.Iterator': FqName@27) = null
-    _packageFragments('kotlin.Long': FqName@28) = null
+    packageFragments('kotlin.Long': FqName@28) = null
-    _packageFragments('kotlin.String': FqName@29) = null
+    packageFragments('kotlin.String': FqName@29) = null
-    _packageFragments('kotlin.T': FqName@30) = null
+    packageFragments('kotlin.T': FqName@30) = null
-    _packageFragments('kotlin.io': FqName@31) = null
+    packageFragments('kotlin.io': FqName@31) = null
-    _packageFragments('kotlin.jvm': FqName@32) = null
+    packageFragments('kotlin.jvm': FqName@32) = null
-    _packageFragments('kotlin.tailRecursive': FqName@33) = null
+    packageFragments('kotlin.tailRecursive': FqName@33) = null
-    _packageFragments('tailRecursive': FqName@34) = null
+    packageFragments('tailRecursive': FqName@34) = null
 }
 
 LazyJavaPackageFragment@6['<root>'] {
-    _functions('equals': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('Int': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('foldFunction': Name@38) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('Iterator': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('foldl': Name@39) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('Long': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('hasNext': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('String': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('invoke': Name@41) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('equals': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('iterator': Name@42) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('foldFunction': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('next': Name@43) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('foldl': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('not': Name@44) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('hasNext': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('plus': Name@45) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('invoke': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('rangeTo': Name@46) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('iterator': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('next': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('Iterator': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('not': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('Long': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('plus': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('String': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('rangeTo': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('equals': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('tailRecursive': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foldFunction': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foldl': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('equals': Name@40) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('hasNext': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('foldFunction': Name@41) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('invoke': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('foldl': Name@42) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('iterator': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('hasNext': Name@43) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('next': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('invoke': Name@44) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('not': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('iterator': Name@45) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('plus': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('next': Name@46) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('rangeTo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('not': Name@47) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('tailRecursive': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('plus': Name@48) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('rangeTo': Name@49) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@36
 }
 
 LazyJavaPackageFragment@14['java'] {
-    _functions('lang': Name@54) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('lang': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('lang': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@55
+    functions('lang': Name@56) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@55
     memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@55
 }
 
 LazyJavaPackageFragment@16['lang'] {
-    _functions('equals': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('equals': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('foldFunction': Name@38) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('foldFunction': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('foldl': Name@39) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('foldl': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('hasNext': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('hasNext': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('invoke': Name@41) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('invoke': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('iterator': Name@42) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('iterator': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('next': Name@43) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('next': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('not': Name@44) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('not': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('plus': Name@45) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('plus': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('rangeTo': Name@46) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('rangeTo': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('equals': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('foldFunction': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('equals': Name@40) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('foldl': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('foldFunction': Name@41) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('hasNext': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('foldl': Name@42) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('invoke': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('hasNext': Name@43) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('iterator': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('invoke': Name@44) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('next': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('iterator': Name@45) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('not': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('next': Name@46) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('plus': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('not': Name@47) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('rangeTo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('plus': Name@48) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('rangeTo': Name@49) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
     memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
 }

compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/returnIf.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/returnInTry.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/sum.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/tailCallInBlockInParentheses.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.lazy.log

@@ -1,75 +1,75 @@
 LazyAnnotationDescriptor@0 {
-    _resolutionResults = OverloadResolutionResultsImpl@1
+    resolutionResults = OverloadResolutionResultsImpl@1
-    _type = JetTypeImpl@2['tailRecursive']
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaClassDescriptor@3['Exception'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@4['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@4['Exception']
 }
 
 LazyJavaClassTypeConstructor@4['Exception'] {
-    _parameters = ArrayList@5[empty]
+    parameters = ArrayList@5[empty]
-    _supertypes = ArrayList@6[1] { LazyJavaClassifierType@7['Throwable'] }
+    supertypes = ArrayList@6[1] { LazyJavaClassifierType@7['Throwable'] }
 }
 
 LazyJavaClassifierType@7['Throwable'] {
-    _arguments = ArrayList@8[empty]
+    arguments = ArrayList@8[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@9
+    classifier = JavaClassImpl@9['Throwable']
-    classifier = JavaClassImpl@10['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@10
 }
 
 LazyJavaPackageFragmentProvider@11 {
-    _packageFragments('<root>': FqName@12) = LazyJavaPackageFragment@13['<root>']
+    packageFragments('<root>': FqName@12) = LazyJavaPackageFragment@13['<root>']
-    _packageFragments('Boolean': FqName@14) = null
+    packageFragments('Boolean': FqName@14) = null
-    _packageFragments('Exception': FqName@15) = null
+    packageFragments('Exception': FqName@15) = null
-    _packageFragments('String': FqName@16) = null
+    packageFragments('String': FqName@16) = null
-    _packageFragments('Unit': FqName@17) = null
+    packageFragments('Unit': FqName@17) = null
-    _packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
+    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    _packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
+    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    _packageFragments('java.lang.Boolean': FqName@22) = null
+    packageFragments('java.lang.Boolean': FqName@22) = null
-    _packageFragments('java.lang.Exception': FqName@23) = null
+    packageFragments('java.lang.Exception': FqName@23) = null
-    _packageFragments('java.lang.String': FqName@24) = null
+    packageFragments('java.lang.String': FqName@24) = null
-    _packageFragments('java.lang.Unit': FqName@25) = null
+    packageFragments('java.lang.Unit': FqName@25) = null
-    _packageFragments('java.lang.tailRecursive': FqName@26) = null
+    packageFragments('java.lang.tailRecursive': FqName@26) = null
-    _packageFragments('kotlin': FqName@27) = null
+    packageFragments('kotlin': FqName@27) = null
-    _packageFragments('kotlin.Boolean': FqName@28) = null
+    packageFragments('kotlin.Boolean': FqName@28) = null
-    _packageFragments('kotlin.Exception': FqName@29) = null
+    packageFragments('kotlin.Exception': FqName@29) = null
-    _packageFragments('kotlin.String': FqName@30) = null
+    packageFragments('kotlin.String': FqName@30) = null
-    _packageFragments('kotlin.Unit': FqName@31) = null
+    packageFragments('kotlin.Unit': FqName@31) = null
-    _packageFragments('kotlin.io': FqName@32) = null
+    packageFragments('kotlin.io': FqName@32) = null
-    _packageFragments('kotlin.jvm': FqName@33) = null
+    packageFragments('kotlin.jvm': FqName@33) = null
-    _packageFragments('kotlin.tailRecursive': FqName@34) = null
+    packageFragments('kotlin.tailRecursive': FqName@34) = null
-    _packageFragments('tailRecursive': FqName@35) = null
+    packageFragments('tailRecursive': FqName@35) = null
     topLevelClasses(JavaClassImpl@36['Exception']) = LazyJavaClassDescriptor@3['Exception']
 }
 
 LazyJavaPackageFragment@13['<root>'] {
-    _functions('not': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('Boolean': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('test': Name@40) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('Exception': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Boolean': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('String': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Exception': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('Unit': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('String': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('not': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Unit': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('tailRecursive': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('not': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('test': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('tailRecursive': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('test': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('not': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('test': Name@44) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@38
 }
 
 LazyJavaPackageFragment@19['java'] {
-    _functions('lang': Name@48) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('lang': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@49
+    functions('lang': Name@50) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@49
     memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
 }
 
 LazyJavaPackageFragment@21['lang'] {
-    _functions('not': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('Exception': Name@39) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@52
-    _functions('test': Name@40) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('not': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('Exception': Name@42) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('test': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('not': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('test': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('not': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('test': Name@44) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
     memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
 }

compiler/testData/codegen/box/functions/tailRecursion/thisReferences.lazy.log

@@ -1,79 +1,79 @@
 LazyAnnotationDescriptor@0 {
-    _resolutionResults = OverloadResolutionResultsImpl@1
+    resolutionResults = OverloadResolutionResultsImpl@1
-    _type = JetTypeImpl@2['tailRecursive']
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyAnnotationDescriptor@3 {
-    _resolutionResults = OverloadResolutionResultsImpl@4
+    resolutionResults = OverloadResolutionResultsImpl@4
-    _type = JetTypeImpl@5['tailRecursive']
+    type = JetTypeImpl@5['tailRecursive']
 }
 
 LazyAnnotationDescriptor@6 {
-    _resolutionResults = OverloadResolutionResultsImpl@7
+    resolutionResults = OverloadResolutionResultsImpl@7
-    _type = JetTypeImpl@8['tailRecursive']
+    type = JetTypeImpl@8['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@9 {
-    _packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
+    packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
-    _packageFragments('A': FqName@12) = null
+    packageFragments('A': FqName@12) = null
-    _packageFragments('Int': FqName@13) = null
+    packageFragments('Int': FqName@13) = null
-    _packageFragments('String': FqName@14) = null
+    packageFragments('String': FqName@14) = null
-    _packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
+    packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
-    _packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
+    packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
-    _packageFragments('java.lang.A': FqName@19) = null
+    packageFragments('java.lang.A': FqName@19) = null
-    _packageFragments('java.lang.Int': FqName@20) = null
+    packageFragments('java.lang.Int': FqName@20) = null
-    _packageFragments('java.lang.String': FqName@21) = null
+    packageFragments('java.lang.String': FqName@21) = null
-    _packageFragments('java.lang.tailRecursive': FqName@22) = null
+    packageFragments('java.lang.tailRecursive': FqName@22) = null
-    _packageFragments('kotlin': FqName@23) = null
+    packageFragments('kotlin': FqName@23) = null
-    _packageFragments('kotlin.A': FqName@24) = null
+    packageFragments('kotlin.A': FqName@24) = null
-    _packageFragments('kotlin.Int': FqName@25) = null
+    packageFragments('kotlin.Int': FqName@25) = null
-    _packageFragments('kotlin.String': FqName@26) = null
+    packageFragments('kotlin.String': FqName@26) = null
-    _packageFragments('kotlin.io': FqName@27) = null
+    packageFragments('kotlin.io': FqName@27) = null
-    _packageFragments('kotlin.jvm': FqName@28) = null
+    packageFragments('kotlin.jvm': FqName@28) = null
-    _packageFragments('kotlin.tailRecursive': FqName@29) = null
+    packageFragments('kotlin.tailRecursive': FqName@29) = null
-    _packageFragments('tailRecursive': FqName@30) = null
+    packageFragments('tailRecursive': FqName@30) = null
 }
 
 LazyJavaPackageFragment@11['<root>'] {
-    _functions('A': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('A': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('compareTo': Name@34) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('Int': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('f1': Name@35) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('String': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('f2': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('compareTo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('f3': Name@37) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('f1': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('minus': Name@38) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('f2': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('A': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('f3': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('Int': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('minus': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('String': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('tailRecursive': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('compareTo': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('f1': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('A': Name@31) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('f2': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('compareTo': Name@35) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('f3': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('f1': Name@36) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('minus': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('f2': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('tailRecursive': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('f3': Name@38) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('minus': Name@39) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@32
 }
 
 LazyJavaPackageFragment@16['java'] {
-    _functions('lang': Name@44) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('lang': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('lang': Name@46) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@45
     memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
 }
 
 LazyJavaPackageFragment@18['lang'] {
-    _functions('A': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    _functions('compareTo': Name@34) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    _functions('f1': Name@35) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    _functions('f2': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    _functions('f3': Name@37) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    _functions('minus': Name@38) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@48
     classes('A': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('compareTo': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('compareTo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('f1': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('f1': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('f2': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('f2': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('f3': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('f3': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('minus': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('minus': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@48
+    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('A': Name@31) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('compareTo': Name@35) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('f1': Name@36) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('f2': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('f3': Name@38) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('minus': Name@39) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
     memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
 }

compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.lazy.log

@@ -1,70 +1,70 @@
 LazyAnnotationDescriptor@0 {
-    _resolutionResults = OverloadResolutionResultsImpl@1
+    resolutionResults = OverloadResolutionResultsImpl@1
-    _type = JetTypeImpl@2['tailRecursive']
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Any': FqName@6) = null
+    packageFragments('Any': FqName@6) = null
-    _packageFragments('Int': FqName@7) = null
+    packageFragments('Int': FqName@7) = null
-    _packageFragments('String': FqName@8) = null
+    packageFragments('String': FqName@8) = null
-    _packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
+    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    _packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
+    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    _packageFragments('java.lang.Any': FqName@13) = null
+    packageFragments('java.lang.Any': FqName@13) = null
-    _packageFragments('java.lang.Int': FqName@14) = null
+    packageFragments('java.lang.Int': FqName@14) = null
-    _packageFragments('java.lang.String': FqName@15) = null
+    packageFragments('java.lang.String': FqName@15) = null
-    _packageFragments('java.lang.tailRecursive': FqName@16) = null
+    packageFragments('java.lang.tailRecursive': FqName@16) = null
-    _packageFragments('kotlin': FqName@17) = null
+    packageFragments('kotlin': FqName@17) = null
-    _packageFragments('kotlin.Any': FqName@18) = null
+    packageFragments('kotlin.Any': FqName@18) = null
-    _packageFragments('kotlin.Int': FqName@19) = null
+    packageFragments('kotlin.Int': FqName@19) = null
-    _packageFragments('kotlin.String': FqName@20) = null
+    packageFragments('kotlin.String': FqName@20) = null
-    _packageFragments('kotlin.io': FqName@21) = null
+    packageFragments('kotlin.io': FqName@21) = null
-    _packageFragments('kotlin.jvm': FqName@22) = null
+    packageFragments('kotlin.jvm': FqName@22) = null
-    _packageFragments('kotlin.tailRecursive': FqName@23) = null
+    packageFragments('kotlin.tailRecursive': FqName@23) = null
-    _packageFragments('tailRecursive': FqName@24) = null
+    packageFragments('tailRecursive': FqName@24) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('contains': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('Any': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('equals': Name@28) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('minus': Name@29) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('plus': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('contains': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('rangeTo': Name@31) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('withWhen': Name@32) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('minus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Any': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('plus': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Int': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('rangeTo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('tailRecursive': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('contains': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('withWhen': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('minus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('contains': Name@29) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('plus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('equals': Name@30) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('rangeTo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('minus': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('tailRecursive': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('plus': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('withWhen': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('rangeTo': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('withWhen': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@39) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
     memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    _functions('contains': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('contains': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    _functions('equals': Name@28) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    _functions('minus': Name@29) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('minus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    _functions('plus': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('plus': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    _functions('rangeTo': Name@31) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('rangeTo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    _functions('withWhen': Name@32) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('withWhen': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('contains': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('contains': Name@29) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('minus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('equals': Name@30) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('plus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('minus': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('rangeTo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('plus': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('withWhen': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('rangeTo': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('withWhen': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
     memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
 }

compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.lazy.log

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

compiler/testData/codegen/box/functions/tailRecursion/whenWithoutCondition.lazy.log

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

compiler/testData/diagnostics/tests/Abstract.lazy.log

@@ -6,83 +6,83 @@ DescriptorResolver@0 {
 }
 
 LazyJavaPackageFragmentProvider@5 {
-    _packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
+    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    _packageFragments('B1': FqName@8) = null
+    packageFragments('B1': FqName@8) = null
-    _packageFragments('B2': FqName@9) = null
+    packageFragments('B2': FqName@9) = null
-    _packageFragments('B3': FqName@10) = null
+    packageFragments('B3': FqName@10) = null
-    _packageFragments('Int': FqName@11) = null
+    packageFragments('Int': FqName@11) = null
-    _packageFragments('MyPackage': FqName@12) = null
+    packageFragments('MyPackage': FqName@12) = null
-    _packageFragments('MyPackage.Int': FqName@13) = null
+    packageFragments('MyPackage.Int': FqName@13) = null
-    _packageFragments('MyPackage.a': FqName@14) = null
+    packageFragments('MyPackage.a': FqName@14) = null
-    _packageFragments('MyPackage.a1': FqName@15) = null
+    packageFragments('MyPackage.a1': FqName@15) = null
-    _packageFragments('MyPackage.a2': FqName@16) = null
+    packageFragments('MyPackage.a2': FqName@16) = null
-    _packageFragments('MyPackage.a3': FqName@17) = null
+    packageFragments('MyPackage.a3': FqName@17) = null
-    _packageFragments('MyPackage.b': FqName@18) = null
+    packageFragments('MyPackage.b': FqName@18) = null
-    _packageFragments('MyPackage.b1': FqName@19) = null
+    packageFragments('MyPackage.b1': FqName@19) = null
-    _packageFragments('MyPackage.b2': FqName@20) = null
+    packageFragments('MyPackage.b2': FqName@20) = null
-    _packageFragments('MyPackage.b3': FqName@21) = null
+    packageFragments('MyPackage.b3': FqName@21) = null
-    _packageFragments('MyPackage.c': FqName@22) = null
+    packageFragments('MyPackage.c': FqName@22) = null
-    _packageFragments('MyPackage.c1': FqName@23) = null
+    packageFragments('MyPackage.c1': FqName@23) = null
-    _packageFragments('MyPackage.c2': FqName@24) = null
+    packageFragments('MyPackage.c2': FqName@24) = null
-    _packageFragments('MyPackage.c3': FqName@25) = null
+    packageFragments('MyPackage.c3': FqName@25) = null
-    _packageFragments('MyPackage.e': FqName@26) = null
+    packageFragments('MyPackage.e': FqName@26) = null
-    _packageFragments('MyPackage.e1': FqName@27) = null
+    packageFragments('MyPackage.e1': FqName@27) = null
-    _packageFragments('MyPackage.e2': FqName@28) = null
+    packageFragments('MyPackage.e2': FqName@28) = null
-    _packageFragments('MyPackage.e3': FqName@29) = null
+    packageFragments('MyPackage.e3': FqName@29) = null
-    _packageFragments('MyPackage.i': FqName@30) = null
+    packageFragments('MyPackage.i': FqName@30) = null
-    _packageFragments('MyPackage.i1': FqName@31) = null
+    packageFragments('MyPackage.i1': FqName@31) = null
-    _packageFragments('MyPackage.j': FqName@32) = null
+    packageFragments('MyPackage.j': FqName@32) = null
-    _packageFragments('MyPackage.j1': FqName@33) = null
+    packageFragments('MyPackage.j1': FqName@33) = null
-    _packageFragments('MyPackage.k': FqName@34) = null
+    packageFragments('MyPackage.k': FqName@34) = null
-    _packageFragments('MyPackage.k1': FqName@35) = null
+    packageFragments('MyPackage.k1': FqName@35) = null
-    _packageFragments('MyPackage.l': FqName@36) = null
+    packageFragments('MyPackage.l': FqName@36) = null
-    _packageFragments('MyPackage.l1': FqName@37) = null
+    packageFragments('MyPackage.l1': FqName@37) = null
-    _packageFragments('MyPackage.n': FqName@38) = null
+    packageFragments('MyPackage.n': FqName@38) = null
-    _packageFragments('String': FqName@39) = null
+    packageFragments('String': FqName@39) = null
-    _packageFragments('java': FqName@40) = LazyJavaPackageFragment@41['java']
+    packageFragments('java': FqName@40) = LazyJavaPackageFragment@41['java']
-    _packageFragments('java.lang': FqName@42) = LazyJavaPackageFragment@43['lang']
+    packageFragments('java.lang': FqName@42) = LazyJavaPackageFragment@43['lang']
-    _packageFragments('java.lang.B1': FqName@44) = null
+    packageFragments('java.lang.B1': FqName@44) = null
-    _packageFragments('java.lang.B3': FqName@45) = null
+    packageFragments('java.lang.B3': FqName@45) = null
-    _packageFragments('java.lang.Int': FqName@46) = null
+    packageFragments('java.lang.Int': FqName@46) = null
-    _packageFragments('java.lang.String': FqName@47) = null
+    packageFragments('java.lang.String': FqName@47) = null
-    _packageFragments('kotlin': FqName@48) = null
+    packageFragments('kotlin': FqName@48) = null
-    _packageFragments('kotlin.B1': FqName@49) = null
+    packageFragments('kotlin.B1': FqName@49) = null
-    _packageFragments('kotlin.B3': FqName@50) = null
+    packageFragments('kotlin.B3': FqName@50) = null
-    _packageFragments('kotlin.Int': FqName@51) = null
+    packageFragments('kotlin.Int': FqName@51) = null
-    _packageFragments('kotlin.String': FqName@52) = null
+    packageFragments('kotlin.String': FqName@52) = null
-    _packageFragments('kotlin.io': FqName@53) = null
+    packageFragments('kotlin.io': FqName@53) = null
-    _packageFragments('kotlin.jvm': FqName@54) = null
+    packageFragments('kotlin.jvm': FqName@54) = null
 }
 
 LazyJavaPackageFragment@7['<root>'] {
-    _functions('B1': Name@55) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@57
+    classes('B1': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    _functions('B3': Name@58) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@57
+    classes('B3': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('B1': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@57
+    classes('Int': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('B3': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@57
+    classes('String': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('Int': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@57
+    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('String': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@57
+    functions('B1': Name@55) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@57
+    functions('B3': Name@57) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@57
+    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@56
 }
 
 LazyJavaPackageFragment@41['java'] {
-    _functions('lang': Name@63) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('lang': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('lang': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('lang': Name@65) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@64
     memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
 LazyJavaPackageFragment@43['lang'] {
-    _functions('B1': Name@55) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    _functions('B3': Name@58) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@67
     classes('B1': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('B3': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('B3': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@67
     classes('a': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
     classes('c': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
     classes('c1': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@67
     classes('c2': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@67
     classes('c3': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@67
     classes('i': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@67
+    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('B1': Name@55) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('B3': Name@57) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@67
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@67
 }

compiler/testData/diagnostics/tests/AbstractInAbstractClass.lazy.log

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

compiler/testData/diagnostics/tests/AbstractInClass.lazy.log

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

compiler/testData/diagnostics/tests/AbstractInTrait.lazy.log

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

compiler/testData/diagnostics/tests/AnonymousInitializerVarAndConstructor.lazy.log

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

compiler/testData/diagnostics/tests/AnonymousInitializers.lazy.log

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

compiler/testData/diagnostics/tests/AutoCreatedIt.lazy.log

@@ -1,83 +1,83 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('Any': FqName@3) = null
+    packageFragments('Any': FqName@3) = null
-    _packageFragments('Boolean': FqName@4) = null
+    packageFragments('Boolean': FqName@4) = null
-    _packageFragments('Int': FqName@5) = null
+    packageFragments('Int': FqName@5) = null
-    _packageFragments('String': FqName@6) = null
+    packageFragments('String': FqName@6) = null
-    _packageFragments('URI': FqName@7) = null
+    packageFragments('URI': FqName@7) = null
-    _packageFragments('it': FqName@8) = null
+    packageFragments('it': FqName@8) = null
-    _packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
+    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    _packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
+    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    _packageFragments('java.lang.Any': FqName@13) = null
+    packageFragments('java.lang.Any': FqName@13) = null
-    _packageFragments('java.lang.Boolean': FqName@14) = null
+    packageFragments('java.lang.Boolean': FqName@14) = null
-    _packageFragments('java.lang.Int': FqName@15) = null
+    packageFragments('java.lang.Int': FqName@15) = null
-    _packageFragments('java.lang.String': FqName@16) = null
+    packageFragments('java.lang.String': FqName@16) = null
-    _packageFragments('java.lang.URI': FqName@17) = null
+    packageFragments('java.lang.URI': FqName@17) = null
-    _packageFragments('java.lang.it': FqName@18) = null
+    packageFragments('java.lang.it': FqName@18) = null
-    _packageFragments('kotlin': FqName@19) = null
+    packageFragments('kotlin': FqName@19) = null
-    _packageFragments('kotlin.Any': FqName@20) = null
+    packageFragments('kotlin.Any': FqName@20) = null
-    _packageFragments('kotlin.Boolean': FqName@21) = null
+    packageFragments('kotlin.Boolean': FqName@21) = null
-    _packageFragments('kotlin.Int': FqName@22) = null
+    packageFragments('kotlin.Int': FqName@22) = null
-    _packageFragments('kotlin.String': FqName@23) = null
+    packageFragments('kotlin.String': FqName@23) = null
-    _packageFragments('kotlin.URI': FqName@24) = null
+    packageFragments('kotlin.URI': FqName@24) = null
-    _packageFragments('kotlin.io': FqName@25) = null
+    packageFragments('kotlin.io': FqName@25) = null
-    _packageFragments('kotlin.it': FqName@26) = null
+    packageFragments('kotlin.it': FqName@26) = null
-    _packageFragments('kotlin.jvm': FqName@27) = null
+    packageFragments('kotlin.jvm': FqName@27) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    _functions('URI': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('Any': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    _functions('bar': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('Boolean': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    _functions('bar1': Name@32) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    _functions('bar2': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('String': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    _functions('equals': Name@34) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('URI': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    _functions('it': Name@35) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('bar': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    _functions('on': Name@36) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('bar1': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    _functions('plus': Name@37) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('bar2': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    _functions('to': Name@38) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('equals': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('Any': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('it': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('Boolean': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('on': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('Int': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('plus': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('String': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('to': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('URI': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('bar': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('URI': Name@33) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('bar1': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('bar': Name@34) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('bar2': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('bar1': Name@35) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('equals': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('bar2': Name@36) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('it': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('equals': Name@37) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('on': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('it': Name@44) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('plus': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('on': Name@39) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('to': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('plus': Name@40) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('to': Name@41) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@29
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@46) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('lang': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('lang': Name@48) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@47
     memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@47
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    _functions('URI': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('URI': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    _functions('bar': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('bar': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    _functions('bar1': Name@32) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('bar1': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    _functions('bar2': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('bar2': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    _functions('equals': Name@34) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('equals': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    _functions('it': Name@35) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('it': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    _functions('on': Name@36) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('on': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    _functions('plus': Name@37) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('plus': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    _functions('to': Name@38) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('to': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('URI': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('bar': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('URI': Name@33) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('bar1': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('bar': Name@34) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('bar2': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('bar1': Name@35) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('equals': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('bar2': Name@36) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('it': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('equals': Name@37) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('on': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('it': Name@44) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('plus': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('on': Name@39) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('to': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('plus': Name@40) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('to': Name@41) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
     memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@50
 }

compiler/testData/diagnostics/tests/Basic.lazy.log

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

compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.lazy.log

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

compiler/testData/diagnostics/tests/Bounds.lazy.log

@@ -8,96 +8,96 @@ DescriptorResolver@0 {
 }
 
 LazyJavaPackageFragmentProvider@7 {
-    _packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
+    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    _packageFragments('A': FqName@10) = null
+    packageFragments('A': FqName@10) = null
-    _packageFragments('Any': FqName@11) = null
+    packageFragments('Any': FqName@11) = null
-    _packageFragments('B': FqName@12) = null
+    packageFragments('B': FqName@12) = null
-    _packageFragments('C': FqName@13) = null
+    packageFragments('C': FqName@13) = null
-    _packageFragments('Char': FqName@14) = null
+    packageFragments('Char': FqName@14) = null
-    _packageFragments('Double': FqName@15) = null
+    packageFragments('Double': FqName@15) = null
-    _packageFragments('Int': FqName@16) = null
+    packageFragments('Int': FqName@16) = null
-    _packageFragments('Pair': FqName@17) = null
+    packageFragments('Pair': FqName@17) = null
-    _packageFragments('String': FqName@18) = null
+    packageFragments('String': FqName@18) = null
-    _packageFragments('Unit': FqName@19) = null
+    packageFragments('Unit': FqName@19) = null
-    _packageFragments('X': FqName@20) = null
+    packageFragments('X': FqName@20) = null
-    _packageFragments('boundsWithSubstitutors': FqName@21) = null
+    packageFragments('boundsWithSubstitutors': FqName@21) = null
-    _packageFragments('boundsWithSubstitutors.A': FqName@22) = null
+    packageFragments('boundsWithSubstitutors.A': FqName@22) = null
-    _packageFragments('boundsWithSubstitutors.Any': FqName@23) = null
+    packageFragments('boundsWithSubstitutors.Any': FqName@23) = null
-    _packageFragments('boundsWithSubstitutors.B': FqName@24) = null
+    packageFragments('boundsWithSubstitutors.B': FqName@24) = null
-    _packageFragments('boundsWithSubstitutors.C': FqName@25) = null
+    packageFragments('boundsWithSubstitutors.C': FqName@25) = null
-    _packageFragments('boundsWithSubstitutors.Int': FqName@26) = null
+    packageFragments('boundsWithSubstitutors.Int': FqName@26) = null
-    _packageFragments('boundsWithSubstitutors.String': FqName@27) = null
+    packageFragments('boundsWithSubstitutors.String': FqName@27) = null
-    _packageFragments('boundsWithSubstitutors.X': FqName@28) = null
+    packageFragments('boundsWithSubstitutors.X': FqName@28) = null
-    _packageFragments('boundsWithSubstitutors.a': FqName@29) = null
+    packageFragments('boundsWithSubstitutors.a': FqName@29) = null
-    _packageFragments('boundsWithSubstitutors.a1': FqName@30) = null
+    packageFragments('boundsWithSubstitutors.a1': FqName@30) = null
-    _packageFragments('boundsWithSubstitutors.b': FqName@31) = null
+    packageFragments('boundsWithSubstitutors.b': FqName@31) = null
-    _packageFragments('boundsWithSubstitutors.b0': FqName@32) = null
+    packageFragments('boundsWithSubstitutors.b0': FqName@32) = null
-    _packageFragments('boundsWithSubstitutors.b1': FqName@33) = null
+    packageFragments('boundsWithSubstitutors.b1': FqName@33) = null
-    _packageFragments('java': FqName@34) = LazyJavaPackageFragment@35['java']
+    packageFragments('java': FqName@34) = LazyJavaPackageFragment@35['java']
-    _packageFragments('java.lang': FqName@36) = LazyJavaPackageFragment@37['lang']
+    packageFragments('java.lang': FqName@36) = LazyJavaPackageFragment@37['lang']
-    _packageFragments('java.lang.A': FqName@38) = null
+    packageFragments('java.lang.A': FqName@38) = null
-    _packageFragments('java.lang.Any': FqName@39) = null
+    packageFragments('java.lang.Any': FqName@39) = null
-    _packageFragments('java.lang.B': FqName@40) = null
+    packageFragments('java.lang.B': FqName@40) = null
-    _packageFragments('java.lang.C': FqName@41) = null
+    packageFragments('java.lang.C': FqName@41) = null
-    _packageFragments('java.lang.Char': FqName@42) = null
+    packageFragments('java.lang.Char': FqName@42) = null
-    _packageFragments('java.lang.Double': FqName@43) = null
+    packageFragments('java.lang.Double': FqName@43) = null
-    _packageFragments('java.lang.Int': FqName@44) = null
+    packageFragments('java.lang.Int': FqName@44) = null
-    _packageFragments('java.lang.Pair': FqName@45) = null
+    packageFragments('java.lang.Pair': FqName@45) = null
-    _packageFragments('java.lang.String': FqName@46) = null
+    packageFragments('java.lang.String': FqName@46) = null
-    _packageFragments('java.lang.Unit': FqName@47) = null
+    packageFragments('java.lang.Unit': FqName@47) = null
-    _packageFragments('java.lang.X': FqName@48) = null
+    packageFragments('java.lang.X': FqName@48) = null
-    _packageFragments('kotlin': FqName@49) = null
+    packageFragments('kotlin': FqName@49) = null
-    _packageFragments('kotlin.A': FqName@50) = null
+    packageFragments('kotlin.A': FqName@50) = null
-    _packageFragments('kotlin.Any': FqName@51) = null
+    packageFragments('kotlin.Any': FqName@51) = null
-    _packageFragments('kotlin.B': FqName@52) = null
+    packageFragments('kotlin.B': FqName@52) = null
-    _packageFragments('kotlin.C': FqName@53) = null
+    packageFragments('kotlin.C': FqName@53) = null
-    _packageFragments('kotlin.Char': FqName@54) = null
+    packageFragments('kotlin.Char': FqName@54) = null
-    _packageFragments('kotlin.Double': FqName@55) = null
+    packageFragments('kotlin.Double': FqName@55) = null
-    _packageFragments('kotlin.Int': FqName@56) = null
+    packageFragments('kotlin.Int': FqName@56) = null
-    _packageFragments('kotlin.Pair': FqName@57) = null
+    packageFragments('kotlin.Pair': FqName@57) = null
-    _packageFragments('kotlin.String': FqName@58) = null
+    packageFragments('kotlin.String': FqName@58) = null
-    _packageFragments('kotlin.Unit': FqName@59) = null
+    packageFragments('kotlin.Unit': FqName@59) = null
-    _packageFragments('kotlin.X': FqName@60) = null
+    packageFragments('kotlin.X': FqName@60) = null
-    _packageFragments('kotlin.io': FqName@61) = null
+    packageFragments('kotlin.io': FqName@61) = null
-    _packageFragments('kotlin.jvm': FqName@62) = null
+    packageFragments('kotlin.jvm': FqName@62) = null
 }
 
 LazyJavaPackageFragment@9['<root>'] {
-    _functions('B': Name@63) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('Any': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    _functions('bar': Name@66) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('B': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    _functions('buzz': Name@67) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('Char': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    _functions('foo': Name@68) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('Double': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Any': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('Int': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('Unit': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Char': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('bar': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Double': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('buzz': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Int': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('foo': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Unit': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('bar': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('B': Name@65) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('buzz': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('bar': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('foo': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('buzz': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('foo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@65
+    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
 LazyJavaPackageFragment@35['java'] {
-    _functions('lang': Name@76) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('lang': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('lang': Name@78) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@77
     memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
 }
 
 LazyJavaPackageFragment@37['lang'] {
-    _functions('B': Name@63) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('B': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('X': Name@81) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('bar': Name@66) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('buzz': Name@67) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('foo': Name@68) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@80
     classes('X': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('bar': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('bar': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('buzz': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('buzz': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('foo': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('foo': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@80
+    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('B': Name@65) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('X': Name@81) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('bar': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('buzz': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('foo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
 }

compiler/testData/diagnostics/tests/BreakContinue.lazy.log

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

compiler/testData/diagnostics/tests/Casts.lazy.log

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

compiler/testData/diagnostics/tests/CharacterLiterals.lazy.log

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

compiler/testData/diagnostics/tests/CompareToWithErrorType.lazy.log

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

compiler/testData/diagnostics/tests/Constants.lazy.log

@@ -8,90 +8,90 @@ DescriptorResolver@0 {
 }
 
 LazyJavaPackageFragmentProvider@7 {
-    _packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
+    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    _packageFragments('Byte': FqName@10) = null
+    packageFragments('Byte': FqName@10) = null
-    _packageFragments('Double': FqName@11) = null
+    packageFragments('Double': FqName@11) = null
-    _packageFragments('Float': FqName@12) = null
+    packageFragments('Float': FqName@12) = null
-    _packageFragments('Int': FqName@13) = null
+    packageFragments('Int': FqName@13) = null
-    _packageFragments('Long': FqName@14) = null
+    packageFragments('Long': FqName@14) = null
-    _packageFragments('Short': FqName@15) = null
+    packageFragments('Short': FqName@15) = null
-    _packageFragments('T': FqName@16) = null
+    packageFragments('T': FqName@16) = null
-    _packageFragments('java': FqName@17) = LazyJavaPackageFragment@18['java']
+    packageFragments('java': FqName@17) = LazyJavaPackageFragment@18['java']
-    _packageFragments('java.lang': FqName@19) = LazyJavaPackageFragment@20['lang']
+    packageFragments('java.lang': FqName@19) = LazyJavaPackageFragment@20['lang']
-    _packageFragments('java.lang.Byte': FqName@21) = null
+    packageFragments('java.lang.Byte': FqName@21) = null
-    _packageFragments('java.lang.Double': FqName@22) = null
+    packageFragments('java.lang.Double': FqName@22) = null
-    _packageFragments('java.lang.Float': FqName@23) = null
+    packageFragments('java.lang.Float': FqName@23) = null
-    _packageFragments('java.lang.Int': FqName@24) = null
+    packageFragments('java.lang.Int': FqName@24) = null
-    _packageFragments('java.lang.Long': FqName@25) = null
+    packageFragments('java.lang.Long': FqName@25) = null
-    _packageFragments('java.lang.Short': FqName@26) = null
+    packageFragments('java.lang.Short': FqName@26) = null
-    _packageFragments('java.lang.T': FqName@27) = null
+    packageFragments('java.lang.T': FqName@27) = null
-    _packageFragments('kotlin': FqName@28) = null
+    packageFragments('kotlin': FqName@28) = null
-    _packageFragments('kotlin.Byte': FqName@29) = null
+    packageFragments('kotlin.Byte': FqName@29) = null
-    _packageFragments('kotlin.Double': FqName@30) = null
+    packageFragments('kotlin.Double': FqName@30) = null
-    _packageFragments('kotlin.Float': FqName@31) = null
+    packageFragments('kotlin.Float': FqName@31) = null
-    _packageFragments('kotlin.Int': FqName@32) = null
+    packageFragments('kotlin.Int': FqName@32) = null
-    _packageFragments('kotlin.Long': FqName@33) = null
+    packageFragments('kotlin.Long': FqName@33) = null
-    _packageFragments('kotlin.Short': FqName@34) = null
+    packageFragments('kotlin.Short': FqName@34) = null
-    _packageFragments('kotlin.T': FqName@35) = null
+    packageFragments('kotlin.T': FqName@35) = null
-    _packageFragments('kotlin.io': FqName@36) = null
+    packageFragments('kotlin.io': FqName@36) = null
-    _packageFragments('kotlin.jvm': FqName@37) = null
+    packageFragments('kotlin.jvm': FqName@37) = null
 }
 
 LazyJavaPackageFragment@9['<root>'] {
-    _functions('minus': Name@38) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('Byte': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('testFun': Name@41) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('Double': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('toFloat': Name@42) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('Float': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('varargByte': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('varargDouble': Name@44) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('Long': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('varargFloat': Name@45) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('Short': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('varargInt': Name@46) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('minus': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('varargLong': Name@47) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('testFun': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('varargShort': Name@48) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('toFloat': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Byte': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('varargByte': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Double': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('varargDouble': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Float': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('varargFloat': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Int': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('varargInt': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Long': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('varargLong': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Short': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('varargShort': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('minus': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('testFun': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('minus': Name@45) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('toFloat': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('testFun': Name@46) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('varargByte': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('toFloat': Name@47) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('varargDouble': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('varargByte': Name@48) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('varargFloat': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('varargDouble': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('varargInt': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('varargFloat': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('varargLong': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('varargInt': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('varargShort': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('varargLong': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('varargShort': Name@53) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@40
+    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@39
 }
 
 LazyJavaPackageFragment@18['java'] {
-    _functions('lang': Name@57) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('lang': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('lang': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('lang': Name@59) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@58
     memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@58
 }
 
 LazyJavaPackageFragment@20['lang'] {
-    _functions('minus': Name@38) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('minus': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    _functions('testFun': Name@41) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('testFun': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    _functions('toFloat': Name@42) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('toFloat': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    _functions('varargByte': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('varargByte': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    _functions('varargDouble': Name@44) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('varargDouble': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    _functions('varargFloat': Name@45) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('varargFloat': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    _functions('varargInt': Name@46) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('varargInt': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    _functions('varargLong': Name@47) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('varargLong': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    _functions('varargShort': Name@48) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('varargShort': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('minus': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('testFun': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('minus': Name@45) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('toFloat': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('testFun': Name@46) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('varargByte': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('toFloat': Name@47) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('varargDouble': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('varargByte': Name@48) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('varargFloat': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('varargDouble': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('varargInt': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('varargFloat': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('varargLong': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('varargInt': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('varargShort': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('varargLong': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('varargShort': Name@53) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
     memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@61
 }

compiler/testData/diagnostics/tests/Constructors.lazy.log

@@ -9,34 +9,34 @@ DescriptorResolver@0 {
 }
 
 LazyJavaPackageFragmentProvider@5 {
-    _packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
+    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    _packageFragments('Foo': FqName@8) = null
+    packageFragments('Foo': FqName@8) = null
-    _packageFragments('Int': FqName@9) = null
+    packageFragments('Int': FqName@9) = null
-    _packageFragments('NoC': FqName@10) = null
+    packageFragments('NoC': FqName@10) = null
-    _packageFragments('NoC1': FqName@11) = null
+    packageFragments('NoC1': FqName@11) = null
-    _packageFragments('NoC2': FqName@12) = null
+    packageFragments('NoC2': FqName@12) = null
-    _packageFragments('NoC3': FqName@13) = null
+    packageFragments('NoC3': FqName@13) = null
-    _packageFragments('NoCPI': FqName@14) = null
+    packageFragments('NoCPI': FqName@14) = null
-    _packageFragments('WithC0': FqName@15) = null
+    packageFragments('WithC0': FqName@15) = null
-    _packageFragments('WithC1': FqName@16) = null
+    packageFragments('WithC1': FqName@16) = null
-    _packageFragments('WithC2': FqName@17) = null
+    packageFragments('WithC2': FqName@17) = null
-    _packageFragments('WithCPI': FqName@18) = null
+    packageFragments('WithCPI': FqName@18) = null
-    _packageFragments('WithCPI_Dup': FqName@19) = null
+    packageFragments('WithCPI_Dup': FqName@19) = null
-    _packageFragments('WithPC0': FqName@20) = null
+    packageFragments('WithPC0': FqName@20) = null
-    _packageFragments('WithPC1': FqName@21) = null
+    packageFragments('WithPC1': FqName@21) = null
-    _packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
+    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    _packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
+    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    _packageFragments('java.lang.Int': FqName@26) = null
+    packageFragments('java.lang.Int': FqName@26) = null
-    _packageFragments('java.lang.NoC': FqName@27) = null
+    packageFragments('java.lang.NoC': FqName@27) = null
-    _packageFragments('java.lang.WithC1': FqName@28) = null
+    packageFragments('java.lang.WithC1': FqName@28) = null
-    _packageFragments('java.lang.WithPC0': FqName@29) = null
+    packageFragments('java.lang.WithPC0': FqName@29) = null
-    _packageFragments('kotlin': FqName@30) = null
+    packageFragments('kotlin': FqName@30) = null
-    _packageFragments('kotlin.Int': FqName@31) = null
+    packageFragments('kotlin.Int': FqName@31) = null
-    _packageFragments('kotlin.NoC': FqName@32) = null
+    packageFragments('kotlin.NoC': FqName@32) = null
-    _packageFragments('kotlin.WithC1': FqName@33) = null
+    packageFragments('kotlin.WithC1': FqName@33) = null
-    _packageFragments('kotlin.WithPC0': FqName@34) = null
+    packageFragments('kotlin.WithPC0': FqName@34) = null
-    _packageFragments('kotlin.io': FqName@35) = null
+    packageFragments('kotlin.io': FqName@35) = null
-    _packageFragments('kotlin.jvm': FqName@36) = null
+    packageFragments('kotlin.jvm': FqName@36) = null
 }
 
 LazyJavaPackageFragment@7['<root>'] {
@@ -46,10 +46,10 @@ LazyJavaPackageFragment@7['<root>'] {
 }
 
 LazyJavaPackageFragment@23['java'] {
-    _functions('lang': Name@41) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('lang': Name@43) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@42
 }
 
 LazyJavaPackageFragment@25['lang'] {

compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.lazy.log

@@ -1,34 +1,34 @@
 LazyJavaClassDescriptor@0['Boolean'] {
-    _functionTypeForSamInterface = null
+    functionTypeForSamInterface = null
 }
 
 LazyJavaClassDescriptor@1['Byte'] {
-    _functionTypeForSamInterface = null
+    functionTypeForSamInterface = null
 }
 
 LazyJavaClassDescriptor@2['Double'] {
-    _functionTypeForSamInterface = null
+    functionTypeForSamInterface = null
 }
 
 LazyJavaClassDescriptor@3['Float'] {
-    _functionTypeForSamInterface = null
+    functionTypeForSamInterface = null
 }
 
 LazyJavaClassDescriptor@4['Long'] {
-    _functionTypeForSamInterface = null
+    functionTypeForSamInterface = null
 }
 
 LazyJavaClassDescriptor@5['Short'] {
-    _functionTypeForSamInterface = null
+    functionTypeForSamInterface = null
 }
 
 LazyJavaPackageFragmentProvider@6 {
-    _packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
+    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    _packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
+    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    _packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
+    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    _packageFragments('kotlin': FqName@13) = null
+    packageFragments('kotlin': FqName@13) = null
-    _packageFragments('kotlin.io': FqName@14) = null
+    packageFragments('kotlin.io': FqName@14) = null
-    _packageFragments('kotlin.jvm': FqName@15) = null
+    packageFragments('kotlin.jvm': FqName@15) = null
     topLevelClasses(JavaClassImpl@16['Boolean']) = LazyJavaClassDescriptor@0['Boolean']
     topLevelClasses(JavaClassImpl@17['Byte']) = LazyJavaClassDescriptor@1['Byte']
     topLevelClasses(JavaClassImpl@18['Double']) = LazyJavaClassDescriptor@2['Double']
@@ -38,50 +38,50 @@ LazyJavaPackageFragmentProvider@6 {
 }
 
 LazyJavaPackageFragment@8['<root>'] {
-    _functions('Boolean': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Boolean': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('Byte': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Byte': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('Char': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Char': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('Double': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Double': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('Float': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Float': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('Int': Name@29) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('Long': Name@30) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Long': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('Short': Name@31) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Short': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Boolean': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Byte': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('Boolean': Name@22) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Char': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('Byte': Name@24) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Double': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('Char': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Float': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('Double': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('Float': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Long': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('Int': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Short': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('Long': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('Short': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@34) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    _functions('Boolean': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('Byte': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('Char': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('Double': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('Float': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('Int': Name@29) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('Long': Name@30) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('Short': Name@31) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
     classes('Boolean': Name@22) = LazyJavaClassDescriptor@0['Boolean'] // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Byte': Name@25) = LazyJavaClassDescriptor@1['Byte'] // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('Byte': Name@24) = LazyJavaClassDescriptor@1['Byte'] // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Char': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('Char': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Double': Name@27) = LazyJavaClassDescriptor@2['Double'] // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('Double': Name@26) = LazyJavaClassDescriptor@2['Double'] // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Float': Name@28) = LazyJavaClassDescriptor@3['Float'] // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('Float': Name@27) = LazyJavaClassDescriptor@3['Float'] // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Long': Name@30) = LazyJavaClassDescriptor@4['Long'] // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('Long': Name@29) = LazyJavaClassDescriptor@4['Long'] // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Short': Name@31) = LazyJavaClassDescriptor@5['Short'] // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('Short': Name@30) = LazyJavaClassDescriptor@5['Short'] // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('Boolean': Name@22) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('Byte': Name@24) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('Char': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('Double': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('Float': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('Int': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('Long': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('Short': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
     memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
 }

compiler/testData/diagnostics/tests/CovariantOverrideType.lazy.log

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

compiler/testData/diagnostics/tests/DefaultValuesTypechecking.lazy.log

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

compiler/testData/diagnostics/tests/DeferredTypes.lazy.log

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

compiler/testData/diagnostics/tests/DiamondFunction.lazy.log

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

compiler/testData/diagnostics/tests/DiamondFunctionGeneric.lazy.log

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

compiler/testData/diagnostics/tests/DiamondProperty.lazy.log

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

compiler/testData/diagnostics/tests/Dollar.lazy.log

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

compiler/testData/diagnostics/tests/FinalClassObjectBound.lazy.log

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

compiler/testData/diagnostics/tests/ForRangeConventions.lazy.log

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

compiler/testData/diagnostics/tests/FunctionCalleeExpressions.lazy.log

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

compiler/testData/diagnostics/tests/FunctionReturnTypes.lazy.log

@@ -7,199 +7,199 @@ DescriptorResolver@0 {
 }
 
 LazyJavaClassDescriptor@5['Exception'] {
-    _constructors = ArrayList@6[5] { JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], ... } // through LazyJavaClassMemberScope@10
+    constructors = ArrayList@6[5] { JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], ... } // through LazyJavaClassMemberScope@10
-    _functionTypeForSamInterface = null
+    defaultType = JetTypeImpl@11['Exception']
-    _typeConstructor = LazyJavaClassTypeConstructor@11['Exception']
+    functionTypeForSamInterface = null
-    defaultType = JetTypeImpl@12['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@12['Exception']
 }
 
 LazyJavaClassDescriptor@13['StringBuilder'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@14['StringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@14['StringBuilder']
 }
 
-LazyJavaClassTypeConstructor@11['Exception'] {
+LazyJavaClassTypeConstructor@12['Exception'] {
-    _parameters = ArrayList@15[empty]
+    parameters = ArrayList@15[empty]
-    _supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Throwable'] }
+    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Throwable'] }
 }
 
 LazyJavaClassTypeConstructor@14['StringBuilder'] {
-    _parameters = ArrayList@18[empty]
+    parameters = ArrayList@18[empty]
 }
 
 LazyJavaClassifierType@19['String'] {
-    _arguments = ArrayList@20[empty]
+    arguments = ArrayList@20[empty]
-    _nullable = 'false': Boolean@21
+    classifier = JavaClassImpl@21['String']
-    _typeConstructor = DeserializedClassTypeConstructor@22
+    nullable = 'false': Boolean@22
-    classifier = JavaClassImpl@23['String']
+    typeConstructor = DeserializedClassTypeConstructor@23
 }
 
 LazyJavaClassifierType@24['String'] {
-    _arguments = ArrayList@25[empty]
+    arguments = ArrayList@25[empty]
-    _nullable = 'false': Boolean@21
-    _typeConstructor = DeserializedClassTypeConstructor@22
     classifier = JavaClassImpl@26['String']
+    nullable = 'false': Boolean@22
+    typeConstructor = DeserializedClassTypeConstructor@23
 }
 
 LazyJavaClassifierType@27['String'] {
-    _arguments = ArrayList@28[empty]
+    arguments = ArrayList@28[empty]
-    _nullable = 'false': Boolean@21
-    _typeConstructor = DeserializedClassTypeConstructor@22
     classifier = JavaClassImpl@29['String']
+    nullable = 'false': Boolean@22
+    typeConstructor = DeserializedClassTypeConstructor@23
 }
 
 LazyJavaClassifierType@30['String'] {
-    _arguments = ArrayList@31[empty]
+    arguments = ArrayList@31[empty]
-    _nullable = 'true': Boolean@32
-    _typeConstructor = DeserializedClassTypeConstructor@22
     classifier = JavaClassImpl@29['String']
+    nullable = 'true': Boolean@32
+    typeConstructor = DeserializedClassTypeConstructor@23
 }
 
 LazyJavaClassifierType@33['String'] {
-    _arguments = ArrayList@34[empty]
+    arguments = ArrayList@34[empty]
-    _nullable = 'true': Boolean@32
+    classifier = JavaClassImpl@21['String']
-    _typeConstructor = DeserializedClassTypeConstructor@22
+    nullable = 'true': Boolean@32
-    classifier = JavaClassImpl@26['String']
+    typeConstructor = DeserializedClassTypeConstructor@23
 }
 
 LazyJavaClassifierType@35['String'] {
-    _arguments = ArrayList@36[empty]
+    arguments = ArrayList@36[empty]
-    _nullable = 'true': Boolean@32
+    classifier = JavaClassImpl@26['String']
-    _typeConstructor = DeserializedClassTypeConstructor@22
+    nullable = 'true': Boolean@32
-    classifier = JavaClassImpl@23['String']
+    typeConstructor = DeserializedClassTypeConstructor@23
 }
 
 LazyJavaClassifierType@37['Throwable'] {
-    _arguments = ArrayList@38[empty]
+    arguments = ArrayList@38[empty]
-    _nullable = 'false': Boolean@21
+    classifier = JavaClassImpl@39['Throwable']
-    _typeConstructor = DeserializedClassTypeConstructor@39
+    nullable = 'false': Boolean@22
-    classifier = JavaClassImpl@40['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@40
 }
 
 LazyJavaClassifierType@41['Throwable'] {
-    _arguments = ArrayList@42[empty]
+    arguments = ArrayList@42[empty]
-    _nullable = 'false': Boolean@21
-    _typeConstructor = DeserializedClassTypeConstructor@39
     classifier = JavaClassImpl@43['Throwable']
+    nullable = 'false': Boolean@22
+    typeConstructor = DeserializedClassTypeConstructor@40
 }
 
 LazyJavaClassifierType@44['Throwable'] {
-    _arguments = ArrayList@45[empty]
+    arguments = ArrayList@45[empty]
-    _nullable = 'false': Boolean@21
-    _typeConstructor = DeserializedClassTypeConstructor@39
     classifier = JavaClassImpl@46['Throwable']
+    nullable = 'false': Boolean@22
+    typeConstructor = DeserializedClassTypeConstructor@40
 }
 
 LazyJavaClassifierType@47['Throwable'] {
-    _arguments = ArrayList@48[empty]
+    arguments = ArrayList@48[empty]
-    _nullable = 'true': Boolean@32
-    _typeConstructor = DeserializedClassTypeConstructor@39
     classifier = JavaClassImpl@46['Throwable']
+    nullable = 'true': Boolean@32
+    typeConstructor = DeserializedClassTypeConstructor@40
 }
 
 LazyJavaClassifierType@49['Throwable'] {
-    _arguments = ArrayList@50[empty]
+    arguments = ArrayList@50[empty]
-    _nullable = 'true': Boolean@32
+    classifier = JavaClassImpl@39['Throwable']
-    _typeConstructor = DeserializedClassTypeConstructor@39
+    nullable = 'true': Boolean@32
-    classifier = JavaClassImpl@40['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@40
 }
 
 LazyJavaClassifierType@51['Throwable'] {
-    _arguments = ArrayList@52[empty]
+    arguments = ArrayList@52[empty]
-    _nullable = 'true': Boolean@32
-    _typeConstructor = DeserializedClassTypeConstructor@39
     classifier = JavaClassImpl@43['Throwable']
+    nullable = 'true': Boolean@32
+    typeConstructor = DeserializedClassTypeConstructor@40
 }
 
 LazyJavaClassifierType@17['Throwable'] {
-    _arguments = ArrayList@53[empty]
+    arguments = ArrayList@53[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@39
     classifier = JavaClassImpl@54['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@40
 }
 
 LazyJavaPackageFragmentProvider@55 {
-    _packageFragments('<root>': FqName@56) = LazyJavaPackageFragment@57['<root>']
+    packageFragments('<root>': FqName@56) = LazyJavaPackageFragment@57['<root>']
-    _packageFragments('A': FqName@58) = null
+    packageFragments('A': FqName@58) = null
-    _packageFragments('Any': FqName@59) = null
+    packageFragments('Any': FqName@59) = null
-    _packageFragments('B': FqName@60) = null
+    packageFragments('B': FqName@60) = null
-    _packageFragments('Boolean': FqName@61) = null
+    packageFragments('Boolean': FqName@61) = null
-    _packageFragments('Char': FqName@62) = null
+    packageFragments('Char': FqName@62) = null
-    _packageFragments('Int': FqName@63) = null
+    packageFragments('Int': FqName@63) = null
-    _packageFragments('Nothing': FqName@64) = null
+    packageFragments('Nothing': FqName@64) = null
-    _packageFragments('String': FqName@65) = null
+    packageFragments('String': FqName@65) = null
-    _packageFragments('StringBuilder': FqName@66) = null
+    packageFragments('StringBuilder': FqName@66) = null
-    _packageFragments('Unit': FqName@67) = null
+    packageFragments('Unit': FqName@67) = null
-    _packageFragments('a': FqName@68) = null
+    packageFragments('a': FqName@68) = null
-    _packageFragments('java': FqName@69) = LazyJavaPackageFragment@70['java']
+    packageFragments('java': FqName@69) = LazyJavaPackageFragment@70['java']
-    _packageFragments('java.lang': FqName@71) = LazyJavaPackageFragment@72['lang']
+    packageFragments('java.lang': FqName@71) = LazyJavaPackageFragment@72['lang']
-    _packageFragments('java.lang.Any': FqName@73) = null
+    packageFragments('java.lang.Any': FqName@73) = null
-    _packageFragments('java.lang.Boolean': FqName@74) = null
+    packageFragments('java.lang.Boolean': FqName@74) = null
-    _packageFragments('java.lang.Char': FqName@75) = null
+    packageFragments('java.lang.Char': FqName@75) = null
-    _packageFragments('java.lang.Int': FqName@76) = null
+    packageFragments('java.lang.Int': FqName@76) = null
-    _packageFragments('java.lang.Nothing': FqName@77) = null
+    packageFragments('java.lang.Nothing': FqName@77) = null
-    _packageFragments('java.lang.String': FqName@78) = null
+    packageFragments('java.lang.String': FqName@78) = null
-    _packageFragments('java.lang.StringBuilder': FqName@79) = null
+    packageFragments('java.lang.StringBuilder': FqName@79) = null
-    _packageFragments('java.lang.Unit': FqName@80) = null
+    packageFragments('java.lang.Unit': FqName@80) = null
-    _packageFragments('kotlin': FqName@81) = null
+    packageFragments('kotlin': FqName@81) = null
-    _packageFragments('kotlin.Any': FqName@82) = null
+    packageFragments('kotlin.Any': FqName@82) = null
-    _packageFragments('kotlin.Boolean': FqName@83) = null
+    packageFragments('kotlin.Boolean': FqName@83) = null
-    _packageFragments('kotlin.Char': FqName@84) = null
+    packageFragments('kotlin.Char': FqName@84) = null
-    _packageFragments('kotlin.Int': FqName@85) = null
+    packageFragments('kotlin.Int': FqName@85) = null
-    _packageFragments('kotlin.Nothing': FqName@86) = null
+    packageFragments('kotlin.Nothing': FqName@86) = null
-    _packageFragments('kotlin.String': FqName@87) = null
+    packageFragments('kotlin.String': FqName@87) = null
-    _packageFragments('kotlin.StringBuilder': FqName@88) = null
+    packageFragments('kotlin.StringBuilder': FqName@88) = null
-    _packageFragments('kotlin.Unit': FqName@89) = null
+    packageFragments('kotlin.Unit': FqName@89) = null
-    _packageFragments('kotlin.io': FqName@90) = null
+    packageFragments('kotlin.io': FqName@90) = null
-    _packageFragments('kotlin.jvm': FqName@91) = null
+    packageFragments('kotlin.jvm': FqName@91) = null
     topLevelClasses(JavaClassImpl@92['Exception']) = LazyJavaClassDescriptor@5['Exception']
     topLevelClasses(JavaClassImpl@93['StringBuilder']) = LazyJavaClassDescriptor@13['StringBuilder']
 }
 
 LazyJavaPackageFragment@57['<root>'] {
-    _functions('Exception': Name@94) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('Any': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('compareTo': Name@97) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('Boolean': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('plus': Name@98) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('Char': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('plusAssign': Name@99) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('Exception': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('returnNothing': Name@100) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('toChar': Name@101) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('Nothing': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Any': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('String': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Boolean': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('StringBuilder': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Char': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Exception': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('compareTo': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Int': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('plus': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Nothing': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('plusAssign': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('String': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('returnNothing': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('StringBuilder': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('toChar': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Unit': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('compareTo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('Exception': Name@98) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('plus': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('compareTo': Name@104) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('plusAssign': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('plus': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('returnNothing': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('plusAssign': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('toChar': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('returnNothing': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@110 // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('toChar': Name@108) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@96
+    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@95
 }
 
 LazyJavaPackageFragment@70['java'] {
-    _functions('lang': Name@112) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('lang': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('lang': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = Empty@110 // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('lang': Name@114) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@113
     memberIndex = computeMemberIndex$1@115 // through LazyPackageFragmentScopeForJavaPackage@113
 }
 
 LazyJavaPackageFragment@72['lang'] {
-    _functions('Exception': Name@94) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('Exception': Name@98) = LazyJavaClassDescriptor@5['Exception'] // through LazyPackageFragmentScopeForJavaPackage@116
-    _functions('compareTo': Name@97) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('StringBuilder': Name@102) = LazyJavaClassDescriptor@13['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@116
-    _functions('plus': Name@98) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('compareTo': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    _functions('plusAssign': Name@99) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('plus': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    _functions('returnNothing': Name@100) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('plusAssign': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    _functions('toChar': Name@101) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('returnNothing': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('Exception': Name@94) = LazyJavaClassDescriptor@5['Exception'] // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('toChar': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('StringBuilder': Name@108) = LazyJavaClassDescriptor@13['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@116
+    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('compareTo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('Exception': Name@98) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('plus': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('compareTo': Name@104) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('plusAssign': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('plus': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('returnNothing': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('plusAssign': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('toChar': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('returnNothing': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    deserializedPackageScope = Empty@110 // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('toChar': Name@108) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@116
     memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@116
 }

compiler/testData/diagnostics/tests/GenericArgumentConsistency.lazy.log

@@ -1,99 +1,99 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('A': FqName@3) = null
+    packageFragments('A': FqName@3) = null
-    _packageFragments('A1': FqName@4) = null
+    packageFragments('A1': FqName@4) = null
-    _packageFragments('AA1': FqName@5) = null
+    packageFragments('AA1': FqName@5) = null
-    _packageFragments('AB1': FqName@6) = null
+    packageFragments('AB1': FqName@6) = null
-    _packageFragments('AB3': FqName@7) = null
+    packageFragments('AB3': FqName@7) = null
-    _packageFragments('Any': FqName@8) = null
+    packageFragments('Any': FqName@8) = null
-    _packageFragments('B': FqName@9) = null
+    packageFragments('B': FqName@9) = null
-    _packageFragments('B1': FqName@10) = null
+    packageFragments('B1': FqName@10) = null
-    _packageFragments('B2': FqName@11) = null
+    packageFragments('B2': FqName@11) = null
-    _packageFragments('BA1': FqName@12) = null
+    packageFragments('BA1': FqName@12) = null
-    _packageFragments('BB1': FqName@13) = null
+    packageFragments('BB1': FqName@13) = null
-    _packageFragments('BB2': FqName@14) = null
+    packageFragments('BB2': FqName@14) = null
-    _packageFragments('Boolean': FqName@15) = null
+    packageFragments('Boolean': FqName@15) = null
-    _packageFragments('C': FqName@16) = null
+    packageFragments('C': FqName@16) = null
-    _packageFragments('C1': FqName@17) = null
+    packageFragments('C1': FqName@17) = null
-    _packageFragments('Comparable': FqName@18) = null
+    packageFragments('Comparable': FqName@18) = null
-    _packageFragments('D': FqName@19) = null
+    packageFragments('D': FqName@19) = null
-    _packageFragments('Double': FqName@20) = null
+    packageFragments('Double': FqName@20) = null
-    _packageFragments('Int': FqName@21) = null
+    packageFragments('Int': FqName@21) = null
-    _packageFragments('Number': FqName@22) = null
+    packageFragments('Number': FqName@22) = null
-    _packageFragments('T': FqName@23) = null
+    packageFragments('T': FqName@23) = null
-    _packageFragments('java': FqName@24) = LazyJavaPackageFragment@25['java']
+    packageFragments('java': FqName@24) = LazyJavaPackageFragment@25['java']
-    _packageFragments('java.lang': FqName@26) = LazyJavaPackageFragment@27['lang']
+    packageFragments('java.lang': FqName@26) = LazyJavaPackageFragment@27['lang']
-    _packageFragments('java.lang.A': FqName@28) = null
+    packageFragments('java.lang.A': FqName@28) = null
-    _packageFragments('java.lang.A1': FqName@29) = null
+    packageFragments('java.lang.A1': FqName@29) = null
-    _packageFragments('java.lang.AA1': FqName@30) = null
+    packageFragments('java.lang.AA1': FqName@30) = null
-    _packageFragments('java.lang.AB1': FqName@31) = null
+    packageFragments('java.lang.AB1': FqName@31) = null
-    _packageFragments('java.lang.AB3': FqName@32) = null
+    packageFragments('java.lang.AB3': FqName@32) = null
-    _packageFragments('java.lang.Any': FqName@33) = null
+    packageFragments('java.lang.Any': FqName@33) = null
-    _packageFragments('java.lang.B': FqName@34) = null
+    packageFragments('java.lang.B': FqName@34) = null
-    _packageFragments('java.lang.B1': FqName@35) = null
+    packageFragments('java.lang.B1': FqName@35) = null
-    _packageFragments('java.lang.BA1': FqName@36) = null
+    packageFragments('java.lang.BA1': FqName@36) = null
-    _packageFragments('java.lang.BB1': FqName@37) = null
+    packageFragments('java.lang.BB1': FqName@37) = null
-    _packageFragments('java.lang.Boolean': FqName@38) = null
+    packageFragments('java.lang.Boolean': FqName@38) = null
-    _packageFragments('java.lang.C': FqName@39) = null
+    packageFragments('java.lang.C': FqName@39) = null
-    _packageFragments('java.lang.Comparable': FqName@40) = null
+    packageFragments('java.lang.Comparable': FqName@40) = null
-    _packageFragments('java.lang.Double': FqName@41) = null
+    packageFragments('java.lang.Double': FqName@41) = null
-    _packageFragments('java.lang.Int': FqName@42) = null
+    packageFragments('java.lang.Int': FqName@42) = null
-    _packageFragments('java.lang.Number': FqName@43) = null
+    packageFragments('java.lang.Number': FqName@43) = null
-    _packageFragments('java.lang.T': FqName@44) = null
+    packageFragments('java.lang.T': FqName@44) = null
-    _packageFragments('kotlin': FqName@45) = null
+    packageFragments('kotlin': FqName@45) = null
-    _packageFragments('kotlin.A': FqName@46) = null
+    packageFragments('kotlin.A': FqName@46) = null
-    _packageFragments('kotlin.A1': FqName@47) = null
+    packageFragments('kotlin.A1': FqName@47) = null
-    _packageFragments('kotlin.AA1': FqName@48) = null
+    packageFragments('kotlin.AA1': FqName@48) = null
-    _packageFragments('kotlin.AB1': FqName@49) = null
+    packageFragments('kotlin.AB1': FqName@49) = null
-    _packageFragments('kotlin.AB3': FqName@50) = null
+    packageFragments('kotlin.AB3': FqName@50) = null
-    _packageFragments('kotlin.Any': FqName@51) = null
+    packageFragments('kotlin.Any': FqName@51) = null
-    _packageFragments('kotlin.B': FqName@52) = null
+    packageFragments('kotlin.B': FqName@52) = null
-    _packageFragments('kotlin.B1': FqName@53) = null
+    packageFragments('kotlin.B1': FqName@53) = null
-    _packageFragments('kotlin.BA1': FqName@54) = null
+    packageFragments('kotlin.BA1': FqName@54) = null
-    _packageFragments('kotlin.BB1': FqName@55) = null
+    packageFragments('kotlin.BB1': FqName@55) = null
-    _packageFragments('kotlin.Boolean': FqName@56) = null
+    packageFragments('kotlin.Boolean': FqName@56) = null
-    _packageFragments('kotlin.C': FqName@57) = null
+    packageFragments('kotlin.C': FqName@57) = null
-    _packageFragments('kotlin.Comparable': FqName@58) = null
+    packageFragments('kotlin.Comparable': FqName@58) = null
-    _packageFragments('kotlin.Double': FqName@59) = null
+    packageFragments('kotlin.Double': FqName@59) = null
-    _packageFragments('kotlin.Int': FqName@60) = null
+    packageFragments('kotlin.Int': FqName@60) = null
-    _packageFragments('kotlin.Number': FqName@61) = null
+    packageFragments('kotlin.Number': FqName@61) = null
-    _packageFragments('kotlin.T': FqName@62) = null
+    packageFragments('kotlin.T': FqName@62) = null
-    _packageFragments('kotlin.io': FqName@63) = null
+    packageFragments('kotlin.io': FqName@63) = null
-    _packageFragments('kotlin.jvm': FqName@64) = null
+    packageFragments('kotlin.jvm': FqName@64) = null
-    _packageFragments('sx2': FqName@65) = null
+    packageFragments('sx2': FqName@65) = null
-    _packageFragments('sx2.AA1': FqName@66) = null
+    packageFragments('sx2.AA1': FqName@66) = null
-    _packageFragments('sx2.AB1': FqName@67) = null
+    packageFragments('sx2.AB1': FqName@67) = null
-    _packageFragments('sx2.AB2': FqName@68) = null
+    packageFragments('sx2.AB2': FqName@68) = null
-    _packageFragments('sx2.AB3': FqName@69) = null
+    packageFragments('sx2.AB3': FqName@69) = null
-    _packageFragments('sx2.Comparable': FqName@70) = null
+    packageFragments('sx2.Comparable': FqName@70) = null
-    _packageFragments('sx2.Int': FqName@71) = null
+    packageFragments('sx2.Int': FqName@71) = null
-    _packageFragments('sx2.Number': FqName@72) = null
+    packageFragments('sx2.Number': FqName@72) = null
-    _packageFragments('x': FqName@73) = null
+    packageFragments('x': FqName@73) = null
-    _packageFragments('x.AA1': FqName@74) = null
+    packageFragments('x.AA1': FqName@74) = null
-    _packageFragments('x.AB1': FqName@75) = null
+    packageFragments('x.AB1': FqName@75) = null
-    _packageFragments('x.AB2': FqName@76) = null
+    packageFragments('x.AB2': FqName@76) = null
-    _packageFragments('x.AB3': FqName@77) = null
+    packageFragments('x.AB3': FqName@77) = null
-    _packageFragments('x.Comparable': FqName@78) = null
+    packageFragments('x.Comparable': FqName@78) = null
-    _packageFragments('x.Int': FqName@79) = null
+    packageFragments('x.Int': FqName@79) = null
-    _packageFragments('x.Number': FqName@80) = null
+    packageFragments('x.Number': FqName@80) = null
-    _packageFragments('x2': FqName@81) = null
+    packageFragments('x2': FqName@81) = null
-    _packageFragments('x2.AA1': FqName@82) = null
+    packageFragments('x2.AA1': FqName@82) = null
-    _packageFragments('x2.AB1': FqName@83) = null
+    packageFragments('x2.AB1': FqName@83) = null
-    _packageFragments('x2.AB2': FqName@84) = null
+    packageFragments('x2.AB2': FqName@84) = null
-    _packageFragments('x2.AB3': FqName@85) = null
+    packageFragments('x2.AB3': FqName@85) = null
-    _packageFragments('x2.Any': FqName@86) = null
+    packageFragments('x2.Any': FqName@86) = null
-    _packageFragments('x2.Comparable': FqName@87) = null
+    packageFragments('x2.Comparable': FqName@87) = null
-    _packageFragments('x2.Int': FqName@88) = null
+    packageFragments('x2.Int': FqName@88) = null
-    _packageFragments('x2.Number': FqName@89) = null
+    packageFragments('x2.Number': FqName@89) = null
-    _packageFragments('x3': FqName@90) = null
+    packageFragments('x3': FqName@90) = null
-    _packageFragments('x3.AA1': FqName@91) = null
+    packageFragments('x3.AA1': FqName@91) = null
-    _packageFragments('x3.AB1': FqName@92) = null
+    packageFragments('x3.AB1': FqName@92) = null
-    _packageFragments('x3.AB2': FqName@93) = null
+    packageFragments('x3.AB2': FqName@93) = null
-    _packageFragments('x3.AB3': FqName@94) = null
+    packageFragments('x3.AB3': FqName@94) = null
-    _packageFragments('x3.Any': FqName@95) = null
+    packageFragments('x3.Any': FqName@95) = null
-    _packageFragments('x3.Comparable': FqName@96) = null
+    packageFragments('x3.Comparable': FqName@96) = null
-    _packageFragments('x3.Int': FqName@97) = null
+    packageFragments('x3.Int': FqName@97) = null
-    _packageFragments('x3.Number': FqName@98) = null
+    packageFragments('x3.Number': FqName@98) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
@@ -104,8 +104,8 @@ LazyJavaPackageFragment@2['<root>'] {
 }
 
 LazyJavaPackageFragment@25['java'] {
-    _functions('lang': Name@104) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('lang': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('lang': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    deserializedPackageScope = Empty@106 // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@108 // through LazyPackageFragmentScopeForJavaPackage@106
+    functions('lang': Name@107) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@106
+    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@105
 }

compiler/testData/diagnostics/tests/GenericFunctionIsLessSpecific.lazy.log

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

compiler/testData/diagnostics/tests/IllegalModifiers.lazy.log

@@ -3,118 +3,118 @@ DescriptorResolver@0 {
 }
 
 LazyAnnotationDescriptor@2 {
-    _resolutionResults = OverloadResolutionResultsImpl@3
+    resolutionResults = OverloadResolutionResultsImpl@3
-    _type = JetTypeImpl@4['IllegalModifiers6']
+    type = JetTypeImpl@4['IllegalModifiers6']
 }
 
 LazyAnnotationDescriptor@5 {
-    _resolutionResults = OverloadResolutionResultsImpl@6
+    resolutionResults = OverloadResolutionResultsImpl@6
-    _type = JetTypeImpl@7['annotated']
+    type = JetTypeImpl@7['annotated']
-    _valueArguments(ValueParameterDescriptorImpl@8['text']) = StringValue@9
+    valueArguments(ValueParameterDescriptorImpl@8['text']) = StringValue@9
 }
 
 LazyAnnotationDescriptor@10 {
-    _resolutionResults = OverloadResolutionResultsImpl@11
+    resolutionResults = OverloadResolutionResultsImpl@11
-    _type = JetTypeImpl@12['annotated']
+    type = JetTypeImpl@12['annotated']
-    _valueArguments(ValueParameterDescriptorImpl@8['text']) = StringValue@13
+    valueArguments(ValueParameterDescriptorImpl@8['text']) = StringValue@13
 }
 
 LazyAnnotationDescriptor@14 {
-    _resolutionResults = OverloadResolutionResultsImpl@15
+    resolutionResults = OverloadResolutionResultsImpl@15
-    _type = JetTypeImpl@16['annotated']
+    type = JetTypeImpl@16['annotated']
-    _valueArguments(ValueParameterDescriptorImpl@8['text']) = StringValue@17
+    valueArguments(ValueParameterDescriptorImpl@8['text']) = StringValue@17
 }
 
 LazyAnnotationDescriptor@18 {
-    _resolutionResults = OverloadResolutionResultsImpl@19
+    resolutionResults = OverloadResolutionResultsImpl@19
-    _type = JetTypeImpl@20['annotated']
+    type = JetTypeImpl@20['annotated']
-    _valueArguments(ValueParameterDescriptorImpl@8['text']) = null
+    valueArguments(ValueParameterDescriptorImpl@8['text']) = null
 }
 
 LazyAnnotationDescriptor@21 {
-    _resolutionResults = OverloadResolutionResultsImpl@22
+    resolutionResults = OverloadResolutionResultsImpl@22
-    _type = JetTypeImpl@23['annotated']
+    type = JetTypeImpl@23['annotated']
-    _valueArguments(ValueParameterDescriptorImpl@8['text']) = null
+    valueArguments(ValueParameterDescriptorImpl@8['text']) = null
 }
 
 LazyAnnotationDescriptor@24 {
-    _resolutionResults = OverloadResolutionResultsImpl@25
+    resolutionResults = OverloadResolutionResultsImpl@25
-    _type = JetTypeImpl@26['annotated']
+    type = JetTypeImpl@26['annotated']
-    _valueArguments(ValueParameterDescriptorImpl@8['text']) = null
+    valueArguments(ValueParameterDescriptorImpl@8['text']) = null
 }
 
 LazyAnnotationDescriptor@27 {
-    _resolutionResults = OverloadResolutionResultsImpl@28
+    resolutionResults = OverloadResolutionResultsImpl@28
-    _type = JetTypeImpl@29['annotated']
+    type = JetTypeImpl@29['annotated']
-    _valueArguments(ValueParameterDescriptorImpl@8['text']) = null
+    valueArguments(ValueParameterDescriptorImpl@8['text']) = null
 }
 
 LazyJavaClassDescriptor@30['Exception'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@31['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@31['Exception']
 }
 
 LazyJavaClassTypeConstructor@31['Exception'] {
-    _parameters = ArrayList@32[empty]
+    parameters = ArrayList@32[empty]
-    _supertypes = ArrayList@33[1] { LazyJavaClassifierType@34['Throwable'] }
+    supertypes = ArrayList@33[1] { LazyJavaClassifierType@34['Throwable'] }
 }
 
 LazyJavaClassifierType@34['Throwable'] {
-    _arguments = ArrayList@35[empty]
+    arguments = ArrayList@35[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@36
+    classifier = JavaClassImpl@36['Throwable']
-    classifier = JavaClassImpl@37['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@37
 }
 
 LazyJavaPackageFragmentProvider@38 {
-    _packageFragments('<root>': FqName@39) = LazyJavaPackageFragment@40['<root>']
+    packageFragments('<root>': FqName@39) = LazyJavaPackageFragment@40['<root>']
-    _packageFragments('Exception': FqName@41) = null
+    packageFragments('Exception': FqName@41) = null
-    _packageFragments('IllegalModifiers6': FqName@42) = null
+    packageFragments('IllegalModifiers6': FqName@42) = null
-    _packageFragments('Int': FqName@43) = null
+    packageFragments('Int': FqName@43) = null
-    _packageFragments('String': FqName@44) = null
+    packageFragments('String': FqName@44) = null
-    _packageFragments('annotated': FqName@45) = null
+    packageFragments('annotated': FqName@45) = null
-    _packageFragments('illegal_modifiers': FqName@46) = null
+    packageFragments('illegal_modifiers': FqName@46) = null
-    _packageFragments('illegal_modifiers.A': FqName@47) = null
+    packageFragments('illegal_modifiers.A': FqName@47) = null
-    _packageFragments('illegal_modifiers.C': FqName@48) = null
+    packageFragments('illegal_modifiers.C': FqName@48) = null
-    _packageFragments('illegal_modifiers.D': FqName@49) = null
+    packageFragments('illegal_modifiers.D': FqName@49) = null
-    _packageFragments('illegal_modifiers.Exception': FqName@50) = null
+    packageFragments('illegal_modifiers.Exception': FqName@50) = null
-    _packageFragments('illegal_modifiers.FinalClass': FqName@51) = null
+    packageFragments('illegal_modifiers.FinalClass': FqName@51) = null
-    _packageFragments('illegal_modifiers.IllegalModifiers1': FqName@52) = null
+    packageFragments('illegal_modifiers.IllegalModifiers1': FqName@52) = null
-    _packageFragments('illegal_modifiers.IllegalModifiers2': FqName@53) = null
+    packageFragments('illegal_modifiers.IllegalModifiers2': FqName@53) = null
-    _packageFragments('illegal_modifiers.IllegalModifiers3': FqName@54) = null
+    packageFragments('illegal_modifiers.IllegalModifiers3': FqName@54) = null
-    _packageFragments('illegal_modifiers.IllegalModifiers4': FqName@55) = null
+    packageFragments('illegal_modifiers.IllegalModifiers4': FqName@55) = null
-    _packageFragments('illegal_modifiers.IllegalModifiers5': FqName@56) = null
+    packageFragments('illegal_modifiers.IllegalModifiers5': FqName@56) = null
-    _packageFragments('illegal_modifiers.IllegalModifiers6': FqName@57) = null
+    packageFragments('illegal_modifiers.IllegalModifiers6': FqName@57) = null
-    _packageFragments('illegal_modifiers.Int': FqName@58) = null
+    packageFragments('illegal_modifiers.Int': FqName@58) = null
-    _packageFragments('illegal_modifiers.LegalModifier': FqName@59) = null
+    packageFragments('illegal_modifiers.LegalModifier': FqName@59) = null
-    _packageFragments('illegal_modifiers.String': FqName@60) = null
+    packageFragments('illegal_modifiers.String': FqName@60) = null
-    _packageFragments('illegal_modifiers.T': FqName@61) = null
+    packageFragments('illegal_modifiers.T': FqName@61) = null
-    _packageFragments('illegal_modifiers.annotated': FqName@62) = null
+    packageFragments('illegal_modifiers.annotated': FqName@62) = null
-    _packageFragments('java': FqName@63) = LazyJavaPackageFragment@64['java']
+    packageFragments('java': FqName@63) = LazyJavaPackageFragment@64['java']
-    _packageFragments('java.lang': FqName@65) = LazyJavaPackageFragment@66['lang']
+    packageFragments('java.lang': FqName@65) = LazyJavaPackageFragment@66['lang']
-    _packageFragments('java.lang.Exception': FqName@67) = null
+    packageFragments('java.lang.Exception': FqName@67) = null
-    _packageFragments('java.lang.IllegalModifiers6': FqName@68) = null
+    packageFragments('java.lang.IllegalModifiers6': FqName@68) = null
-    _packageFragments('java.lang.Int': FqName@69) = null
+    packageFragments('java.lang.Int': FqName@69) = null
-    _packageFragments('java.lang.String': FqName@70) = null
+    packageFragments('java.lang.String': FqName@70) = null
-    _packageFragments('java.lang.annotated': FqName@71) = null
+    packageFragments('java.lang.annotated': FqName@71) = null
-    _packageFragments('kotlin': FqName@72) = null
+    packageFragments('kotlin': FqName@72) = null
-    _packageFragments('kotlin.Exception': FqName@73) = null
+    packageFragments('kotlin.Exception': FqName@73) = null
-    _packageFragments('kotlin.IllegalModifiers6': FqName@74) = null
+    packageFragments('kotlin.IllegalModifiers6': FqName@74) = null
-    _packageFragments('kotlin.Int': FqName@75) = null
+    packageFragments('kotlin.Int': FqName@75) = null
-    _packageFragments('kotlin.String': FqName@76) = null
+    packageFragments('kotlin.String': FqName@76) = null
-    _packageFragments('kotlin.annotated': FqName@77) = null
+    packageFragments('kotlin.annotated': FqName@77) = null
-    _packageFragments('kotlin.io': FqName@78) = null
+    packageFragments('kotlin.io': FqName@78) = null
-    _packageFragments('kotlin.jvm': FqName@79) = null
+    packageFragments('kotlin.jvm': FqName@79) = null
     topLevelClasses(JavaClassImpl@80['Exception']) = LazyJavaClassDescriptor@30['Exception']
 }
 
 LazyJavaPackageFragment@64['java'] {
-    _functions('lang': Name@81) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('lang': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('lang': Name@84) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@83
+    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@82
 }
 
 LazyJavaPackageFragment@66['lang'] {
     classes('Exception': Name@87) = LazyJavaClassDescriptor@30['Exception'] // through LazyPackageFragmentScopeForJavaPackage@88
     classes('i': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@88
+    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@88
 }

compiler/testData/diagnostics/tests/IncDec.lazy.log

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

compiler/testData/diagnostics/tests/IncorrectCharacterLiterals.lazy.log

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

compiler/testData/diagnostics/tests/InferNullabilityInThenBlock.lazy.log

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

compiler/testData/diagnostics/tests/IsExpressions.lazy.log

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

compiler/testData/diagnostics/tests/LValueAssignment.lazy.log

@@ -5,69 +5,58 @@ DescriptorResolver@0 {
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Ab': FqName@6) = null
+    packageFragments('Ab': FqName@6) = null
-    _packageFragments('Array': FqName@7) = null
+    packageFragments('Array': FqName@7) = null
-    _packageFragments('B': FqName@8) = null
+    packageFragments('B': FqName@8) = null
-    _packageFragments('C': FqName@9) = null
+    packageFragments('C': FqName@9) = null
-    _packageFragments('Int': FqName@10) = null
+    packageFragments('Int': FqName@10) = null
-    _packageFragments('String': FqName@11) = null
+    packageFragments('String': FqName@11) = null
-    _packageFragments('Unit': FqName@12) = null
+    packageFragments('Unit': FqName@12) = null
-    _packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
+    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    _packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
+    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    _packageFragments('java.lang.Ab': FqName@17) = null
+    packageFragments('java.lang.Ab': FqName@17) = null
-    _packageFragments('java.lang.Array': FqName@18) = null
+    packageFragments('java.lang.Array': FqName@18) = null
-    _packageFragments('java.lang.B': FqName@19) = null
+    packageFragments('java.lang.B': FqName@19) = null
-    _packageFragments('java.lang.C': FqName@20) = null
+    packageFragments('java.lang.C': FqName@20) = null
-    _packageFragments('java.lang.Int': FqName@21) = null
+    packageFragments('java.lang.Int': FqName@21) = null
-    _packageFragments('java.lang.String': FqName@22) = null
+    packageFragments('java.lang.String': FqName@22) = null
-    _packageFragments('java.lang.Unit': FqName@23) = null
+    packageFragments('java.lang.Unit': FqName@23) = null
-    _packageFragments('java.lang.z': FqName@24) = null
+    packageFragments('java.lang.z': FqName@24) = null
-    _packageFragments('kotlin': FqName@25) = null
+    packageFragments('kotlin': FqName@25) = null
-    _packageFragments('kotlin.Ab': FqName@26) = null
+    packageFragments('kotlin.Ab': FqName@26) = null
-    _packageFragments('kotlin.Array': FqName@27) = null
+    packageFragments('kotlin.Array': FqName@27) = null
-    _packageFragments('kotlin.B': FqName@28) = null
+    packageFragments('kotlin.B': FqName@28) = null
-    _packageFragments('kotlin.C': FqName@29) = null
+    packageFragments('kotlin.C': FqName@29) = null
-    _packageFragments('kotlin.Int': FqName@30) = null
+    packageFragments('kotlin.Int': FqName@30) = null
-    _packageFragments('kotlin.String': FqName@31) = null
+    packageFragments('kotlin.String': FqName@31) = null
-    _packageFragments('kotlin.Unit': FqName@32) = null
+    packageFragments('kotlin.Unit': FqName@32) = null
-    _packageFragments('kotlin.io': FqName@33) = null
+    packageFragments('kotlin.io': FqName@33) = null
-    _packageFragments('kotlin.jvm': FqName@34) = null
+    packageFragments('kotlin.jvm': FqName@34) = null
-    _packageFragments('kotlin.z': FqName@35) = null
+    packageFragments('kotlin.z': FqName@35) = null
-    _packageFragments('lvalue_assignment': FqName@36) = null
+    packageFragments('lvalue_assignment': FqName@36) = null
-    _packageFragments('lvalue_assignment.A': FqName@37) = null
+    packageFragments('lvalue_assignment.A': FqName@37) = null
-    _packageFragments('lvalue_assignment.Ab': FqName@38) = null
+    packageFragments('lvalue_assignment.Ab': FqName@38) = null
-    _packageFragments('lvalue_assignment.Array': FqName@39) = null
+    packageFragments('lvalue_assignment.Array': FqName@39) = null
-    _packageFragments('lvalue_assignment.B': FqName@40) = null
+    packageFragments('lvalue_assignment.B': FqName@40) = null
-    _packageFragments('lvalue_assignment.C': FqName@41) = null
+    packageFragments('lvalue_assignment.C': FqName@41) = null
-    _packageFragments('lvalue_assignment.D': FqName@42) = null
+    packageFragments('lvalue_assignment.D': FqName@42) = null
-    _packageFragments('lvalue_assignment.Int': FqName@43) = null
+    packageFragments('lvalue_assignment.Int': FqName@43) = null
-    _packageFragments('lvalue_assignment.String': FqName@44) = null
+    packageFragments('lvalue_assignment.String': FqName@44) = null
-    _packageFragments('lvalue_assignment.Test': FqName@45) = null
+    packageFragments('lvalue_assignment.Test': FqName@45) = null
-    _packageFragments('lvalue_assignment.Unit': FqName@46) = null
+    packageFragments('lvalue_assignment.Unit': FqName@46) = null
-    _packageFragments('lvalue_assignment.z': FqName@47) = null
+    packageFragments('lvalue_assignment.z': FqName@47) = null
-    _packageFragments('z': FqName@48) = null
+    packageFragments('z': FqName@48) = null
 }
 
 LazyJavaPackageFragment@14['java'] {
-    _functions('lang': Name@49) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('lang': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('lang': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('lang': Name@52) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@51
+    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@50
 }
 
 LazyJavaPackageFragment@16['lang'] {
-    _functions('A': Name@55) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    _functions('D': Name@57) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    _functions('foo': Name@58) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    _functions('get': Name@59) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    _functions('getArray': Name@60) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    _functions('getInt': Name@61) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    _functions('inc': Name@62) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    _functions('plus': Name@63) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    _functions('plusAssign': Name@64) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    _functions('set': Name@65) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    _functions('z': Name@66) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
     classes('A': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
     classes('D': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@56
     classes('foo': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@56
@@ -78,7 +67,18 @@ LazyJavaPackageFragment@16['lang'] {
     classes('plus': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@56
     classes('plusAssign': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@56
     classes('set': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('z': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('z': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@56
+    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('A': Name@55) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('D': Name@57) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('foo': Name@58) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('get': Name@59) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('getArray': Name@60) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('getInt': Name@61) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('inc': Name@62) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('plus': Name@63) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('plusAssign': Name@64) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('set': Name@65) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('z': Name@67) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
     memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@56
 }

compiler/testData/diagnostics/tests/MergePackagesWithJava.lazy.log

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

compiler/testData/diagnostics/tests/MultilineStringTemplates.lazy.log

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

compiler/testData/diagnostics/tests/MultipleBounds.lazy.log

@@ -6,82 +6,82 @@ DescriptorResolver@0 {
 }
 
 LazyJavaPackageFragmentProvider@5 {
-    _packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
+    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    _packageFragments('A': FqName@8) = null
+    packageFragments('A': FqName@8) = null
-    _packageFragments('B': FqName@9) = null
+    packageFragments('B': FqName@9) = null
-    _packageFragments('Bar': FqName@10) = null
+    packageFragments('Bar': FqName@10) = null
-    _packageFragments('C': FqName@11) = null
+    packageFragments('C': FqName@11) = null
-    _packageFragments('Double': FqName@12) = null
+    packageFragments('Double': FqName@12) = null
-    _packageFragments('Foo': FqName@13) = null
+    packageFragments('Foo': FqName@13) = null
-    _packageFragments('Int': FqName@14) = null
+    packageFragments('Int': FqName@14) = null
-    _packageFragments('Jet87': FqName@15) = null
+    packageFragments('Jet87': FqName@15) = null
-    _packageFragments('Jet87.A': FqName@16) = null
+    packageFragments('Jet87.A': FqName@16) = null
-    _packageFragments('Jet87.B': FqName@17) = null
+    packageFragments('Jet87.B': FqName@17) = null
-    _packageFragments('Jet87.Bar': FqName@18) = null
+    packageFragments('Jet87.Bar': FqName@18) = null
-    _packageFragments('Jet87.Buzz': FqName@19) = null
+    packageFragments('Jet87.Buzz': FqName@19) = null
-    _packageFragments('Jet87.C': FqName@20) = null
+    packageFragments('Jet87.C': FqName@20) = null
-    _packageFragments('Jet87.D': FqName@21) = null
+    packageFragments('Jet87.D': FqName@21) = null
-    _packageFragments('Jet87.Double': FqName@22) = null
+    packageFragments('Jet87.Double': FqName@22) = null
-    _packageFragments('Jet87.Foo': FqName@23) = null
+    packageFragments('Jet87.Foo': FqName@23) = null
-    _packageFragments('Jet87.Int': FqName@24) = null
+    packageFragments('Jet87.Int': FqName@24) = null
-    _packageFragments('Jet87.T': FqName@25) = null
+    packageFragments('Jet87.T': FqName@25) = null
-    _packageFragments('Jet87.Test': FqName@26) = null
+    packageFragments('Jet87.Test': FqName@26) = null
-    _packageFragments('Jet87.Test1': FqName@27) = null
+    packageFragments('Jet87.Test1': FqName@27) = null
-    _packageFragments('Jet87.X': FqName@28) = null
+    packageFragments('Jet87.X': FqName@28) = null
-    _packageFragments('Jet87.Y': FqName@29) = null
+    packageFragments('Jet87.Y': FqName@29) = null
-    _packageFragments('Jet87.nioho': FqName@30) = null
+    packageFragments('Jet87.nioho': FqName@30) = null
-    _packageFragments('Jet87.t1': FqName@31) = null
+    packageFragments('Jet87.t1': FqName@31) = null
-    _packageFragments('Jet87.t2': FqName@32) = null
+    packageFragments('Jet87.t2': FqName@32) = null
-    _packageFragments('Jet87.t3': FqName@33) = null
+    packageFragments('Jet87.t3': FqName@33) = null
-    _packageFragments('Jet87.x': FqName@34) = null
+    packageFragments('Jet87.x': FqName@34) = null
-    _packageFragments('T': FqName@35) = null
+    packageFragments('T': FqName@35) = null
-    _packageFragments('java': FqName@36) = LazyJavaPackageFragment@37['java']
+    packageFragments('java': FqName@36) = LazyJavaPackageFragment@37['java']
-    _packageFragments('java.lang': FqName@38) = LazyJavaPackageFragment@39['lang']
+    packageFragments('java.lang': FqName@38) = LazyJavaPackageFragment@39['lang']
-    _packageFragments('java.lang.A': FqName@40) = null
+    packageFragments('java.lang.A': FqName@40) = null
-    _packageFragments('java.lang.B': FqName@41) = null
+    packageFragments('java.lang.B': FqName@41) = null
-    _packageFragments('java.lang.Bar': FqName@42) = null
+    packageFragments('java.lang.Bar': FqName@42) = null
-    _packageFragments('java.lang.C': FqName@43) = null
+    packageFragments('java.lang.C': FqName@43) = null
-    _packageFragments('java.lang.Double': FqName@44) = null
+    packageFragments('java.lang.Double': FqName@44) = null
-    _packageFragments('java.lang.Foo': FqName@45) = null
+    packageFragments('java.lang.Foo': FqName@45) = null
-    _packageFragments('java.lang.Int': FqName@46) = null
+    packageFragments('java.lang.Int': FqName@46) = null
-    _packageFragments('java.lang.T': FqName@47) = null
+    packageFragments('java.lang.T': FqName@47) = null
-    _packageFragments('java.lang.nioho': FqName@48) = null
+    packageFragments('java.lang.nioho': FqName@48) = null
-    _packageFragments('kotlin': FqName@49) = null
+    packageFragments('kotlin': FqName@49) = null
-    _packageFragments('kotlin.A': FqName@50) = null
+    packageFragments('kotlin.A': FqName@50) = null
-    _packageFragments('kotlin.B': FqName@51) = null
+    packageFragments('kotlin.B': FqName@51) = null
-    _packageFragments('kotlin.Bar': FqName@52) = null
+    packageFragments('kotlin.Bar': FqName@52) = null
-    _packageFragments('kotlin.C': FqName@53) = null
+    packageFragments('kotlin.C': FqName@53) = null
-    _packageFragments('kotlin.Double': FqName@54) = null
+    packageFragments('kotlin.Double': FqName@54) = null
-    _packageFragments('kotlin.Foo': FqName@55) = null
+    packageFragments('kotlin.Foo': FqName@55) = null
-    _packageFragments('kotlin.Int': FqName@56) = null
+    packageFragments('kotlin.Int': FqName@56) = null
-    _packageFragments('kotlin.T': FqName@57) = null
+    packageFragments('kotlin.T': FqName@57) = null
-    _packageFragments('kotlin.io': FqName@58) = null
+    packageFragments('kotlin.io': FqName@58) = null
-    _packageFragments('kotlin.jvm': FqName@59) = null
+    packageFragments('kotlin.jvm': FqName@59) = null
-    _packageFragments('kotlin.nioho': FqName@60) = null
+    packageFragments('kotlin.nioho': FqName@60) = null
-    _packageFragments('nioho': FqName@61) = null
+    packageFragments('nioho': FqName@61) = null
 }
 
 LazyJavaPackageFragment@37['java'] {
-    _functions('lang': Name@62) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('lang': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('lang': Name@65) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@64
+    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@63
 }
 
 LazyJavaPackageFragment@39['lang'] {
-    _functions('A': Name@68) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    _functions('C': Name@70) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    _functions('Test1': Name@71) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    _functions('bar': Name@72) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    _functions('foo': Name@73) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    _functions('test2': Name@74) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@69
     classes('A': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
     classes('C': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@69
     classes('Test1': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
     classes('bar': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@69
     classes('foo': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('nioho': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('nioho': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('test2': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('test2': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@69
+    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('A': Name@68) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('C': Name@70) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('Test1': Name@71) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('bar': Name@72) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('foo': Name@73) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('test2': Name@75) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@69
     memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@69
 }

compiler/testData/diagnostics/tests/Nullability.lazy.log

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

compiler/testData/diagnostics/tests/OverrideFunctionWithParamDefaultValue.lazy.log

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

compiler/testData/diagnostics/tests/OverridenFunctionAndSpecifiedTypeParameter.lazy.log

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

compiler/testData/diagnostics/tests/OverridingVarByVal.lazy.log

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

compiler/testData/diagnostics/tests/PackageAsExpression.lazy.log

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

compiler/testData/diagnostics/tests/PackageInExpressionPosition.lazy.log

@@ -12,72 +12,72 @@ DescriptorResolver@0 {
 }
 
 LazyJavaClassDescriptor@10['System'] {
-    _constructors = ArrayList@11[1] { JavaConstructorDescriptor@12['<init>'] } // through LazyJavaClassMemberScope@13
+    constructors = ArrayList@11[1] { JavaConstructorDescriptor@12['<init>'] } // through LazyJavaClassMemberScope@13
-    _functionTypeForSamInterface = null
+    defaultType = JetTypeImpl@14['System']
-    _typeConstructor = LazyJavaClassTypeConstructor@14['System']
+    functionTypeForSamInterface = null
-    defaultType = JetTypeImpl@15['System']
+    typeConstructor = LazyJavaClassTypeConstructor@15['System']
 }
 
-LazyJavaClassTypeConstructor@14['System'] {
+LazyJavaClassTypeConstructor@15['System'] {
-    _parameters = ArrayList@16[empty]
+    parameters = ArrayList@16[empty]
 }
 
 LazyJavaPackageFragmentProvider@17 {
-    _packageFragments('<root>': FqName@18) = LazyJavaPackageFragment@19['<root>']
+    packageFragments('<root>': FqName@18) = LazyJavaPackageFragment@19['<root>']
-    _packageFragments('Array': FqName@20) = null
+    packageFragments('Array': FqName@20) = null
-    _packageFragments('Int': FqName@21) = null
+    packageFragments('Int': FqName@21) = null
-    _packageFragments('String': FqName@22) = null
+    packageFragments('String': FqName@22) = null
-    _packageFragments('System': FqName@23) = null
+    packageFragments('System': FqName@23) = null
-    _packageFragments('X': FqName@24) = null
+    packageFragments('X': FqName@24) = null
-    _packageFragments('foo': FqName@25) = null
+    packageFragments('foo': FqName@25) = null
-    _packageFragments('foo.Array': FqName@26) = null
+    packageFragments('foo.Array': FqName@26) = null
-    _packageFragments('foo.Int': FqName@27) = null
+    packageFragments('foo.Int': FqName@27) = null
-    _packageFragments('foo.String': FqName@28) = null
+    packageFragments('foo.String': FqName@28) = null
-    _packageFragments('foo.System': FqName@29) = null
+    packageFragments('foo.System': FqName@29) = null
-    _packageFragments('foo.X': FqName@30) = null
+    packageFragments('foo.X': FqName@30) = null
-    _packageFragments('foo.f': FqName@31) = null
+    packageFragments('foo.f': FqName@31) = null
-    _packageFragments('foo.foo': FqName@32) = null
+    packageFragments('foo.foo': FqName@32) = null
-    _packageFragments('foo.java': FqName@33) = null
+    packageFragments('foo.java': FqName@33) = null
-    _packageFragments('foo.s': FqName@34) = null
+    packageFragments('foo.s': FqName@34) = null
-    _packageFragments('foo.ss': FqName@35) = null
+    packageFragments('foo.ss': FqName@35) = null
-    _packageFragments('foo.sss': FqName@36) = null
+    packageFragments('foo.sss': FqName@36) = null
-    _packageFragments('foo.x': FqName@37) = null
+    packageFragments('foo.x': FqName@37) = null
-    _packageFragments('foo.xs': FqName@38) = null
+    packageFragments('foo.xs': FqName@38) = null
-    _packageFragments('foo.xss': FqName@39) = null
+    packageFragments('foo.xss': FqName@39) = null
-    _packageFragments('foo.xsss': FqName@40) = null
+    packageFragments('foo.xsss': FqName@40) = null
-    _packageFragments('foo.xssss': FqName@41) = null
+    packageFragments('foo.xssss': FqName@41) = null
-    _packageFragments('java': FqName@42) = LazyJavaPackageFragment@43['java']
+    packageFragments('java': FqName@42) = LazyJavaPackageFragment@43['java']
-    _packageFragments('java.lang': FqName@44) = LazyJavaPackageFragment@45['lang']
+    packageFragments('java.lang': FqName@44) = LazyJavaPackageFragment@45['lang']
-    _packageFragments('java.lang.Array': FqName@46) = null
+    packageFragments('java.lang.Array': FqName@46) = null
-    _packageFragments('java.lang.Int': FqName@47) = null
+    packageFragments('java.lang.Int': FqName@47) = null
-    _packageFragments('java.lang.String': FqName@48) = null
+    packageFragments('java.lang.String': FqName@48) = null
-    _packageFragments('java.lang.System': FqName@49) = null
+    packageFragments('java.lang.System': FqName@49) = null
-    _packageFragments('java.lang.X': FqName@50) = null
+    packageFragments('java.lang.X': FqName@50) = null
-    _packageFragments('kotlin': FqName@51) = null
+    packageFragments('kotlin': FqName@51) = null
-    _packageFragments('kotlin.Array': FqName@52) = null
+    packageFragments('kotlin.Array': FqName@52) = null
-    _packageFragments('kotlin.Int': FqName@53) = null
+    packageFragments('kotlin.Int': FqName@53) = null
-    _packageFragments('kotlin.String': FqName@54) = null
+    packageFragments('kotlin.String': FqName@54) = null
-    _packageFragments('kotlin.System': FqName@55) = null
+    packageFragments('kotlin.System': FqName@55) = null
-    _packageFragments('kotlin.X': FqName@56) = null
+    packageFragments('kotlin.X': FqName@56) = null
-    _packageFragments('kotlin.io': FqName@57) = null
+    packageFragments('kotlin.io': FqName@57) = null
-    _packageFragments('kotlin.jvm': FqName@58) = null
+    packageFragments('kotlin.jvm': FqName@58) = null
     topLevelClasses(JavaClassImpl@59['System']) = LazyJavaClassDescriptor@10['System']
 }
 
 LazyJavaPackageFragment@43['java'] {
-    _functions('lang': Name@60) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('lang': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('lang': Name@63) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@62
+    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@61
 }
 
 LazyJavaPackageFragment@45['lang'] {
-    _functions('System': Name@66) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('System': Name@66) = LazyJavaClassDescriptor@10['System'] // through LazyPackageFragmentScopeForJavaPackage@67
-    _functions('contains': Name@68) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('System': Name@69) = LazyJavaClassDescriptor@10['System'] // through LazyPackageFragmentScopeForJavaPackage@67
     classes('contains': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('foo': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('foo': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('java': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('java': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@67
+    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('System': Name@71) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('contains': Name@68) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@67
     memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@67
 }

compiler/testData/diagnostics/tests/PackageQualified.lazy.log

@@ -12,128 +12,128 @@ DescriptorResolver@0 {
 }
 
 LazyJavaClassDescriptor@7['List'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@8['List']
+    typeConstructor = LazyJavaClassTypeConstructor@8['List']
 }
 
 LazyJavaClassTypeConstructor@8['List'] {
-    _parameters = ArrayList@9[1] { LazyJavaTypeParameterDescriptor@10['E'] }
+    parameters = ArrayList@9[1] { LazyJavaTypeParameterDescriptor@10['E'] }
-    _supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Collection<E>'] }
+    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Collection<E>'] }
 }
 
 LazyJavaClassifierType@12['Collection<E>'] {
-    _typeConstructor = DeserializedClassTypeConstructor@13
+    classifier = JavaClassImpl@13['Collection']
-    classifier = JavaClassImpl@14['Collection']
+    typeConstructor = DeserializedClassTypeConstructor@14
 }
 
 LazyJavaPackageFragmentProvider@15 {
-    _packageFragments('<root>': FqName@16) = LazyJavaPackageFragment@17['<root>']
+    packageFragments('<root>': FqName@16) = LazyJavaPackageFragment@17['<root>']
-    _packageFragments('Any': FqName@18) = null
+    packageFragments('Any': FqName@18) = null
-    _packageFragments('ArrayList': FqName@19) = null
+    packageFragments('ArrayList': FqName@19) = null
-    _packageFragments('Boolean': FqName@20) = null
+    packageFragments('Boolean': FqName@20) = null
-    _packageFragments('E': FqName@21) = null
+    packageFragments('E': FqName@21) = null
-    _packageFragments('I': FqName@22) = null
+    packageFragments('I': FqName@22) = null
-    _packageFragments('Int': FqName@23) = null
+    packageFragments('Int': FqName@23) = null
-    _packageFragments('Iterable': FqName@24) = null
+    packageFragments('Iterable': FqName@24) = null
-    _packageFragments('Iteratee': FqName@25) = null
+    packageFragments('Iteratee': FqName@25) = null
-    _packageFragments('List': FqName@26) = null
+    packageFragments('List': FqName@26) = null
-    _packageFragments('O': FqName@27) = null
+    packageFragments('O': FqName@27) = null
-    _packageFragments('T': FqName@28) = null
+    packageFragments('T': FqName@28) = null
-    _packageFragments('foobar': FqName@29) = null
+    packageFragments('foobar': FqName@29) = null
-    _packageFragments('foobar.Any': FqName@30) = null
+    packageFragments('foobar.Any': FqName@30) = null
-    _packageFragments('foobar.Boolean': FqName@31) = null
+    packageFragments('foobar.Boolean': FqName@31) = null
-    _packageFragments('foobar.Collection': FqName@32) = null
+    packageFragments('foobar.Collection': FqName@32) = null
-    _packageFragments('foobar.E': FqName@33) = null
+    packageFragments('foobar.E': FqName@33) = null
-    _packageFragments('foobar.Foo': FqName@34) = null
+    packageFragments('foobar.Foo': FqName@34) = null
-    _packageFragments('foobar.I': FqName@35) = null
+    packageFragments('foobar.I': FqName@35) = null
-    _packageFragments('foobar.Int': FqName@36) = null
+    packageFragments('foobar.Int': FqName@36) = null
-    _packageFragments('foobar.Iterable': FqName@37) = null
+    packageFragments('foobar.Iterable': FqName@37) = null
-    _packageFragments('foobar.Iteratee': FqName@38) = null
+    packageFragments('foobar.Iteratee': FqName@38) = null
-    _packageFragments('foobar.O': FqName@39) = null
+    packageFragments('foobar.O': FqName@39) = null
-    _packageFragments('foobar.StrangeIterateeImpl': FqName@40) = null
+    packageFragments('foobar.StrangeIterateeImpl': FqName@40) = null
-    _packageFragments('foobar.Sum': FqName@41) = null
+    packageFragments('foobar.Sum': FqName@41) = null
-    _packageFragments('foobar.T': FqName@42) = null
+    packageFragments('foobar.T': FqName@42) = null
-    _packageFragments('foobar.a': FqName@43) = null
+    packageFragments('foobar.a': FqName@43) = null
-    _packageFragments('foobar.a.ArrayList': FqName@44) = null
+    packageFragments('foobar.a.ArrayList': FqName@44) = null
-    _packageFragments('foobar.a.Int': FqName@45) = null
+    packageFragments('foobar.a.Int': FqName@45) = null
-    _packageFragments('foobar.a.List': FqName@46) = null
+    packageFragments('foobar.a.List': FqName@46) = null
-    _packageFragments('foobar.a.a': FqName@47) = null
+    packageFragments('foobar.a.a': FqName@47) = null
-    _packageFragments('foobar.a.a1': FqName@48) = null
+    packageFragments('foobar.a.a1': FqName@48) = null
-    _packageFragments('foobar.a.b': FqName@49) = null
+    packageFragments('foobar.a.b': FqName@49) = null
-    _packageFragments('foobar.a.b1': FqName@50) = null
+    packageFragments('foobar.a.b1': FqName@50) = null
-    _packageFragments('foobar.a.util': FqName@51) = null
+    packageFragments('foobar.a.util': FqName@51) = null
-    _packageFragments('foobar.foobar': FqName@52) = null
+    packageFragments('foobar.foobar': FqName@52) = null
-    _packageFragments('foobar.x1': FqName@53) = null
+    packageFragments('foobar.x1': FqName@53) = null
-    _packageFragments('foobar.y1': FqName@54) = null
+    packageFragments('foobar.y1': FqName@54) = null
-    _packageFragments('java': FqName@55) = LazyJavaPackageFragment@56['java']
+    packageFragments('java': FqName@55) = LazyJavaPackageFragment@56['java']
-    _packageFragments('java.ArrayList': FqName@57) = null
+    packageFragments('java.ArrayList': FqName@57) = null
-    _packageFragments('java.Int': FqName@58) = null
+    packageFragments('java.Int': FqName@58) = null
-    _packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
+    packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
-    _packageFragments('java.lang.Any': FqName@61) = null
+    packageFragments('java.lang.Any': FqName@61) = null
-    _packageFragments('java.lang.ArrayList': FqName@62) = null
+    packageFragments('java.lang.ArrayList': FqName@62) = null
-    _packageFragments('java.lang.Boolean': FqName@63) = null
+    packageFragments('java.lang.Boolean': FqName@63) = null
-    _packageFragments('java.lang.E': FqName@64) = null
+    packageFragments('java.lang.E': FqName@64) = null
-    _packageFragments('java.lang.I': FqName@65) = null
+    packageFragments('java.lang.I': FqName@65) = null
-    _packageFragments('java.lang.Int': FqName@66) = null
+    packageFragments('java.lang.Int': FqName@66) = null
-    _packageFragments('java.lang.Iterable': FqName@67) = null
+    packageFragments('java.lang.Iterable': FqName@67) = null
-    _packageFragments('java.lang.Iteratee': FqName@68) = null
+    packageFragments('java.lang.Iteratee': FqName@68) = null
-    _packageFragments('java.lang.List': FqName@69) = null
+    packageFragments('java.lang.List': FqName@69) = null
-    _packageFragments('java.lang.O': FqName@70) = null
+    packageFragments('java.lang.O': FqName@70) = null
-    _packageFragments('java.lang.T': FqName@71) = null
+    packageFragments('java.lang.T': FqName@71) = null
-    _packageFragments('java.lang.util': FqName@72) = null
+    packageFragments('java.lang.util': FqName@72) = null
-    _packageFragments('java.util': FqName@73) = LazyJavaPackageFragment@74['util']
+    packageFragments('java.util': FqName@73) = LazyJavaPackageFragment@74['util']
-    _packageFragments('java.util.Int': FqName@75) = null
+    packageFragments('java.util.Int': FqName@75) = null
-    _packageFragments('java.util.List': FqName@76) = null
+    packageFragments('java.util.List': FqName@76) = null
-    _packageFragments('java.util.util': FqName@77) = null
+    packageFragments('java.util.util': FqName@77) = null
-    _packageFragments('kotlin': FqName@78) = null
+    packageFragments('kotlin': FqName@78) = null
-    _packageFragments('kotlin.Any': FqName@79) = null
+    packageFragments('kotlin.Any': FqName@79) = null
-    _packageFragments('kotlin.ArrayList': FqName@80) = null
+    packageFragments('kotlin.ArrayList': FqName@80) = null
-    _packageFragments('kotlin.Boolean': FqName@81) = null
+    packageFragments('kotlin.Boolean': FqName@81) = null
-    _packageFragments('kotlin.E': FqName@82) = null
+    packageFragments('kotlin.E': FqName@82) = null
-    _packageFragments('kotlin.I': FqName@83) = null
+    packageFragments('kotlin.I': FqName@83) = null
-    _packageFragments('kotlin.Int': FqName@84) = null
+    packageFragments('kotlin.Int': FqName@84) = null
-    _packageFragments('kotlin.Iterable': FqName@85) = null
+    packageFragments('kotlin.Iterable': FqName@85) = null
-    _packageFragments('kotlin.Iteratee': FqName@86) = null
+    packageFragments('kotlin.Iteratee': FqName@86) = null
-    _packageFragments('kotlin.List': FqName@87) = null
+    packageFragments('kotlin.List': FqName@87) = null
-    _packageFragments('kotlin.O': FqName@88) = null
+    packageFragments('kotlin.O': FqName@88) = null
-    _packageFragments('kotlin.T': FqName@89) = null
+    packageFragments('kotlin.T': FqName@89) = null
-    _packageFragments('kotlin.io': FqName@90) = null
+    packageFragments('kotlin.io': FqName@90) = null
-    _packageFragments('kotlin.jvm': FqName@91) = null
+    packageFragments('kotlin.jvm': FqName@91) = null
-    _packageFragments('kotlin.util': FqName@92) = null
+    packageFragments('kotlin.util': FqName@92) = null
-    _packageFragments('util': FqName@93) = null
+    packageFragments('util': FqName@93) = null
     topLevelClasses(JavaClassImpl@94['List']) = LazyJavaClassDescriptor@7['List']
 }
 
 LazyJavaPackageFragment@56['java'] {
-    _functions('lang': Name@95) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('ArrayList': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    _functions('util': Name@98) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('Int': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('ArrayList': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('Int': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('util': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('lang': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    deserializedPackageScope = Empty@100 // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('util': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    functions('lang': Name@101) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@97
+    functions('util': Name@103) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@97
+    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
 LazyJavaPackageFragment@60['lang'] {
-    _functions('StrangeIterateeImpl': Name@105) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('ArrayList': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    _functions('done': Name@107) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('StrangeIterateeImpl': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    _functions('hasNext': Name@108) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('a': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    _functions('iterator': Name@109) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('done': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    _functions('next': Name@110) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('foobar': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    _functions('process': Name@111) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('hasNext': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('ArrayList': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('iterator': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('StrangeIterateeImpl': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('next': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('a': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('obj': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('done': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('process': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('foobar': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('util': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('hasNext': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    deserializedPackageScope = Empty@100 // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('iterator': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    functions('StrangeIterateeImpl': Name@106) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('next': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    functions('done': Name@108) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('obj': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    functions('hasNext': Name@110) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('process': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    functions('iterator': Name@111) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('util': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    functions('next': Name@112) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@106
+    functions('process': Name@114) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@106
+    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@105
 }
 
 LazyJavaPackageFragment@74['util'] {
@@ -141,7 +141,7 @@ LazyJavaPackageFragment@74['util'] {
     classes('List': Name@119) = LazyJavaClassDescriptor@7['List'] // through LazyPackageFragmentScopeForJavaPackage@118
     classes('a': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@118
     classes('util': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@118
+    deserializedPackageScope = Empty@100 // through LazyPackageFragmentScopeForJavaPackage@118
 }
 
 LazyJavaTypeParameterDescriptor@10['E'] {

compiler/testData/diagnostics/tests/PrimaryConstructors.lazy.log

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

compiler/testData/diagnostics/tests/ProcessingEmptyImport.lazy.log

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

compiler/testData/diagnostics/tests/ProjectionOnFunctionArgumentErrror.lazy.log

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

compiler/testData/diagnostics/tests/ProjectionsInSupertypes.lazy.log

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

compiler/testData/diagnostics/tests/Properties.lazy.log

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

compiler/testData/diagnostics/tests/PropertyInitializers.lazy.log

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

compiler/testData/diagnostics/tests/QualifiedExpressions.lazy.log

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