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('A': FqName@6) = null
-    _packageFragments('Int': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('kotlin': FqName@13) = null
-    _packageFragments('kotlin.Int': FqName@14) = null
-    _packageFragments('kotlin.io': FqName@15) = null
-    _packageFragments('kotlin.jvm': FqName@16) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('A': FqName@6) = null
+    packageFragments('Int': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('kotlin': FqName@13) = null
+    packageFragments('kotlin.Int': FqName@14) = null
+    packageFragments('kotlin.io': FqName@15) = null
+    packageFragments('kotlin.jvm': FqName@16) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('A': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    _functions('equals': Name@20) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    _functions('invoke': Name@21) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@19
+    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('A': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('equals': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('invoke': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@25) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@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('A': FqName@6) = null
-    _packageFragments('B': FqName@7) = null
-    _packageFragments('Int': FqName@8) = null
-    _packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    _packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    _packageFragments('java.lang.B': FqName@13) = null
-    _packageFragments('java.lang.Int': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.B': FqName@16) = null
-    _packageFragments('kotlin.Int': FqName@17) = null
-    _packageFragments('kotlin.io': FqName@18) = null
-    _packageFragments('kotlin.jvm': FqName@19) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('A': FqName@6) = null
+    packageFragments('B': FqName@7) = null
+    packageFragments('Int': FqName@8) = null
+    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
+    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
+    packageFragments('java.lang.B': FqName@13) = null
+    packageFragments('java.lang.Int': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.B': FqName@16) = null
+    packageFragments('kotlin.Int': FqName@17) = null
+    packageFragments('kotlin.io': FqName@18) = null
+    packageFragments('kotlin.jvm': FqName@19) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('A': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    _functions('equals': Name@23) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    _functions('invoke': Name@24) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('A': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('A': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('A': Name@20) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('equals': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('invoke': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@21
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@28) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@25 // 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('A': FqName@6) = null
-    _packageFragments('Int': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.A': FqName@12) = null
-    _packageFragments('java.lang.Int': FqName@13) = null
-    _packageFragments('kotlin': FqName@14) = null
-    _packageFragments('kotlin.A': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.io': FqName@17) = null
-    _packageFragments('kotlin.jvm': FqName@18) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('A': FqName@6) = null
+    packageFragments('Int': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.A': FqName@12) = null
+    packageFragments('java.lang.Int': FqName@13) = null
+    packageFragments('kotlin': FqName@14) = null
+    packageFragments('kotlin.A': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.io': FqName@17) = null
+    packageFragments('kotlin.jvm': FqName@18) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('equals': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    _functions('invoke': Name@22) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@26) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('equals': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    _functions('invoke': Name@22) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('equals': Name@21) = 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('A': FqName@6) = null
-    _packageFragments('Int': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('kotlin': FqName@13) = null
-    _packageFragments('kotlin.Int': FqName@14) = null
-    _packageFragments('kotlin.io': FqName@15) = null
-    _packageFragments('kotlin.jvm': FqName@16) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('A': FqName@6) = null
+    packageFragments('Int': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('kotlin': FqName@13) = null
+    packageFragments('kotlin.Int': FqName@14) = null
+    packageFragments('kotlin.io': FqName@15) = null
+    packageFragments('kotlin.jvm': FqName@16) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('A': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    _functions('Nested': Name@20) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    _functions('equals': Name@21) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    _functions('invoke': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('Nested': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@19
+    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('Nested': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('A': Name@17) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('Nested': Name@25) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@27) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@23 // 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
-    _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('Nested': Name@25) = 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('A': FqName@6) = null
-    _packageFragments('Int': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.A': FqName@12) = null
-    _packageFragments('java.lang.Int': FqName@13) = null
-    _packageFragments('kotlin': FqName@14) = null
-    _packageFragments('kotlin.A': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.io': FqName@17) = null
-    _packageFragments('kotlin.jvm': FqName@18) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('A': FqName@6) = null
+    packageFragments('Int': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.A': FqName@12) = null
+    packageFragments('java.lang.Int': FqName@13) = null
+    packageFragments('kotlin': FqName@14) = null
+    packageFragments('kotlin.A': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.io': FqName@17) = null
+    packageFragments('kotlin.jvm': FqName@18) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('equals': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    _functions('invoke': Name@22) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@26) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('equals': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    _functions('invoke': Name@22) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('equals': Name@21) = 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('A': FqName@6) = null
-    _packageFragments('Int': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.A': FqName@12) = null
-    _packageFragments('java.lang.Int': FqName@13) = null
-    _packageFragments('kotlin': FqName@14) = null
-    _packageFragments('kotlin.A': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.io': FqName@17) = null
-    _packageFragments('kotlin.jvm': FqName@18) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('A': FqName@6) = null
+    packageFragments('Int': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.A': FqName@12) = null
+    packageFragments('java.lang.Int': FqName@13) = null
+    packageFragments('kotlin': FqName@14) = null
+    packageFragments('kotlin.A': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.io': FqName@17) = null
+    packageFragments('kotlin.jvm': FqName@18) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('equals': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    _functions('invoke': Name@22) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@26) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('equals': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    _functions('invoke': Name@22) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('equals': Name@21) = 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('A': FqName@6) = null
-    _packageFragments('Int': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('kotlin': FqName@13) = null
-    _packageFragments('kotlin.Int': FqName@14) = null
-    _packageFragments('kotlin.io': FqName@15) = null
-    _packageFragments('kotlin.jvm': FqName@16) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('A': FqName@6) = null
+    packageFragments('Int': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('kotlin': FqName@13) = null
+    packageFragments('kotlin.Int': FqName@14) = null
+    packageFragments('kotlin.io': FqName@15) = null
+    packageFragments('kotlin.jvm': FqName@16) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('A': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    _functions('ONE': Name@20) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    _functions('equals': Name@21) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    _functions('invoke': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('ONE': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@19
+    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('ONE': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('A': Name@17) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('ONE': Name@25) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@27) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@23 // 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
-    _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('ONE': Name@25) = 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('A': FqName@6) = null
-    _packageFragments('Int': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.A': FqName@12) = null
-    _packageFragments('java.lang.Int': FqName@13) = null
-    _packageFragments('kotlin': FqName@14) = null
-    _packageFragments('kotlin.A': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.io': FqName@17) = null
-    _packageFragments('kotlin.jvm': FqName@18) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('A': FqName@6) = null
+    packageFragments('Int': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.A': FqName@12) = null
+    packageFragments('java.lang.Int': FqName@13) = null
+    packageFragments('kotlin': FqName@14) = null
+    packageFragments('kotlin.A': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.io': FqName@17) = null
+    packageFragments('kotlin.jvm': FqName@18) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('A': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    _functions('ONE': Name@22) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    _functions('equals': Name@23) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    _functions('invoke': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('A': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('ONE': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('A': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('ONE': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('A': Name@19) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('ONE': Name@27) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('equals': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('invoke': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@29) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@25 // 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
-    _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('ONE': Name@27) = 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('A': FqName@6) = null
-    _packageFragments('Int': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.A': FqName@12) = null
-    _packageFragments('java.lang.Int': FqName@13) = null
-    _packageFragments('kotlin': FqName@14) = null
-    _packageFragments('kotlin.A': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.io': FqName@17) = null
-    _packageFragments('kotlin.jvm': FqName@18) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('A': FqName@6) = null
+    packageFragments('Int': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.A': FqName@12) = null
+    packageFragments('java.lang.Int': FqName@13) = null
+    packageFragments('kotlin': FqName@14) = null
+    packageFragments('kotlin.A': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.io': FqName@17) = null
+    packageFragments('kotlin.jvm': FqName@18) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('A': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    _functions('equals': Name@22) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    _functions('invoke': Name@23) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('A': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('A': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('A': Name@19) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('equals': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('invoke': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@27) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@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('A': FqName@6) = null
-    _packageFragments('Int': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('kotlin': FqName@13) = null
-    _packageFragments('kotlin.Int': FqName@14) = null
-    _packageFragments('kotlin.io': FqName@15) = null
-    _packageFragments('kotlin.jvm': FqName@16) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('A': FqName@6) = null
+    packageFragments('Int': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('kotlin': FqName@13) = null
+    packageFragments('kotlin.Int': FqName@14) = null
+    packageFragments('kotlin.io': FqName@15) = null
+    packageFragments('kotlin.jvm': FqName@16) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('A': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    _functions('equals': Name@20) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    _functions('invoke': Name@21) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@19
+    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('A': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('equals': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('invoke': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@25) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    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
-    _functionTypeForSamInterface = null
-    _typeConstructor = LazyJavaClassTypeConstructor@11['IllegalArgumentException']
-    defaultType = JetTypeImpl@12['IllegalArgumentException']
+    constructors = ArrayList@6[4] { JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], ... } // through LazyJavaClassMemberScope@10
+    defaultType = JetTypeImpl@11['IllegalArgumentException']
+    functionTypeForSamInterface = null
+    typeConstructor = LazyJavaClassTypeConstructor@12['IllegalArgumentException']
 }
 
 LazyJavaClassDescriptor@13['RuntimeException'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@14['RuntimeException']
+    typeConstructor = LazyJavaClassTypeConstructor@14['RuntimeException']
 }
 
 LazyJavaClassTypeConstructor@4['Exception'] {
-    _parameters = ArrayList@15[empty]
-    _supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Throwable'] }
+    parameters = ArrayList@15[empty]
+    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Throwable'] }
 }
 
-LazyJavaClassTypeConstructor@11['IllegalArgumentException'] {
-    _parameters = ArrayList@18[empty]
-    _supertypes = ArrayList@19[1] { LazyJavaClassifierType@20['RuntimeException'] }
+LazyJavaClassTypeConstructor@12['IllegalArgumentException'] {
+    parameters = ArrayList@18[empty]
+    supertypes = ArrayList@19[1] { LazyJavaClassifierType@20['RuntimeException'] }
 }
 
 LazyJavaClassTypeConstructor@14['RuntimeException'] {
-    _parameters = ArrayList@21[empty]
-    _supertypes = ArrayList@22[1] { LazyJavaClassifierType@23['Exception'] }
+    parameters = ArrayList@21[empty]
+    supertypes = ArrayList@22[1] { LazyJavaClassifierType@23['Exception'] }
 }
 
 LazyJavaClassifierType@23['Exception'] {
-    _arguments = ArrayList@24[empty]
-    _typeConstructor = LazyJavaClassTypeConstructor@4['Exception']
+    arguments = ArrayList@24[empty]
     classifier = JavaClassImpl@25['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@4['Exception']
 }
 
 LazyJavaClassifierType@20['RuntimeException'] {
-    _arguments = ArrayList@26[empty]
-    _typeConstructor = LazyJavaClassTypeConstructor@14['RuntimeException']
+    arguments = ArrayList@26[empty]
     classifier = JavaClassImpl@27['RuntimeException']
+    typeConstructor = LazyJavaClassTypeConstructor@14['RuntimeException']
 }
 
 LazyJavaClassifierType@28['String'] {
-    _arguments = ArrayList@29[empty]
-    _nullable = 'false': Boolean@30
-    _typeConstructor = DeserializedClassTypeConstructor@31
-    classifier = JavaClassImpl@32['String']
+    arguments = ArrayList@29[empty]
+    classifier = JavaClassImpl@30['String']
+    nullable = 'false': Boolean@31
+    typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@33['String'] {
-    _arguments = ArrayList@34[empty]
-    _nullable = 'false': Boolean@30
-    _typeConstructor = DeserializedClassTypeConstructor@31
+    arguments = ArrayList@34[empty]
     classifier = JavaClassImpl@35['String']
+    nullable = 'false': Boolean@31
+    typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@36['String'] {
-    _arguments = ArrayList@37[empty]
-    _nullable = 'true': Boolean@38
-    _typeConstructor = DeserializedClassTypeConstructor@31
-    classifier = JavaClassImpl@32['String']
+    arguments = ArrayList@37[empty]
+    classifier = JavaClassImpl@35['String']
+    nullable = 'true': Boolean@38
+    typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@39['String'] {
-    _arguments = ArrayList@40[empty]
-    _nullable = 'true': Boolean@38
-    _typeConstructor = DeserializedClassTypeConstructor@31
-    classifier = JavaClassImpl@35['String']
+    arguments = ArrayList@40[empty]
+    classifier = JavaClassImpl@30['String']
+    nullable = 'true': Boolean@38
+    typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@41['Throwable'] {
-    _arguments = ArrayList@42[empty]
-    _nullable = 'false': Boolean@30
-    _typeConstructor = DeserializedClassTypeConstructor@43
-    classifier = JavaClassImpl@44['Throwable']
+    arguments = ArrayList@42[empty]
+    classifier = JavaClassImpl@43['Throwable']
+    nullable = 'false': Boolean@31
+    typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaClassifierType@45['Throwable'] {
-    _arguments = ArrayList@46[empty]
-    _nullable = 'false': Boolean@30
-    _typeConstructor = DeserializedClassTypeConstructor@43
+    arguments = ArrayList@46[empty]
     classifier = JavaClassImpl@47['Throwable']
+    nullable = 'false': Boolean@31
+    typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaClassifierType@48['Throwable'] {
-    _arguments = ArrayList@49[empty]
-    _nullable = 'true': Boolean@38
-    _typeConstructor = DeserializedClassTypeConstructor@43
-    classifier = JavaClassImpl@44['Throwable']
+    arguments = ArrayList@49[empty]
+    classifier = JavaClassImpl@47['Throwable']
+    nullable = 'true': Boolean@38
+    typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaClassifierType@50['Throwable'] {
-    _arguments = ArrayList@51[empty]
-    _nullable = 'true': Boolean@38
-    _typeConstructor = DeserializedClassTypeConstructor@43
-    classifier = JavaClassImpl@47['Throwable']
+    arguments = ArrayList@51[empty]
+    classifier = JavaClassImpl@43['Throwable']
+    nullable = 'true': Boolean@38
+    typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaClassifierType@17['Throwable'] {
-    _arguments = ArrayList@52[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@43
+    arguments = ArrayList@52[empty]
     classifier = JavaClassImpl@53['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaPackageFragmentProvider@54 {
-    _packageFragments('<root>': FqName@55) = LazyJavaPackageFragment@56['<root>']
-    _packageFragments('Any': FqName@57) = null
-    _packageFragments('Int': FqName@58) = null
-    _packageFragments('String': FqName@59) = null
-    _packageFragments('java': FqName@60) = LazyJavaPackageFragment@61['java']
-    _packageFragments('java.lang': FqName@62) = LazyJavaPackageFragment@63['lang']
-    _packageFragments('java.lang.Any': FqName@64) = null
-    _packageFragments('java.lang.Int': FqName@65) = null
-    _packageFragments('java.lang.String': FqName@66) = null
-    _packageFragments('java.lang.tailRecursive': FqName@67) = null
-    _packageFragments('kotlin': FqName@68) = null
-    _packageFragments('kotlin.Any': FqName@69) = null
-    _packageFragments('kotlin.Int': FqName@70) = null
-    _packageFragments('kotlin.String': FqName@71) = null
-    _packageFragments('kotlin.io': FqName@72) = null
-    _packageFragments('kotlin.jvm': FqName@73) = null
-    _packageFragments('kotlin.tailRecursive': FqName@74) = null
-    _packageFragments('tailRecursive': FqName@75) = null
+    packageFragments('<root>': FqName@55) = LazyJavaPackageFragment@56['<root>']
+    packageFragments('Any': FqName@57) = null
+    packageFragments('Int': FqName@58) = null
+    packageFragments('String': FqName@59) = null
+    packageFragments('java': FqName@60) = LazyJavaPackageFragment@61['java']
+    packageFragments('java.lang': FqName@62) = LazyJavaPackageFragment@63['lang']
+    packageFragments('java.lang.Any': FqName@64) = null
+    packageFragments('java.lang.Int': FqName@65) = null
+    packageFragments('java.lang.String': FqName@66) = null
+    packageFragments('java.lang.tailRecursive': FqName@67) = null
+    packageFragments('kotlin': FqName@68) = null
+    packageFragments('kotlin.Any': FqName@69) = null
+    packageFragments('kotlin.Int': FqName@70) = null
+    packageFragments('kotlin.String': FqName@71) = null
+    packageFragments('kotlin.io': FqName@72) = null
+    packageFragments('kotlin.jvm': FqName@73) = null
+    packageFragments('kotlin.tailRecursive': FqName@74) = 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
-    _functions('compareTo': Name@80) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    _functions('equals': Name@81) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    _functions('minus': Name@82) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    _functions('not': Name@83) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    _functions('test': Name@84) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('Any': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('IllegalArgumentException': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('compareTo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('equals': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('minus': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('not': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('tailRecursive': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('test': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('Any': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('IllegalArgumentException': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('compareTo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('equals': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('minus': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('not': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('tailRecursive': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('test': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('IllegalArgumentException': Name@79) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('compareTo': Name@82) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('equals': Name@83) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('minus': Name@84) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('not': Name@85) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('test': Name@87) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@78
 }
 
 LazyJavaPackageFragment@61['java'] {
-    _functions('lang': Name@91) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@92
+    functions('lang': Name@93) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
     memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
 }
 
 LazyJavaPackageFragment@63['lang'] {
-    _functions('IllegalArgumentException': Name@77) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('compareTo': Name@80) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('equals': Name@81) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('minus': Name@82) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('not': Name@83) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    _functions('test': Name@84) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('IllegalArgumentException': Name@77) = LazyJavaClassDescriptor@5['IllegalArgumentException'] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('compareTo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('equals': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('minus': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('not': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('test': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('IllegalArgumentException': Name@79) = LazyJavaClassDescriptor@5['IllegalArgumentException'] // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('compareTo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('equals': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('minus': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('not': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('test': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('IllegalArgumentException': Name@79) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('compareTo': Name@82) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('equals': Name@83) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('minus': Name@84) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('not': Name@85) = EmptyList@89[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('java.lang.String': FqName@13) = null
-    _packageFragments('java.lang.tailRecursive': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.String': FqName@17) = null
-    _packageFragments('kotlin.io': FqName@18) = null
-    _packageFragments('kotlin.jvm': FqName@19) = null
-    _packageFragments('kotlin.tailRecursive': FqName@20) = null
-    _packageFragments('tailRecursive': FqName@21) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('java.lang.String': FqName@13) = null
+    packageFragments('java.lang.tailRecursive': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.String': FqName@17) = null
+    packageFragments('kotlin.io': FqName@18) = null
+    packageFragments('kotlin.jvm': FqName@19) = null
+    packageFragments('kotlin.tailRecursive': FqName@20) = null
+    packageFragments('tailRecursive': FqName@21) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('equals': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('foo': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('foo': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('minus': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@32) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('equals': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('foo': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('foo': Name@26) = EmptyList@30[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('String': FqName@6) = null
-    _packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    _packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    _packageFragments('java.lang.String': FqName@11) = null
-    _packageFragments('java.lang.tailRecursive': FqName@12) = null
-    _packageFragments('kotlin': FqName@13) = null
-    _packageFragments('kotlin.String': FqName@14) = null
-    _packageFragments('kotlin.io': FqName@15) = null
-    _packageFragments('kotlin.jvm': FqName@16) = null
-    _packageFragments('kotlin.tailRecursive': FqName@17) = null
-    _packageFragments('tailRecursive': FqName@18) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('String': FqName@6) = null
+    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
+    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
+    packageFragments('java.lang.String': FqName@11) = null
+    packageFragments('java.lang.tailRecursive': FqName@12) = null
+    packageFragments('kotlin': FqName@13) = null
+    packageFragments('kotlin.String': FqName@14) = null
+    packageFragments('kotlin.io': FqName@15) = null
+    packageFragments('kotlin.jvm': FqName@16) = null
+    packageFragments('kotlin.tailRecursive': FqName@17) = null
+    packageFragments('tailRecursive': FqName@18) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('noTails': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('noTails': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('tailRecursive': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('String': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('noTails': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('tailRecursive': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('noTails': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@8['java'] {
-    _functions('lang': Name@26) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    _functions('noTails': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('noTails': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('noTails': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@23 // 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
-    _type = JetTypeImpl@2['suppress']
-    _valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['suppress']
+    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
 }
 
 LazyAnnotationDescriptor@5 {
-    _resolutionResults = OverloadResolutionResultsImpl@6
-    _type = JetTypeImpl@7['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@6
+    type = JetTypeImpl@7['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@8 {
-    _packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    _packageFragments('Int': FqName@11) = null
-    _packageFragments('String': FqName@12) = null
-    _packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    _packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    _packageFragments('java.lang.Int': FqName@17) = null
-    _packageFragments('java.lang.String': FqName@18) = null
-    _packageFragments('java.lang.suppress': FqName@19) = null
-    _packageFragments('java.lang.tailRecursive': FqName@20) = null
-    _packageFragments('kotlin': FqName@21) = null
-    _packageFragments('kotlin.Int': FqName@22) = null
-    _packageFragments('kotlin.String': FqName@23) = null
-    _packageFragments('kotlin.io': FqName@24) = null
-    _packageFragments('kotlin.jvm': FqName@25) = null
-    _packageFragments('kotlin.suppress': FqName@26) = null
-    _packageFragments('kotlin.tailRecursive': FqName@27) = null
-    _packageFragments('suppress': FqName@28) = null
-    _packageFragments('tailRecursive': FqName@29) = null
+    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
+    packageFragments('Int': FqName@11) = null
+    packageFragments('String': FqName@12) = null
+    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
+    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
+    packageFragments('java.lang.Int': FqName@17) = null
+    packageFragments('java.lang.String': FqName@18) = null
+    packageFragments('java.lang.suppress': FqName@19) = null
+    packageFragments('java.lang.tailRecursive': FqName@20) = null
+    packageFragments('kotlin': FqName@21) = null
+    packageFragments('kotlin.Int': FqName@22) = null
+    packageFragments('kotlin.String': FqName@23) = null
+    packageFragments('kotlin.io': FqName@24) = null
+    packageFragments('kotlin.jvm': FqName@25) = null
+    packageFragments('kotlin.suppress': FqName@26) = null
+    packageFragments('kotlin.tailRecursive': FqName@27) = null
+    packageFragments('suppress': FqName@28) = null
+    packageFragments('tailRecursive': FqName@29) = null
 }
 
 LazyJavaPackageFragment@10['<root>'] {
-    _functions('badTails': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('compareTo': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('equals': Name@34) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('minus': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('plus': Name@36) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('Int': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('String': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('badTails': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('compareTo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('equals': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('minus': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('plus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('suppress': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('tailRecursive': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('Int': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('String': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('badTails': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('compareTo': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('equals': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('minus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('plus': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('suppress': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('tailRecursive': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('badTails': Name@33) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('compareTo': Name@34) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('equals': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('minus': Name@36) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('plus': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@14['java'] {
-    _functions('lang': Name@43) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('lang': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@40 // 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
-    _functions('compareTo': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    _functions('equals': Name@34) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    _functions('minus': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    _functions('plus': Name@36) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('badTails': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('compareTo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('equals': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('minus': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('plus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('badTails': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('compareTo': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('equals': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('minus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('plus': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('badTails': Name@33) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('compareTo': Name@34) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('equals': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('minus': Name@36) = EmptyList@41[empty] // 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('Int': FqName@4) = null
-    _packageFragments('String': FqName@5) = null
-    _packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    _packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    _packageFragments('java.lang.Int': FqName@10) = null
-    _packageFragments('java.lang.String': FqName@11) = null
-    _packageFragments('kotlin': FqName@12) = null
-    _packageFragments('kotlin.Int': FqName@13) = null
-    _packageFragments('kotlin.String': FqName@14) = null
-    _packageFragments('kotlin.io': FqName@15) = null
-    _packageFragments('kotlin.jvm': FqName@16) = null
+    packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
+    packageFragments('Int': FqName@4) = null
+    packageFragments('String': FqName@5) = null
+    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
+    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
+    packageFragments('java.lang.Int': FqName@10) = null
+    packageFragments('java.lang.String': FqName@11) = null
+    packageFragments('kotlin': FqName@12) = null
+    packageFragments('kotlin.Int': FqName@13) = null
+    packageFragments('kotlin.String': FqName@14) = null
+    packageFragments('kotlin.io': FqName@15) = null
+    packageFragments('kotlin.jvm': FqName@16) = null
 }
 
 LazyJavaPackageFragment@3['<root>'] {
-    _functions('compareTo': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    _functions('equals': Name@20) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    _functions('minus': Name@21) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    _functions('plus': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    _functions('withoutAnnotation': Name@23) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('compareTo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('minus': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('plus': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('withoutAnnotation': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@19
+    classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('String': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('compareTo': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('minus': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('plus': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('withoutAnnotation': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('compareTo': Name@20) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('equals': Name@21) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('minus': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('plus': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('withoutAnnotation': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@7['java'] {
-    _functions('lang': Name@28) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@25 // 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
-    _functions('equals': Name@20) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('minus': Name@21) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('plus': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('withoutAnnotation': Name@23) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('compareTo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('minus': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('plus': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('withoutAnnotation': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('compareTo': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('minus': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('plus': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('withoutAnnotation': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('compareTo': Name@20) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('equals': Name@21) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('minus': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('plus': Name@23) = EmptyList@26[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('java.lang.String': FqName@13) = null
-    _packageFragments('java.lang.tailRecursive': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.String': FqName@17) = null
-    _packageFragments('kotlin.io': FqName@18) = null
-    _packageFragments('kotlin.jvm': FqName@19) = null
-    _packageFragments('kotlin.tailRecursive': FqName@20) = null
-    _packageFragments('tailRecursive': FqName@21) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('java.lang.String': FqName@13) = null
+    packageFragments('java.lang.tailRecursive': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.String': FqName@17) = null
+    packageFragments('kotlin.io': FqName@18) = null
+    packageFragments('kotlin.jvm': FqName@19) = null
+    packageFragments('kotlin.tailRecursive': FqName@20) = null
+    packageFragments('tailRecursive': FqName@21) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('compareTo': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('equals': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('test': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@33) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('compareTo': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('equals': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('test': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('minus': Name@27) = EmptyList@31[empty] // 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
-    _type = JetTypeImpl@3['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@2
+    type = JetTypeImpl@3['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@4 {
-    _packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    _packageFragments('Int': FqName@7) = null
-    _packageFragments('String': FqName@8) = null
-    _packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    _packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    _packageFragments('java.lang.Int': FqName@13) = null
-    _packageFragments('java.lang.String': FqName@14) = null
-    _packageFragments('java.lang.tailRecursive': FqName@15) = null
-    _packageFragments('kotlin': FqName@16) = null
-    _packageFragments('kotlin.Int': FqName@17) = null
-    _packageFragments('kotlin.String': FqName@18) = null
-    _packageFragments('kotlin.io': FqName@19) = null
-    _packageFragments('kotlin.jvm': FqName@20) = null
-    _packageFragments('kotlin.tailRecursive': FqName@21) = null
-    _packageFragments('tailRecursive': FqName@22) = null
+    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
+    packageFragments('Int': FqName@7) = null
+    packageFragments('String': FqName@8) = null
+    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
+    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
+    packageFragments('java.lang.Int': FqName@13) = null
+    packageFragments('java.lang.String': FqName@14) = null
+    packageFragments('java.lang.tailRecursive': FqName@15) = null
+    packageFragments('kotlin': FqName@16) = null
+    packageFragments('kotlin.Int': FqName@17) = null
+    packageFragments('kotlin.String': FqName@18) = null
+    packageFragments('kotlin.io': FqName@19) = null
+    packageFragments('kotlin.jvm': FqName@20) = null
+    packageFragments('kotlin.tailRecursive': FqName@21) = null
+    packageFragments('tailRecursive': FqName@22) = null
 }
 
 LazyJavaPackageFragment@6['<root>'] {
-    _functions('equals': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    _functions('foo': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    _functions('minus': Name@27) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('tailRecursive': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('foo': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('minus': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@33) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    _functions('equals': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('foo': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('minus': Name@27) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('foo': Name@27) = EmptyList@31[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('java.lang.String': FqName@13) = null
-    _packageFragments('java.lang.tailRecursive': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.String': FqName@17) = null
-    _packageFragments('kotlin.io': FqName@18) = null
-    _packageFragments('kotlin.jvm': FqName@19) = null
-    _packageFragments('kotlin.tailRecursive': FqName@20) = null
-    _packageFragments('tailRecursive': FqName@21) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('java.lang.String': FqName@13) = null
+    packageFragments('java.lang.tailRecursive': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.String': FqName@17) = null
+    packageFragments('kotlin.io': FqName@18) = null
+    packageFragments('kotlin.jvm': FqName@19) = null
+    packageFragments('kotlin.tailRecursive': FqName@20) = null
+    packageFragments('tailRecursive': FqName@21) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('compareTo': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('equals': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('test': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@33) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('compareTo': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('equals': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('test': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('minus': Name@27) = EmptyList@31[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyAnnotationDescriptor@3 {
-    _resolutionResults = OverloadResolutionResultsImpl@4
-    _type = JetTypeImpl@5['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@4
+    type = JetTypeImpl@5['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@6 {
-    _packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    _packageFragments('Any': FqName@9) = null
-    _packageFragments('B': FqName@10) = null
-    _packageFragments('C': FqName@11) = null
-    _packageFragments('Int': FqName@12) = null
-    _packageFragments('String': FqName@13) = null
-    _packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    _packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    _packageFragments('java.lang.Any': FqName@18) = null
-    _packageFragments('java.lang.C': FqName@19) = null
-    _packageFragments('java.lang.Int': FqName@20) = null
-    _packageFragments('java.lang.String': FqName@21) = null
-    _packageFragments('java.lang.tailRecursive': FqName@22) = null
-    _packageFragments('kotlin': FqName@23) = null
-    _packageFragments('kotlin.Any': FqName@24) = null
-    _packageFragments('kotlin.C': FqName@25) = null
-    _packageFragments('kotlin.Int': FqName@26) = null
-    _packageFragments('kotlin.String': FqName@27) = null
-    _packageFragments('kotlin.io': FqName@28) = null
-    _packageFragments('kotlin.jvm': FqName@29) = null
-    _packageFragments('kotlin.tailRecursive': FqName@30) = null
-    _packageFragments('tailRecursive': FqName@31) = null
+    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
+    packageFragments('Any': FqName@9) = null
+    packageFragments('B': FqName@10) = null
+    packageFragments('C': FqName@11) = null
+    packageFragments('Int': FqName@12) = null
+    packageFragments('String': FqName@13) = null
+    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
+    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
+    packageFragments('java.lang.Any': FqName@18) = null
+    packageFragments('java.lang.C': FqName@19) = null
+    packageFragments('java.lang.Int': FqName@20) = null
+    packageFragments('java.lang.String': FqName@21) = null
+    packageFragments('java.lang.tailRecursive': FqName@22) = null
+    packageFragments('kotlin': FqName@23) = null
+    packageFragments('kotlin.Any': FqName@24) = null
+    packageFragments('kotlin.C': FqName@25) = null
+    packageFragments('kotlin.Int': FqName@26) = null
+    packageFragments('kotlin.String': FqName@27) = null
+    packageFragments('kotlin.io': FqName@28) = null
+    packageFragments('kotlin.jvm': FqName@29) = null
+    packageFragments('kotlin.tailRecursive': FqName@30) = null
+    packageFragments('tailRecursive': FqName@31) = null
 }
 
 LazyJavaPackageFragment@8['<root>'] {
-    _functions('B': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    _functions('C': Name@35) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    _functions('compareTo': Name@36) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    _functions('h': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    _functions('h2': Name@38) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    _functions('makeC': Name@39) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    _functions('minus': Name@40) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('Any': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('B': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('C': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('String': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('compareTo': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('h': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('h2': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('makeC': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('minus': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('tailRecursive': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('Any': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('B': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('C': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('String': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('compareTo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('h': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('h2': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('makeC': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('minus': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('tailRecursive': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('B': Name@34) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('C': Name@35) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('compareTo': Name@38) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('h': Name@39) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('h2': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('makeC': Name@41) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('minus': Name@42) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@15['java'] {
-    _functions('lang': Name@47) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('lang': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('lang': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    deserializedPackageScope = Empty@44 // 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
-    _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('B': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@51
     classes('C': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('compareTo': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('h': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('h2': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('makeC': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('minus': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('compareTo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('h': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('h2': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('makeC': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('minus': Name@42) = null // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('java.lang.String': FqName@13) = null
-    _packageFragments('java.lang.tailRecursive': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.String': FqName@17) = null
-    _packageFragments('kotlin.io': FqName@18) = null
-    _packageFragments('kotlin.jvm': FqName@19) = null
-    _packageFragments('kotlin.tailRecursive': FqName@20) = null
-    _packageFragments('tailRecursive': FqName@21) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('java.lang.String': FqName@13) = null
+    packageFragments('java.lang.tailRecursive': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.String': FqName@17) = null
+    packageFragments('kotlin.io': FqName@18) = null
+    packageFragments('kotlin.jvm': FqName@19) = null
+    packageFragments('kotlin.tailRecursive': FqName@20) = null
+    packageFragments('tailRecursive': FqName@21) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('compareTo': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('equals': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('test': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@33) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('compareTo': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('equals': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('test': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('minus': Name@27) = EmptyList@31[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('java.lang.String': FqName@13) = null
-    _packageFragments('java.lang.tailRecursive': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.String': FqName@17) = null
-    _packageFragments('kotlin.io': FqName@18) = null
-    _packageFragments('kotlin.jvm': FqName@19) = null
-    _packageFragments('kotlin.tailRecursive': FqName@20) = null
-    _packageFragments('tailRecursive': FqName@21) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('java.lang.String': FqName@13) = null
+    packageFragments('java.lang.tailRecursive': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.String': FqName@17) = null
+    packageFragments('kotlin.io': FqName@18) = null
+    packageFragments('kotlin.jvm': FqName@19) = null
+    packageFragments('kotlin.tailRecursive': FqName@20) = null
+    packageFragments('tailRecursive': FqName@21) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('compareTo': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('equals': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('plus': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('test': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('test': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('plus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@34) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('compareTo': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('equals': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('plus': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('test': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('test': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('plus': Name@28) = EmptyList@32[empty] // 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
-    _type = JetTypeImpl@3['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@2
+    type = JetTypeImpl@3['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@4 {
-    _packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    _packageFragments('A': FqName@7) = null
-    _packageFragments('Int': FqName@8) = null
-    _packageFragments('Iterator': FqName@9) = null
-    _packageFragments('Long': FqName@10) = null
-    _packageFragments('String': FqName@11) = null
-    _packageFragments('T': FqName@12) = null
-    _packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    _packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    _packageFragments('java.lang.A': FqName@17) = null
-    _packageFragments('java.lang.Int': FqName@18) = null
-    _packageFragments('java.lang.Iterator': FqName@19) = null
-    _packageFragments('java.lang.Long': FqName@20) = null
-    _packageFragments('java.lang.String': FqName@21) = null
-    _packageFragments('java.lang.T': FqName@22) = null
-    _packageFragments('java.lang.tailRecursive': FqName@23) = null
-    _packageFragments('kotlin': FqName@24) = null
-    _packageFragments('kotlin.A': FqName@25) = null
-    _packageFragments('kotlin.Int': FqName@26) = null
-    _packageFragments('kotlin.Iterator': FqName@27) = null
-    _packageFragments('kotlin.Long': FqName@28) = null
-    _packageFragments('kotlin.String': FqName@29) = null
-    _packageFragments('kotlin.T': FqName@30) = null
-    _packageFragments('kotlin.io': FqName@31) = null
-    _packageFragments('kotlin.jvm': FqName@32) = null
-    _packageFragments('kotlin.tailRecursive': FqName@33) = null
-    _packageFragments('tailRecursive': FqName@34) = null
+    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
+    packageFragments('A': FqName@7) = null
+    packageFragments('Int': FqName@8) = null
+    packageFragments('Iterator': FqName@9) = null
+    packageFragments('Long': FqName@10) = null
+    packageFragments('String': FqName@11) = null
+    packageFragments('T': FqName@12) = null
+    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
+    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
+    packageFragments('java.lang.A': FqName@17) = null
+    packageFragments('java.lang.Int': FqName@18) = null
+    packageFragments('java.lang.Iterator': FqName@19) = null
+    packageFragments('java.lang.Long': FqName@20) = null
+    packageFragments('java.lang.String': FqName@21) = null
+    packageFragments('java.lang.T': FqName@22) = null
+    packageFragments('java.lang.tailRecursive': FqName@23) = null
+    packageFragments('kotlin': FqName@24) = null
+    packageFragments('kotlin.A': FqName@25) = null
+    packageFragments('kotlin.Int': FqName@26) = null
+    packageFragments('kotlin.Iterator': FqName@27) = null
+    packageFragments('kotlin.Long': FqName@28) = null
+    packageFragments('kotlin.String': FqName@29) = null
+    packageFragments('kotlin.T': FqName@30) = null
+    packageFragments('kotlin.io': FqName@31) = null
+    packageFragments('kotlin.jvm': FqName@32) = null
+    packageFragments('kotlin.tailRecursive': FqName@33) = null
+    packageFragments('tailRecursive': FqName@34) = null
 }
 
 LazyJavaPackageFragment@6['<root>'] {
-    _functions('equals': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('foldFunction': Name@38) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('foldl': Name@39) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('hasNext': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('invoke': Name@41) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('iterator': Name@42) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('next': Name@43) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('not': Name@44) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('plus': Name@45) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('rangeTo': Name@46) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('Iterator': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('Long': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('String': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('foldFunction': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('foldl': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('hasNext': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('invoke': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('iterator': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('next': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('not': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('plus': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('rangeTo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('tailRecursive': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('Int': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('Iterator': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('Long': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('String': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('equals': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('foldFunction': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('foldl': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('hasNext': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('invoke': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('iterator': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('next': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('not': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('plus': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('rangeTo': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('tailRecursive': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('equals': Name@40) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('foldFunction': Name@41) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('foldl': Name@42) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('hasNext': Name@43) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('invoke': Name@44) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('iterator': Name@45) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('next': Name@46) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('not': Name@47) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('plus': Name@48) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('rangeTo': Name@49) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@36
 }
 
 LazyJavaPackageFragment@14['java'] {
-    _functions('lang': Name@54) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('lang': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('lang': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    deserializedPackageScope = Empty@51 // 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
-    _functions('foldFunction': Name@38) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('foldl': Name@39) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('hasNext': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('invoke': Name@41) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('iterator': Name@42) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('next': Name@43) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('not': Name@44) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('plus': Name@45) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    _functions('rangeTo': Name@46) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('equals': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('foldFunction': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('foldl': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('hasNext': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('invoke': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('iterator': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('next': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('not': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('plus': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('rangeTo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('equals': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('foldFunction': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('foldl': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('hasNext': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('invoke': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('iterator': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('next': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('not': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('plus': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('rangeTo': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('equals': Name@40) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('foldFunction': Name@41) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('foldl': Name@42) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('hasNext': Name@43) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('invoke': Name@44) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('iterator': Name@45) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('next': Name@46) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('not': Name@47) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('plus': Name@48) = EmptyList@52[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Any': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Any': FqName@12) = null
-    _packageFragments('java.lang.String': FqName@13) = null
-    _packageFragments('java.lang.tailRecursive': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Any': FqName@16) = null
-    _packageFragments('kotlin.String': FqName@17) = null
-    _packageFragments('kotlin.io': FqName@18) = null
-    _packageFragments('kotlin.jvm': FqName@19) = null
-    _packageFragments('kotlin.tailRecursive': FqName@20) = null
-    _packageFragments('tailRecursive': FqName@21) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Any': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Any': FqName@12) = null
+    packageFragments('java.lang.String': FqName@13) = null
+    packageFragments('java.lang.tailRecursive': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Any': FqName@16) = null
+    packageFragments('kotlin.String': FqName@17) = null
+    packageFragments('kotlin.io': FqName@18) = null
+    packageFragments('kotlin.jvm': FqName@19) = null
+    packageFragments('kotlin.tailRecursive': FqName@20) = null
+    packageFragments('tailRecursive': FqName@21) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('bar': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('foo': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Any': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('bar': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Any': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('bar': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('bar': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('foo': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@31) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('bar': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    _functions('foo': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('bar': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('bar': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('bar': Name@25) = EmptyList@29[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('String': FqName@6) = null
-    _packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    _packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    _packageFragments('java.lang.String': FqName@11) = null
-    _packageFragments('java.lang.tailRecursive': FqName@12) = null
-    _packageFragments('kotlin': FqName@13) = null
-    _packageFragments('kotlin.String': FqName@14) = null
-    _packageFragments('kotlin.io': FqName@15) = null
-    _packageFragments('kotlin.jvm': FqName@16) = null
-    _packageFragments('kotlin.tailRecursive': FqName@17) = null
-    _packageFragments('tailRecursive': FqName@18) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('String': FqName@6) = null
+    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
+    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
+    packageFragments('java.lang.String': FqName@11) = null
+    packageFragments('java.lang.tailRecursive': FqName@12) = null
+    packageFragments('kotlin': FqName@13) = null
+    packageFragments('kotlin.String': FqName@14) = null
+    packageFragments('kotlin.io': FqName@15) = null
+    packageFragments('kotlin.jvm': FqName@16) = null
+    packageFragments('kotlin.tailRecursive': FqName@17) = null
+    packageFragments('tailRecursive': FqName@18) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('foo': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('tailRecursive': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('String': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('foo': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('tailRecursive': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('foo': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@8['java'] {
-    _functions('lang': Name@26) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    _functions('foo': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('foo': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@23 // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('java.lang.String': FqName@13) = null
-    _packageFragments('java.lang.tailRecursive': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.String': FqName@17) = null
-    _packageFragments('kotlin.io': FqName@18) = null
-    _packageFragments('kotlin.jvm': FqName@19) = null
-    _packageFragments('kotlin.tailRecursive': FqName@20) = null
-    _packageFragments('tailRecursive': FqName@21) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('java.lang.String': FqName@13) = null
+    packageFragments('java.lang.tailRecursive': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.String': FqName@17) = null
+    packageFragments('kotlin.io': FqName@18) = null
+    packageFragments('kotlin.jvm': FqName@19) = null
+    packageFragments('kotlin.tailRecursive': FqName@20) = null
+    packageFragments('tailRecursive': FqName@21) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('compareTo': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('g3': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('test': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('g3': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('g3': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('g3': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@33) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('compareTo': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('g3': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('test': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('g3': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('g3': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('g3': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('minus': Name@27) = EmptyList@31[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('java.lang.String': FqName@13) = null
-    _packageFragments('java.lang.tailRecursive': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.String': FqName@17) = null
-    _packageFragments('kotlin.io': FqName@18) = null
-    _packageFragments('kotlin.jvm': FqName@19) = null
-    _packageFragments('kotlin.tailRecursive': FqName@20) = null
-    _packageFragments('tailRecursive': FqName@21) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('java.lang.String': FqName@13) = null
+    packageFragments('java.lang.tailRecursive': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.String': FqName@17) = null
+    packageFragments('kotlin.io': FqName@18) = null
+    packageFragments('kotlin.jvm': FqName@19) = null
+    packageFragments('kotlin.tailRecursive': FqName@20) = null
+    packageFragments('tailRecursive': FqName@21) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('compareTo': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('equals': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('plus': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('test': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('test': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('plus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@34) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('compareTo': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('equals': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('plus': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('test': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('test': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('plus': Name@28) = EmptyList@32[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaClassDescriptor@3['Exception'] {
-    _constructors = ArrayList@4[5] { JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], ... } // through LazyJavaClassMemberScope@8
-    _functionTypeForSamInterface = null
-    _typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-    defaultType = JetTypeImpl@10['Exception']
+    constructors = ArrayList@4[5] { JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], ... } // through LazyJavaClassMemberScope@8
+    defaultType = JetTypeImpl@9['Exception']
+    functionTypeForSamInterface = null
+    typeConstructor = LazyJavaClassTypeConstructor@10['Exception']
 }
 
-LazyJavaClassTypeConstructor@9['Exception'] {
-    _parameters = ArrayList@11[empty]
-    _supertypes = ArrayList@12[1] { LazyJavaClassifierType@13['Throwable'] }
+LazyJavaClassTypeConstructor@10['Exception'] {
+    parameters = ArrayList@11[empty]
+    supertypes = ArrayList@12[1] { LazyJavaClassifierType@13['Throwable'] }
 }
 
 LazyJavaClassifierType@14['String'] {
-    _arguments = ArrayList@15[empty]
-    _nullable = 'false': Boolean@16
-    _typeConstructor = DeserializedClassTypeConstructor@17
-    classifier = JavaClassImpl@18['String']
+    arguments = ArrayList@15[empty]
+    classifier = JavaClassImpl@16['String']
+    nullable = 'false': Boolean@17
+    typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@19['String'] {
-    _arguments = ArrayList@20[empty]
-    _nullable = 'false': Boolean@16
-    _typeConstructor = DeserializedClassTypeConstructor@17
+    arguments = ArrayList@20[empty]
     classifier = JavaClassImpl@21['String']
+    nullable = 'false': Boolean@17
+    typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@22['String'] {
-    _arguments = ArrayList@23[empty]
-    _nullable = 'false': Boolean@16
-    _typeConstructor = DeserializedClassTypeConstructor@17
+    arguments = ArrayList@23[empty]
     classifier = JavaClassImpl@24['String']
+    nullable = 'false': Boolean@17
+    typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@25['String'] {
-    _arguments = ArrayList@26[empty]
-    _nullable = 'true': Boolean@27
-    _typeConstructor = DeserializedClassTypeConstructor@17
-    classifier = JavaClassImpl@18['String']
+    arguments = ArrayList@26[empty]
+    classifier = JavaClassImpl@21['String']
+    nullable = 'true': Boolean@27
+    typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@28['String'] {
-    _arguments = ArrayList@29[empty]
-    _nullable = 'true': Boolean@27
-    _typeConstructor = DeserializedClassTypeConstructor@17
+    arguments = ArrayList@29[empty]
     classifier = JavaClassImpl@24['String']
+    nullable = 'true': Boolean@27
+    typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@30['String'] {
-    _arguments = ArrayList@31[empty]
-    _nullable = 'true': Boolean@27
-    _typeConstructor = DeserializedClassTypeConstructor@17
-    classifier = JavaClassImpl@21['String']
+    arguments = ArrayList@31[empty]
+    classifier = JavaClassImpl@16['String']
+    nullable = 'true': Boolean@27
+    typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@32['Throwable'] {
-    _arguments = ArrayList@33[empty]
-    _nullable = 'false': Boolean@16
-    _typeConstructor = DeserializedClassTypeConstructor@34
-    classifier = JavaClassImpl@35['Throwable']
+    arguments = ArrayList@33[empty]
+    classifier = JavaClassImpl@34['Throwable']
+    nullable = 'false': Boolean@17
+    typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@36['Throwable'] {
-    _arguments = ArrayList@37[empty]
-    _nullable = 'false': Boolean@16
-    _typeConstructor = DeserializedClassTypeConstructor@34
+    arguments = ArrayList@37[empty]
     classifier = JavaClassImpl@38['Throwable']
+    nullable = 'false': Boolean@17
+    typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@39['Throwable'] {
-    _arguments = ArrayList@40[empty]
-    _nullable = 'false': Boolean@16
-    _typeConstructor = DeserializedClassTypeConstructor@34
+    arguments = ArrayList@40[empty]
     classifier = JavaClassImpl@41['Throwable']
+    nullable = 'false': Boolean@17
+    typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@42['Throwable'] {
-    _arguments = ArrayList@43[empty]
-    _nullable = 'true': Boolean@27
-    _typeConstructor = DeserializedClassTypeConstructor@34
-    classifier = JavaClassImpl@38['Throwable']
+    arguments = ArrayList@43[empty]
+    classifier = JavaClassImpl@34['Throwable']
+    nullable = 'true': Boolean@27
+    typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@44['Throwable'] {
-    _arguments = ArrayList@45[empty]
-    _nullable = 'true': Boolean@27
-    _typeConstructor = DeserializedClassTypeConstructor@34
+    arguments = ArrayList@45[empty]
     classifier = JavaClassImpl@41['Throwable']
+    nullable = 'true': Boolean@27
+    typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@46['Throwable'] {
-    _arguments = ArrayList@47[empty]
-    _nullable = 'true': Boolean@27
-    _typeConstructor = DeserializedClassTypeConstructor@34
-    classifier = JavaClassImpl@35['Throwable']
+    arguments = ArrayList@47[empty]
+    classifier = JavaClassImpl@38['Throwable']
+    nullable = 'true': Boolean@27
+    typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@13['Throwable'] {
-    _arguments = ArrayList@48[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@34
+    arguments = ArrayList@48[empty]
     classifier = JavaClassImpl@49['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaPackageFragmentProvider@50 {
-    _packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
-    _packageFragments('Exception': FqName@53) = null
-    _packageFragments('Int': FqName@54) = null
-    _packageFragments('String': FqName@55) = null
-    _packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    _packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    _packageFragments('java.lang.Exception': FqName@60) = null
-    _packageFragments('java.lang.Int': FqName@61) = null
-    _packageFragments('java.lang.String': FqName@62) = null
-    _packageFragments('java.lang.tailRecursive': FqName@63) = null
-    _packageFragments('kotlin': FqName@64) = null
-    _packageFragments('kotlin.Exception': FqName@65) = null
-    _packageFragments('kotlin.Int': FqName@66) = null
-    _packageFragments('kotlin.String': FqName@67) = null
-    _packageFragments('kotlin.io': FqName@68) = null
-    _packageFragments('kotlin.jvm': FqName@69) = null
-    _packageFragments('kotlin.tailRecursive': FqName@70) = null
-    _packageFragments('tailRecursive': FqName@71) = null
+    packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
+    packageFragments('Exception': FqName@53) = null
+    packageFragments('Int': FqName@54) = null
+    packageFragments('String': FqName@55) = null
+    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
+    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
+    packageFragments('java.lang.Exception': FqName@60) = null
+    packageFragments('java.lang.Int': FqName@61) = null
+    packageFragments('java.lang.String': FqName@62) = null
+    packageFragments('java.lang.tailRecursive': FqName@63) = null
+    packageFragments('kotlin': FqName@64) = null
+    packageFragments('kotlin.Exception': FqName@65) = null
+    packageFragments('kotlin.Int': FqName@66) = null
+    packageFragments('kotlin.String': FqName@67) = null
+    packageFragments('kotlin.io': FqName@68) = null
+    packageFragments('kotlin.jvm': FqName@69) = null
+    packageFragments('kotlin.tailRecursive': FqName@70) = 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
-    _functions('equals': Name@76) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    _functions('minus': Name@77) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    _functions('test': Name@78) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('Exception': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('equals': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('minus': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('tailRecursive': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('test': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('Exception': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('String': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('minus': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('tailRecursive': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('test': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('Exception': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('equals': Name@77) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('minus': Name@78) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('test': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@74
 }
 
 LazyJavaPackageFragment@57['java'] {
-    _functions('lang': Name@85) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('lang': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    deserializedPackageScope = Empty@81 // 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
-    _functions('equals': Name@76) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    _functions('minus': Name@77) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    _functions('test': Name@78) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('Exception': Name@79) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('equals': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('minus': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('test': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('Exception': Name@73) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('minus': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('test': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('Exception': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('equals': Name@77) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('minus': Name@78) = EmptyList@83[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('java.lang.String': FqName@13) = null
-    _packageFragments('java.lang.tailRecursive': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.String': FqName@17) = null
-    _packageFragments('kotlin.io': FqName@18) = null
-    _packageFragments('kotlin.jvm': FqName@19) = null
-    _packageFragments('kotlin.tailRecursive': FqName@20) = null
-    _packageFragments('tailRecursive': FqName@21) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('java.lang.String': FqName@13) = null
+    packageFragments('java.lang.tailRecursive': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.String': FqName@17) = null
+    packageFragments('kotlin.io': FqName@18) = null
+    packageFragments('kotlin.jvm': FqName@19) = null
+    packageFragments('kotlin.tailRecursive': FqName@20) = null
+    packageFragments('tailRecursive': FqName@21) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('equals': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('minus': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('test': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('minus': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@32) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('equals': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('minus': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('test': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('minus': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('test': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('minus': Name@26) = EmptyList@30[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('java.lang.String': FqName@13) = null
-    _packageFragments('java.lang.tailRecursive': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.String': FqName@17) = null
-    _packageFragments('kotlin.io': FqName@18) = null
-    _packageFragments('kotlin.jvm': FqName@19) = null
-    _packageFragments('kotlin.tailRecursive': FqName@20) = null
-    _packageFragments('tailRecursive': FqName@21) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('java.lang.String': FqName@13) = null
+    packageFragments('java.lang.tailRecursive': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.String': FqName@17) = null
+    packageFragments('kotlin.io': FqName@18) = null
+    packageFragments('kotlin.jvm': FqName@19) = null
+    packageFragments('kotlin.tailRecursive': FqName@20) = null
+    packageFragments('tailRecursive': FqName@21) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('compareTo': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('equals': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('test': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@33) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('compareTo': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('equals': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('test': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('minus': Name@27) = EmptyList@31[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('java.lang.String': FqName@13) = null
-    _packageFragments('java.lang.tailRecursive': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.String': FqName@17) = null
-    _packageFragments('kotlin.io': FqName@18) = null
-    _packageFragments('kotlin.jvm': FqName@19) = null
-    _packageFragments('kotlin.tailRecursive': FqName@20) = null
-    _packageFragments('tailRecursive': FqName@21) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('java.lang.String': FqName@13) = null
+    packageFragments('java.lang.tailRecursive': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.String': FqName@17) = null
+    packageFragments('kotlin.io': FqName@18) = null
+    packageFragments('kotlin.jvm': FqName@19) = null
+    packageFragments('kotlin.tailRecursive': FqName@20) = null
+    packageFragments('tailRecursive': FqName@21) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('equals': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('foo': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('foo': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('minus': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@32) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('equals': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('foo': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('foo': Name@26) = EmptyList@30[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('Throwable': FqName@8) = null
-    _packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    _packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    _packageFragments('java.lang.Int': FqName@13) = null
-    _packageFragments('java.lang.String': FqName@14) = null
-    _packageFragments('java.lang.Throwable': FqName@15) = null
-    _packageFragments('java.lang.tailRecursive': FqName@16) = null
-    _packageFragments('kotlin': FqName@17) = null
-    _packageFragments('kotlin.Int': FqName@18) = null
-    _packageFragments('kotlin.String': FqName@19) = null
-    _packageFragments('kotlin.Throwable': FqName@20) = null
-    _packageFragments('kotlin.io': FqName@21) = null
-    _packageFragments('kotlin.jvm': FqName@22) = null
-    _packageFragments('kotlin.tailRecursive': FqName@23) = null
-    _packageFragments('tailRecursive': FqName@24) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('Throwable': FqName@8) = null
+    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
+    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
+    packageFragments('java.lang.Int': FqName@13) = null
+    packageFragments('java.lang.String': FqName@14) = null
+    packageFragments('java.lang.Throwable': FqName@15) = null
+    packageFragments('java.lang.tailRecursive': FqName@16) = null
+    packageFragments('kotlin': FqName@17) = null
+    packageFragments('kotlin.Int': FqName@18) = null
+    packageFragments('kotlin.String': FqName@19) = null
+    packageFragments('kotlin.Throwable': FqName@20) = null
+    packageFragments('kotlin.io': FqName@21) = null
+    packageFragments('kotlin.jvm': FqName@22) = null
+    packageFragments('kotlin.tailRecursive': FqName@23) = null
+    packageFragments('tailRecursive': FqName@24) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('equals': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('minus': Name@28) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('test': Name@29) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Int': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('String': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Throwable': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('tailRecursive': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('Throwable': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('minus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('tailRecursive': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('test': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('minus': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('test': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@36) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    _functions('equals': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    _functions('minus': Name@28) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    _functions('test': Name@29) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('minus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('test': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('equals': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('minus': Name@30) = EmptyList@34[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('java.lang.String': FqName@13) = null
-    _packageFragments('java.lang.tailRecursive': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.String': FqName@17) = null
-    _packageFragments('kotlin.io': FqName@18) = null
-    _packageFragments('kotlin.jvm': FqName@19) = null
-    _packageFragments('kotlin.tailRecursive': FqName@20) = null
-    _packageFragments('tailRecursive': FqName@21) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('java.lang.String': FqName@13) = null
+    packageFragments('java.lang.tailRecursive': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.String': FqName@17) = null
+    packageFragments('kotlin.io': FqName@18) = null
+    packageFragments('kotlin.jvm': FqName@19) = null
+    packageFragments('kotlin.tailRecursive': FqName@20) = null
+    packageFragments('tailRecursive': FqName@21) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('compareTo': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('equals': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('plus': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('test': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('test': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('plus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@34) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('compareTo': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('equals': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('plus': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('test': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('test': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('plus': Name@28) = EmptyList@32[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('java.lang.String': FqName@13) = null
-    _packageFragments('java.lang.tailRecursive': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.String': FqName@17) = null
-    _packageFragments('kotlin.io': FqName@18) = null
-    _packageFragments('kotlin.jvm': FqName@19) = null
-    _packageFragments('kotlin.tailRecursive': FqName@20) = null
-    _packageFragments('tailRecursive': FqName@21) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('java.lang.String': FqName@13) = null
+    packageFragments('java.lang.tailRecursive': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.String': FqName@17) = null
+    packageFragments('kotlin.io': FqName@18) = null
+    packageFragments('kotlin.jvm': FqName@19) = null
+    packageFragments('kotlin.tailRecursive': FqName@20) = null
+    packageFragments('tailRecursive': FqName@21) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('compareTo': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('equals': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('plus': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('test': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('test': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('plus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@34) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('compareTo': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('equals': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('plus': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('test': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('test': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('plus': Name@28) = EmptyList@32[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('java.lang.String': FqName@13) = null
-    _packageFragments('java.lang.tailRecursive': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.String': FqName@17) = null
-    _packageFragments('kotlin.io': FqName@18) = null
-    _packageFragments('kotlin.jvm': FqName@19) = null
-    _packageFragments('kotlin.tailRecursive': FqName@20) = null
-    _packageFragments('tailRecursive': FqName@21) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('java.lang.String': FqName@13) = null
+    packageFragments('java.lang.tailRecursive': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.String': FqName@17) = null
+    packageFragments('kotlin.io': FqName@18) = null
+    packageFragments('kotlin.jvm': FqName@19) = null
+    packageFragments('kotlin.tailRecursive': FqName@20) = null
+    packageFragments('tailRecursive': FqName@21) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('equals': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('minus': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('plus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('test': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('plus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('minus': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('plus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@33) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('equals': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('minus': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('plus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('test': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('plus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('equals': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('minus': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('plus': Name@27) = EmptyList@31[empty] // 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
-    _type = JetTypeImpl@3['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@2
+    type = JetTypeImpl@3['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@4 {
-    _packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    _packageFragments('Long': FqName@7) = null
-    _packageFragments('String': FqName@8) = null
-    _packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    _packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    _packageFragments('java.lang.Long': FqName@13) = null
-    _packageFragments('java.lang.String': FqName@14) = null
-    _packageFragments('java.lang.tailRecursive': FqName@15) = null
-    _packageFragments('kotlin': FqName@16) = null
-    _packageFragments('kotlin.Long': FqName@17) = null
-    _packageFragments('kotlin.String': FqName@18) = null
-    _packageFragments('kotlin.io': FqName@19) = null
-    _packageFragments('kotlin.jvm': FqName@20) = null
-    _packageFragments('kotlin.tailRecursive': FqName@21) = null
-    _packageFragments('tailRecursive': FqName@22) = null
+    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
+    packageFragments('Long': FqName@7) = null
+    packageFragments('String': FqName@8) = null
+    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
+    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
+    packageFragments('java.lang.Long': FqName@13) = null
+    packageFragments('java.lang.String': FqName@14) = null
+    packageFragments('java.lang.tailRecursive': FqName@15) = null
+    packageFragments('kotlin': FqName@16) = null
+    packageFragments('kotlin.Long': FqName@17) = null
+    packageFragments('kotlin.String': FqName@18) = null
+    packageFragments('kotlin.io': FqName@19) = null
+    packageFragments('kotlin.jvm': FqName@20) = null
+    packageFragments('kotlin.tailRecursive': FqName@21) = null
+    packageFragments('tailRecursive': FqName@22) = null
 }
 
 LazyJavaPackageFragment@6['<root>'] {
-    _functions('equals': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    _functions('invoke': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    _functions('minus': Name@27) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    _functions('plus': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    _functions('sum': Name@29) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    _functions('toLong': Name@30) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Long': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('String': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('sum': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('tailRecursive': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('toLong': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('Long': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('invoke': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('plus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('sum': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('tailRecursive': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('toLong': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('equals': Name@26) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('invoke': Name@27) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('minus': Name@28) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('plus': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('sum': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('toLong': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@36) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    _functions('equals': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    _functions('invoke': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    _functions('minus': Name@27) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    _functions('plus': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    _functions('sum': Name@29) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    _functions('toLong': Name@30) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('sum': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('toLong': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('invoke': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('plus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('sum': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('toLong': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('equals': Name@26) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('invoke': Name@27) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('minus': Name@28) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('plus': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('sum': Name@30) = EmptyList@34[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('java.lang.String': FqName@13) = null
-    _packageFragments('java.lang.tailRecursive': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.String': FqName@17) = null
-    _packageFragments('kotlin.io': FqName@18) = null
-    _packageFragments('kotlin.jvm': FqName@19) = null
-    _packageFragments('kotlin.tailRecursive': FqName@20) = null
-    _packageFragments('tailRecursive': FqName@21) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('java.lang.String': FqName@13) = null
+    packageFragments('java.lang.tailRecursive': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.String': FqName@17) = null
+    packageFragments('kotlin.io': FqName@18) = null
+    packageFragments('kotlin.jvm': FqName@19) = null
+    packageFragments('kotlin.tailRecursive': FqName@20) = null
+    packageFragments('tailRecursive': FqName@21) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('compareTo': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('foo': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Unit': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('Unit': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('compareTo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('compareTo': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('foo': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('minus': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@33) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('compareTo': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('foo': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('compareTo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('compareTo': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('foo': Name@27) = EmptyList@31[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('java.lang.String': FqName@13) = null
-    _packageFragments('java.lang.tailRecursive': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.String': FqName@17) = null
-    _packageFragments('kotlin.io': FqName@18) = null
-    _packageFragments('kotlin.jvm': FqName@19) = null
-    _packageFragments('kotlin.tailRecursive': FqName@20) = null
-    _packageFragments('tailRecursive': FqName@21) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('java.lang.String': FqName@13) = null
+    packageFragments('java.lang.tailRecursive': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.String': FqName@17) = null
+    packageFragments('kotlin.io': FqName@18) = null
+    packageFragments('kotlin.jvm': FqName@19) = null
+    packageFragments('kotlin.tailRecursive': FqName@20) = null
+    packageFragments('tailRecursive': FqName@21) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('equals': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('foo': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('foo': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('minus': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@32) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('equals': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('foo': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('minus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('foo': Name@26) = EmptyList@30[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaClassDescriptor@3['Exception'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@4['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@4['Exception']
 }
 
 LazyJavaClassTypeConstructor@4['Exception'] {
-    _parameters = ArrayList@5[empty]
-    _supertypes = ArrayList@6[1] { LazyJavaClassifierType@7['Throwable'] }
+    parameters = ArrayList@5[empty]
+    supertypes = ArrayList@6[1] { LazyJavaClassifierType@7['Throwable'] }
 }
 
 LazyJavaClassifierType@7['Throwable'] {
-    _arguments = ArrayList@8[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@9
-    classifier = JavaClassImpl@10['Throwable']
+    arguments = ArrayList@8[empty]
+    classifier = JavaClassImpl@9['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@10
 }
 
 LazyJavaPackageFragmentProvider@11 {
-    _packageFragments('<root>': FqName@12) = LazyJavaPackageFragment@13['<root>']
-    _packageFragments('Boolean': FqName@14) = null
-    _packageFragments('Exception': FqName@15) = null
-    _packageFragments('String': FqName@16) = null
-    _packageFragments('Unit': FqName@17) = null
-    _packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    _packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    _packageFragments('java.lang.Boolean': FqName@22) = null
-    _packageFragments('java.lang.Exception': FqName@23) = null
-    _packageFragments('java.lang.String': FqName@24) = null
-    _packageFragments('java.lang.Unit': FqName@25) = null
-    _packageFragments('java.lang.tailRecursive': FqName@26) = null
-    _packageFragments('kotlin': FqName@27) = null
-    _packageFragments('kotlin.Boolean': FqName@28) = null
-    _packageFragments('kotlin.Exception': FqName@29) = null
-    _packageFragments('kotlin.String': FqName@30) = null
-    _packageFragments('kotlin.Unit': FqName@31) = null
-    _packageFragments('kotlin.io': FqName@32) = null
-    _packageFragments('kotlin.jvm': FqName@33) = null
-    _packageFragments('kotlin.tailRecursive': FqName@34) = null
-    _packageFragments('tailRecursive': FqName@35) = null
+    packageFragments('<root>': FqName@12) = LazyJavaPackageFragment@13['<root>']
+    packageFragments('Boolean': FqName@14) = null
+    packageFragments('Exception': FqName@15) = null
+    packageFragments('String': FqName@16) = null
+    packageFragments('Unit': FqName@17) = null
+    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
+    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
+    packageFragments('java.lang.Boolean': FqName@22) = null
+    packageFragments('java.lang.Exception': FqName@23) = null
+    packageFragments('java.lang.String': FqName@24) = null
+    packageFragments('java.lang.Unit': FqName@25) = null
+    packageFragments('java.lang.tailRecursive': FqName@26) = null
+    packageFragments('kotlin': FqName@27) = null
+    packageFragments('kotlin.Boolean': FqName@28) = null
+    packageFragments('kotlin.Exception': FqName@29) = null
+    packageFragments('kotlin.String': FqName@30) = null
+    packageFragments('kotlin.Unit': FqName@31) = null
+    packageFragments('kotlin.io': FqName@32) = null
+    packageFragments('kotlin.jvm': FqName@33) = null
+    packageFragments('kotlin.tailRecursive': FqName@34) = 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
-    _functions('test': Name@40) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Boolean': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Exception': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('String': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Unit': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('not': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('tailRecursive': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('test': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('Boolean': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('Exception': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('String': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('Unit': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('not': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('tailRecursive': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('test': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('not': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('test': Name@44) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@38
 }
 
 LazyJavaPackageFragment@19['java'] {
-    _functions('lang': Name@48) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('lang': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    deserializedPackageScope = Empty@45 // 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
-    _functions('test': Name@40) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('Exception': Name@42) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('not': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('test': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('Exception': Name@39) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('not': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('test': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('not': Name@42) = EmptyList@46[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyAnnotationDescriptor@3 {
-    _resolutionResults = OverloadResolutionResultsImpl@4
-    _type = JetTypeImpl@5['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@4
+    type = JetTypeImpl@5['tailRecursive']
 }
 
 LazyAnnotationDescriptor@6 {
-    _resolutionResults = OverloadResolutionResultsImpl@7
-    _type = JetTypeImpl@8['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@7
+    type = JetTypeImpl@8['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@9 {
-    _packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
-    _packageFragments('A': FqName@12) = null
-    _packageFragments('Int': FqName@13) = null
-    _packageFragments('String': FqName@14) = null
-    _packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
-    _packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
-    _packageFragments('java.lang.A': FqName@19) = null
-    _packageFragments('java.lang.Int': FqName@20) = null
-    _packageFragments('java.lang.String': FqName@21) = null
-    _packageFragments('java.lang.tailRecursive': FqName@22) = null
-    _packageFragments('kotlin': FqName@23) = null
-    _packageFragments('kotlin.A': FqName@24) = null
-    _packageFragments('kotlin.Int': FqName@25) = null
-    _packageFragments('kotlin.String': FqName@26) = null
-    _packageFragments('kotlin.io': FqName@27) = null
-    _packageFragments('kotlin.jvm': FqName@28) = null
-    _packageFragments('kotlin.tailRecursive': FqName@29) = null
-    _packageFragments('tailRecursive': FqName@30) = null
+    packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
+    packageFragments('A': FqName@12) = null
+    packageFragments('Int': FqName@13) = null
+    packageFragments('String': FqName@14) = null
+    packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
+    packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
+    packageFragments('java.lang.A': FqName@19) = null
+    packageFragments('java.lang.Int': FqName@20) = null
+    packageFragments('java.lang.String': FqName@21) = null
+    packageFragments('java.lang.tailRecursive': FqName@22) = null
+    packageFragments('kotlin': FqName@23) = null
+    packageFragments('kotlin.A': FqName@24) = null
+    packageFragments('kotlin.Int': FqName@25) = null
+    packageFragments('kotlin.String': FqName@26) = null
+    packageFragments('kotlin.io': FqName@27) = null
+    packageFragments('kotlin.jvm': FqName@28) = null
+    packageFragments('kotlin.tailRecursive': FqName@29) = null
+    packageFragments('tailRecursive': FqName@30) = null
 }
 
 LazyJavaPackageFragment@11['<root>'] {
-    _functions('A': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    _functions('compareTo': Name@34) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    _functions('f1': Name@35) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    _functions('f2': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    _functions('f3': Name@37) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    _functions('minus': Name@38) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('A': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('Int': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('String': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('compareTo': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('f1': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('f2': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('f3': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('minus': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('tailRecursive': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('A': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('Int': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('String': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('compareTo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('f1': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('f2': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('f3': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('minus': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('tailRecursive': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('A': Name@31) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('compareTo': Name@35) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('f1': Name@36) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('f2': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('f3': Name@38) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('minus': Name@39) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@32
 }
 
 LazyJavaPackageFragment@16['java'] {
-    _functions('lang': Name@44) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('lang': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    deserializedPackageScope = Empty@41 // 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('f1': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('f2': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('f3': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('minus': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('compareTo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('f1': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('f2': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('f3': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('minus': Name@39) = null // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('Unit': FqName@8) = null
-    _packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    _packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    _packageFragments('java.lang.Int': FqName@13) = null
-    _packageFragments('java.lang.String': FqName@14) = null
-    _packageFragments('java.lang.Unit': FqName@15) = null
-    _packageFragments('java.lang.tailRecursive': FqName@16) = null
-    _packageFragments('kotlin': FqName@17) = null
-    _packageFragments('kotlin.Int': FqName@18) = null
-    _packageFragments('kotlin.String': FqName@19) = null
-    _packageFragments('kotlin.Unit': FqName@20) = null
-    _packageFragments('kotlin.io': FqName@21) = null
-    _packageFragments('kotlin.jvm': FqName@22) = null
-    _packageFragments('kotlin.tailRecursive': FqName@23) = null
-    _packageFragments('tailRecursive': FqName@24) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('Unit': FqName@8) = null
+    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
+    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
+    packageFragments('java.lang.Int': FqName@13) = null
+    packageFragments('java.lang.String': FqName@14) = null
+    packageFragments('java.lang.Unit': FqName@15) = null
+    packageFragments('java.lang.tailRecursive': FqName@16) = null
+    packageFragments('kotlin': FqName@17) = null
+    packageFragments('kotlin.Int': FqName@18) = null
+    packageFragments('kotlin.String': FqName@19) = null
+    packageFragments('kotlin.Unit': FqName@20) = null
+    packageFragments('kotlin.io': FqName@21) = null
+    packageFragments('kotlin.jvm': FqName@22) = null
+    packageFragments('kotlin.tailRecursive': FqName@23) = null
+    packageFragments('tailRecursive': FqName@24) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('compareTo': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('equals': Name@28) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('minus': Name@29) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('test': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('String': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Unit': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('minus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('tailRecursive': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('Unit': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('compareTo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('minus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('tailRecursive': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('test': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('compareTo': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('minus': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('test': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@37) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@34 // 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
-    _functions('equals': Name@28) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    _functions('minus': Name@29) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    _functions('test': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('minus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('compareTo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('minus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('test': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('compareTo': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('equals': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('minus': Name@31) = EmptyList@35[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('java.lang.String': FqName@13) = null
-    _packageFragments('java.lang.tailRecursive': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.String': FqName@17) = null
-    _packageFragments('kotlin.io': FqName@18) = null
-    _packageFragments('kotlin.jvm': FqName@19) = null
-    _packageFragments('kotlin.tailRecursive': FqName@20) = null
-    _packageFragments('tailRecursive': FqName@21) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('java.lang.String': FqName@13) = null
+    packageFragments('java.lang.tailRecursive': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.String': FqName@17) = null
+    packageFragments('kotlin.io': FqName@18) = null
+    packageFragments('kotlin.jvm': FqName@19) = null
+    packageFragments('kotlin.tailRecursive': FqName@20) = null
+    packageFragments('tailRecursive': FqName@21) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('equals': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('minus': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('plus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('withWhen': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('plus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('withWhen': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('withWhen': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('minus': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('plus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('withWhen': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@33) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('equals': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('minus': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('plus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('withWhen': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('plus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('withWhen': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('withWhen': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('equals': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('minus': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('plus': Name@27) = EmptyList@31[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Any': FqName@6) = null
-    _packageFragments('Int': FqName@7) = null
-    _packageFragments('String': FqName@8) = null
-    _packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    _packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    _packageFragments('java.lang.Any': FqName@13) = null
-    _packageFragments('java.lang.Int': FqName@14) = null
-    _packageFragments('java.lang.String': FqName@15) = null
-    _packageFragments('java.lang.tailRecursive': FqName@16) = null
-    _packageFragments('kotlin': FqName@17) = null
-    _packageFragments('kotlin.Any': FqName@18) = null
-    _packageFragments('kotlin.Int': FqName@19) = null
-    _packageFragments('kotlin.String': FqName@20) = null
-    _packageFragments('kotlin.io': FqName@21) = null
-    _packageFragments('kotlin.jvm': FqName@22) = null
-    _packageFragments('kotlin.tailRecursive': FqName@23) = null
-    _packageFragments('tailRecursive': FqName@24) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Any': FqName@6) = null
+    packageFragments('Int': FqName@7) = null
+    packageFragments('String': FqName@8) = null
+    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
+    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
+    packageFragments('java.lang.Any': FqName@13) = null
+    packageFragments('java.lang.Int': FqName@14) = null
+    packageFragments('java.lang.String': FqName@15) = null
+    packageFragments('java.lang.tailRecursive': FqName@16) = null
+    packageFragments('kotlin': FqName@17) = null
+    packageFragments('kotlin.Any': FqName@18) = null
+    packageFragments('kotlin.Int': FqName@19) = null
+    packageFragments('kotlin.String': FqName@20) = null
+    packageFragments('kotlin.io': FqName@21) = null
+    packageFragments('kotlin.jvm': FqName@22) = null
+    packageFragments('kotlin.tailRecursive': FqName@23) = null
+    packageFragments('tailRecursive': FqName@24) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('contains': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('equals': Name@28) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('minus': Name@29) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('plus': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('rangeTo': Name@31) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('withWhen': Name@32) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Any': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Int': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('String': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('contains': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('minus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('plus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('rangeTo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('tailRecursive': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('withWhen': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('Any': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('contains': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('minus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('plus': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('rangeTo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('tailRecursive': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('withWhen': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('contains': Name@29) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@30) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('minus': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('plus': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('rangeTo': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('withWhen': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@39) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@36 // 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
-    _functions('equals': Name@28) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    _functions('minus': Name@29) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    _functions('plus': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    _functions('rangeTo': Name@31) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    _functions('withWhen': Name@32) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('contains': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('minus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('plus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('rangeTo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('withWhen': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('contains': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('minus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('plus': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('rangeTo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('withWhen': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('contains': Name@29) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('equals': Name@30) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('minus': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('plus': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('rangeTo': Name@33) = EmptyList@37[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    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
-    _functionTypeForSamInterface = null
-    _typeConstructor = LazyJavaClassTypeConstructor@11['IllegalStateException']
-    defaultType = JetTypeImpl@12['IllegalStateException']
+    constructors = ArrayList@6[4] { JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], ... } // through LazyJavaClassMemberScope@10
+    defaultType = JetTypeImpl@11['IllegalStateException']
+    functionTypeForSamInterface = null
+    typeConstructor = LazyJavaClassTypeConstructor@12['IllegalStateException']
 }
 
 LazyJavaClassDescriptor@13['RuntimeException'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@14['RuntimeException']
+    typeConstructor = LazyJavaClassTypeConstructor@14['RuntimeException']
 }
 
 LazyJavaClassTypeConstructor@4['Exception'] {
-    _parameters = ArrayList@15[empty]
-    _supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Throwable'] }
+    parameters = ArrayList@15[empty]
+    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Throwable'] }
 }
 
-LazyJavaClassTypeConstructor@11['IllegalStateException'] {
-    _parameters = ArrayList@18[empty]
-    _supertypes = ArrayList@19[1] { LazyJavaClassifierType@20['RuntimeException'] }
+LazyJavaClassTypeConstructor@12['IllegalStateException'] {
+    parameters = ArrayList@18[empty]
+    supertypes = ArrayList@19[1] { LazyJavaClassifierType@20['RuntimeException'] }
 }
 
 LazyJavaClassTypeConstructor@14['RuntimeException'] {
-    _parameters = ArrayList@21[empty]
-    _supertypes = ArrayList@22[1] { LazyJavaClassifierType@23['Exception'] }
+    parameters = ArrayList@21[empty]
+    supertypes = ArrayList@22[1] { LazyJavaClassifierType@23['Exception'] }
 }
 
 LazyJavaClassifierType@23['Exception'] {
-    _arguments = ArrayList@24[empty]
-    _typeConstructor = LazyJavaClassTypeConstructor@4['Exception']
+    arguments = ArrayList@24[empty]
     classifier = JavaClassImpl@25['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@4['Exception']
 }
 
 LazyJavaClassifierType@20['RuntimeException'] {
-    _arguments = ArrayList@26[empty]
-    _typeConstructor = LazyJavaClassTypeConstructor@14['RuntimeException']
+    arguments = ArrayList@26[empty]
     classifier = JavaClassImpl@27['RuntimeException']
+    typeConstructor = LazyJavaClassTypeConstructor@14['RuntimeException']
 }
 
 LazyJavaClassifierType@28['String'] {
-    _arguments = ArrayList@29[empty]
-    _nullable = 'false': Boolean@30
-    _typeConstructor = DeserializedClassTypeConstructor@31
-    classifier = JavaClassImpl@32['String']
+    arguments = ArrayList@29[empty]
+    classifier = JavaClassImpl@30['String']
+    nullable = 'false': Boolean@31
+    typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@33['String'] {
-    _arguments = ArrayList@34[empty]
-    _nullable = 'false': Boolean@30
-    _typeConstructor = DeserializedClassTypeConstructor@31
+    arguments = ArrayList@34[empty]
     classifier = JavaClassImpl@35['String']
+    nullable = 'false': Boolean@31
+    typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@36['String'] {
-    _arguments = ArrayList@37[empty]
-    _nullable = 'true': Boolean@38
-    _typeConstructor = DeserializedClassTypeConstructor@31
-    classifier = JavaClassImpl@35['String']
+    arguments = ArrayList@37[empty]
+    classifier = JavaClassImpl@30['String']
+    nullable = 'true': Boolean@38
+    typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@39['String'] {
-    _arguments = ArrayList@40[empty]
-    _nullable = 'true': Boolean@38
-    _typeConstructor = DeserializedClassTypeConstructor@31
-    classifier = JavaClassImpl@32['String']
+    arguments = ArrayList@40[empty]
+    classifier = JavaClassImpl@35['String']
+    nullable = 'true': Boolean@38
+    typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@41['Throwable'] {
-    _arguments = ArrayList@42[empty]
-    _nullable = 'false': Boolean@30
-    _typeConstructor = DeserializedClassTypeConstructor@43
-    classifier = JavaClassImpl@44['Throwable']
+    arguments = ArrayList@42[empty]
+    classifier = JavaClassImpl@43['Throwable']
+    nullable = 'false': Boolean@31
+    typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaClassifierType@45['Throwable'] {
-    _arguments = ArrayList@46[empty]
-    _nullable = 'false': Boolean@30
-    _typeConstructor = DeserializedClassTypeConstructor@43
+    arguments = ArrayList@46[empty]
     classifier = JavaClassImpl@47['Throwable']
+    nullable = 'false': Boolean@31
+    typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaClassifierType@48['Throwable'] {
-    _arguments = ArrayList@49[empty]
-    _nullable = 'true': Boolean@38
-    _typeConstructor = DeserializedClassTypeConstructor@43
-    classifier = JavaClassImpl@44['Throwable']
+    arguments = ArrayList@49[empty]
+    classifier = JavaClassImpl@47['Throwable']
+    nullable = 'true': Boolean@38
+    typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaClassifierType@50['Throwable'] {
-    _arguments = ArrayList@51[empty]
-    _nullable = 'true': Boolean@38
-    _typeConstructor = DeserializedClassTypeConstructor@43
-    classifier = JavaClassImpl@47['Throwable']
+    arguments = ArrayList@51[empty]
+    classifier = JavaClassImpl@43['Throwable']
+    nullable = 'true': Boolean@38
+    typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaClassifierType@17['Throwable'] {
-    _arguments = ArrayList@52[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@43
+    arguments = ArrayList@52[empty]
     classifier = JavaClassImpl@53['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaPackageFragmentProvider@54 {
-    _packageFragments('<root>': FqName@55) = LazyJavaPackageFragment@56['<root>']
-    _packageFragments('Any': FqName@57) = null
-    _packageFragments('Int': FqName@58) = null
-    _packageFragments('Number': FqName@59) = null
-    _packageFragments('String': FqName@60) = null
-    _packageFragments('java': FqName@61) = LazyJavaPackageFragment@62['java']
-    _packageFragments('java.lang': FqName@63) = LazyJavaPackageFragment@64['lang']
-    _packageFragments('java.lang.Any': FqName@65) = null
-    _packageFragments('java.lang.Int': FqName@66) = null
-    _packageFragments('java.lang.Number': FqName@67) = null
-    _packageFragments('java.lang.String': FqName@68) = null
-    _packageFragments('java.lang.tailRecursive': FqName@69) = null
-    _packageFragments('kotlin': FqName@70) = null
-    _packageFragments('kotlin.Any': FqName@71) = null
-    _packageFragments('kotlin.Int': FqName@72) = null
-    _packageFragments('kotlin.Number': FqName@73) = null
-    _packageFragments('kotlin.String': FqName@74) = null
-    _packageFragments('kotlin.io': FqName@75) = null
-    _packageFragments('kotlin.jvm': FqName@76) = null
-    _packageFragments('kotlin.tailRecursive': FqName@77) = null
-    _packageFragments('tailRecursive': FqName@78) = null
+    packageFragments('<root>': FqName@55) = LazyJavaPackageFragment@56['<root>']
+    packageFragments('Any': FqName@57) = null
+    packageFragments('Int': FqName@58) = null
+    packageFragments('Number': FqName@59) = null
+    packageFragments('String': FqName@60) = null
+    packageFragments('java': FqName@61) = LazyJavaPackageFragment@62['java']
+    packageFragments('java.lang': FqName@63) = LazyJavaPackageFragment@64['lang']
+    packageFragments('java.lang.Any': FqName@65) = null
+    packageFragments('java.lang.Int': FqName@66) = null
+    packageFragments('java.lang.Number': FqName@67) = null
+    packageFragments('java.lang.String': FqName@68) = null
+    packageFragments('java.lang.tailRecursive': FqName@69) = null
+    packageFragments('kotlin': FqName@70) = null
+    packageFragments('kotlin.Any': FqName@71) = null
+    packageFragments('kotlin.Int': FqName@72) = null
+    packageFragments('kotlin.Number': FqName@73) = null
+    packageFragments('kotlin.String': FqName@74) = null
+    packageFragments('kotlin.io': FqName@75) = null
+    packageFragments('kotlin.jvm': FqName@76) = null
+    packageFragments('kotlin.tailRecursive': FqName@77) = 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
-    _functions('equals': Name@83) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    _functions('minus': Name@84) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    _functions('withWhen': Name@85) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('Any': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('IllegalStateException': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('Int': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('Number': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('equals': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('minus': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('tailRecursive': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('withWhen': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('Any': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('IllegalStateException': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('Int': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('Number': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('String': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('equals': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('minus': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('tailRecursive': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('withWhen': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('IllegalStateException': Name@82) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('equals': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('minus': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('withWhen': Name@89) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@81
+    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
 LazyJavaPackageFragment@62['java'] {
-    _functions('lang': Name@93) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('lang': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    deserializedPackageScope = Empty@90 // 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
-    _functions('equals': Name@83) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    _functions('minus': Name@84) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    _functions('withWhen': Name@85) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('IllegalStateException': Name@80) = LazyJavaClassDescriptor@5['IllegalStateException'] // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('equals': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('minus': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('withWhen': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('IllegalStateException': Name@82) = LazyJavaClassDescriptor@5['IllegalStateException'] // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('equals': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('minus': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('withWhen': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@97
+    functions('IllegalStateException': Name@82) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@97
+    functions('equals': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@97
+    functions('minus': Name@87) = EmptyList@91[empty] // 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
-    _type = JetTypeImpl@2['tailRecursive']
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['tailRecursive']
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Int': FqName@12) = null
-    _packageFragments('java.lang.String': FqName@13) = null
-    _packageFragments('java.lang.tailRecursive': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Int': FqName@16) = null
-    _packageFragments('kotlin.String': FqName@17) = null
-    _packageFragments('kotlin.io': FqName@18) = null
-    _packageFragments('kotlin.jvm': FqName@19) = null
-    _packageFragments('kotlin.tailRecursive': FqName@20) = null
-    _packageFragments('tailRecursive': FqName@21) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Int': FqName@12) = null
+    packageFragments('java.lang.String': FqName@13) = null
+    packageFragments('java.lang.tailRecursive': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Int': FqName@16) = null
+    packageFragments('kotlin.String': FqName@17) = null
+    packageFragments('kotlin.io': FqName@18) = null
+    packageFragments('kotlin.jvm': FqName@19) = null
+    packageFragments('kotlin.tailRecursive': FqName@20) = null
+    packageFragments('tailRecursive': FqName@21) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('equals': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('minus': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('plus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('withWhen2': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('plus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('withWhen2': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('withWhen2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('minus': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('plus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('withWhen2': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@33) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('equals': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('minus': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('plus': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('withWhen2': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('plus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('withWhen2': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('withWhen2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('equals': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('minus': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('plus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('withWhen2': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
 }