Update lazy logs after field rename

compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutInitializer.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutType.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/abstractDelegatedProperty.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/backingField.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTrait.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTraitTypeMismatch.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/genericGetter.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/getterWithSubtype.lazy.log

@@ -1,65 +1,65 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('A': FqName@3) = null
-    _packageFragments('Any': FqName@4) = null
-    _packageFragments('Base': FqName@5) = null
-    _packageFragments('Derived': FqName@6) = null
-    _packageFragments('PropertyMetadata': FqName@7) = null
-    _packageFragments('a': 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.Base': FqName@14) = null
-    _packageFragments('java.lang.Derived': FqName@15) = null
-    _packageFragments('java.lang.PropertyMetadata': FqName@16) = null
-    _packageFragments('kotlin': FqName@17) = null
-    _packageFragments('kotlin.Any': FqName@18) = null
-    _packageFragments('kotlin.Base': FqName@19) = null
-    _packageFragments('kotlin.Derived': FqName@20) = null
-    _packageFragments('kotlin.PropertyMetadata': FqName@21) = null
-    _packageFragments('kotlin.io': FqName@22) = null
-    _packageFragments('kotlin.jvm': FqName@23) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('A': FqName@3) = null
+    packageFragments('Any': FqName@4) = null
+    packageFragments('Base': FqName@5) = null
+    packageFragments('Derived': FqName@6) = null
+    packageFragments('PropertyMetadata': FqName@7) = null
+    packageFragments('a': 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.Base': FqName@14) = null
+    packageFragments('java.lang.Derived': FqName@15) = null
+    packageFragments('java.lang.PropertyMetadata': FqName@16) = null
+    packageFragments('kotlin': FqName@17) = null
+    packageFragments('kotlin.Any': FqName@18) = null
+    packageFragments('kotlin.Base': FqName@19) = null
+    packageFragments('kotlin.Derived': FqName@20) = null
+    packageFragments('kotlin.PropertyMetadata': FqName@21) = null
+    packageFragments('kotlin.io': FqName@22) = null
+    packageFragments('kotlin.jvm': FqName@23) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    _functions('A': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('Derived': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('PropertyMetadataImpl': Name@28) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('equals': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('get': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('propertyDelegated': Name@31) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('A': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Any': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Derived': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('PropertyMetadata': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('get': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('A': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('Any': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('Derived': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('PropertyMetadata': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('get': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('A': Name@24) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('Derived': Name@27) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('equals': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('get': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('propertyDelegated': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@36) = EmptyList@25[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('A': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    _functions('Derived': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    _functions('PropertyMetadataImpl': Name@28) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    _functions('equals': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    _functions('get': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    _functions('propertyDelegated': Name@31) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@40
     classes('A': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@40
     classes('Derived': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('get': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('get': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('A': Name@24) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('Derived': Name@27) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('equals': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('get': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('propertyDelegated': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
     memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
 }

compiler/testData/diagnostics/tests/delegatedProperty/inTrait.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/incompleteTypeInference.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.lazy.log

@@ -9,83 +9,71 @@ DescriptorResolver@0 {
 }
 
 LazyJavaPackageFragmentProvider@8 {
-    _packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    _packageFragments('A': FqName@11) = null
-    _packageFragments('Any': FqName@12) = null
-    _packageFragments('B': FqName@13) = null
-    _packageFragments('Int': FqName@14) = null
-    _packageFragments('MyProperty': FqName@15) = null
-    _packageFragments('MyPropertyContainer': FqName@16) = null
-    _packageFragments('O': FqName@17) = null
-    _packageFragments('Outer': FqName@18) = null
-    _packageFragments('PropertyMetadata': FqName@19) = null
-    _packageFragments('R': FqName@20) = null
-    _packageFragments('String': FqName@21) = null
-    _packageFragments('T': FqName@22) = null
-    _packageFragments('baz': FqName@23) = null
-    _packageFragments('baz.A': FqName@24) = null
-    _packageFragments('baz.Any': FqName@25) = null
-    _packageFragments('baz.B': FqName@26) = null
-    _packageFragments('baz.Int': FqName@27) = null
-    _packageFragments('baz.MyProperty': FqName@28) = null
-    _packageFragments('baz.MyPropertyContainer': FqName@29) = null
-    _packageFragments('baz.O': FqName@30) = null
-    _packageFragments('baz.Outer': FqName@31) = null
-    _packageFragments('baz.PropertyMetadata': FqName@32) = null
-    _packageFragments('baz.R': FqName@33) = null
-    _packageFragments('baz.String': FqName@34) = null
-    _packageFragments('baz.T': FqName@35) = null
-    _packageFragments('java': FqName@36) = LazyJavaPackageFragment@37['java']
-    _packageFragments('java.lang': FqName@38) = LazyJavaPackageFragment@39['lang']
-    _packageFragments('java.lang.A': FqName@40) = null
-    _packageFragments('java.lang.Any': FqName@41) = null
-    _packageFragments('java.lang.B': FqName@42) = null
-    _packageFragments('java.lang.Int': FqName@43) = null
-    _packageFragments('java.lang.MyProperty': FqName@44) = null
-    _packageFragments('java.lang.MyPropertyContainer': FqName@45) = null
-    _packageFragments('java.lang.O': FqName@46) = null
-    _packageFragments('java.lang.Outer': FqName@47) = null
-    _packageFragments('java.lang.PropertyMetadata': FqName@48) = null
-    _packageFragments('java.lang.R': FqName@49) = null
-    _packageFragments('java.lang.String': FqName@50) = null
-    _packageFragments('java.lang.T': FqName@51) = null
-    _packageFragments('kotlin': FqName@52) = null
-    _packageFragments('kotlin.A': FqName@53) = null
-    _packageFragments('kotlin.Any': FqName@54) = null
-    _packageFragments('kotlin.B': FqName@55) = null
-    _packageFragments('kotlin.Int': FqName@56) = null
-    _packageFragments('kotlin.MyProperty': FqName@57) = null
-    _packageFragments('kotlin.MyPropertyContainer': FqName@58) = null
-    _packageFragments('kotlin.O': FqName@59) = null
-    _packageFragments('kotlin.Outer': FqName@60) = null
-    _packageFragments('kotlin.PropertyMetadata': FqName@61) = null
-    _packageFragments('kotlin.R': FqName@62) = null
-    _packageFragments('kotlin.String': FqName@63) = null
-    _packageFragments('kotlin.T': FqName@64) = null
-    _packageFragments('kotlin.io': FqName@65) = null
-    _packageFragments('kotlin.jvm': FqName@66) = null
+    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
+    packageFragments('A': FqName@11) = null
+    packageFragments('Any': FqName@12) = null
+    packageFragments('B': FqName@13) = null
+    packageFragments('Int': FqName@14) = null
+    packageFragments('MyProperty': FqName@15) = null
+    packageFragments('MyPropertyContainer': FqName@16) = null
+    packageFragments('O': FqName@17) = null
+    packageFragments('Outer': FqName@18) = null
+    packageFragments('PropertyMetadata': FqName@19) = null
+    packageFragments('R': FqName@20) = null
+    packageFragments('String': FqName@21) = null
+    packageFragments('T': FqName@22) = null
+    packageFragments('baz': FqName@23) = null
+    packageFragments('baz.A': FqName@24) = null
+    packageFragments('baz.Any': FqName@25) = null
+    packageFragments('baz.B': FqName@26) = null
+    packageFragments('baz.Int': FqName@27) = null
+    packageFragments('baz.MyProperty': FqName@28) = null
+    packageFragments('baz.MyPropertyContainer': FqName@29) = null
+    packageFragments('baz.O': FqName@30) = null
+    packageFragments('baz.Outer': FqName@31) = null
+    packageFragments('baz.PropertyMetadata': FqName@32) = null
+    packageFragments('baz.R': FqName@33) = null
+    packageFragments('baz.String': FqName@34) = null
+    packageFragments('baz.T': FqName@35) = null
+    packageFragments('java': FqName@36) = LazyJavaPackageFragment@37['java']
+    packageFragments('java.lang': FqName@38) = LazyJavaPackageFragment@39['lang']
+    packageFragments('java.lang.A': FqName@40) = null
+    packageFragments('java.lang.Any': FqName@41) = null
+    packageFragments('java.lang.B': FqName@42) = null
+    packageFragments('java.lang.Int': FqName@43) = null
+    packageFragments('java.lang.MyProperty': FqName@44) = null
+    packageFragments('java.lang.MyPropertyContainer': FqName@45) = null
+    packageFragments('java.lang.O': FqName@46) = null
+    packageFragments('java.lang.Outer': FqName@47) = null
+    packageFragments('java.lang.PropertyMetadata': FqName@48) = null
+    packageFragments('java.lang.R': FqName@49) = null
+    packageFragments('java.lang.String': FqName@50) = null
+    packageFragments('java.lang.T': FqName@51) = null
+    packageFragments('kotlin': FqName@52) = null
+    packageFragments('kotlin.A': FqName@53) = null
+    packageFragments('kotlin.Any': FqName@54) = null
+    packageFragments('kotlin.B': FqName@55) = null
+    packageFragments('kotlin.Int': FqName@56) = null
+    packageFragments('kotlin.MyProperty': FqName@57) = null
+    packageFragments('kotlin.MyPropertyContainer': FqName@58) = null
+    packageFragments('kotlin.O': FqName@59) = null
+    packageFragments('kotlin.Outer': FqName@60) = null
+    packageFragments('kotlin.PropertyMetadata': FqName@61) = null
+    packageFragments('kotlin.R': FqName@62) = null
+    packageFragments('kotlin.String': FqName@63) = null
+    packageFragments('kotlin.T': FqName@64) = null
+    packageFragments('kotlin.io': FqName@65) = null
+    packageFragments('kotlin.jvm': FqName@66) = null
 }
 
 LazyJavaPackageFragment@37['java'] {
-    _functions('lang': Name@67) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('lang': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@68
+    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@68
+    functions('lang': Name@70) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@68
+    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@68
 }
 
 LazyJavaPackageFragment@39['lang'] {
-    _functions('MyProperty': Name@73) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    _functions('PropertyMetadataImpl': Name@75) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    _functions('foo': Name@76) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    _functions('get': Name@77) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    _functions('getContainer': Name@78) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    _functions('getMyConcreteProperty': Name@79) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    _functions('getMyProperty': Name@80) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    _functions('minus': Name@81) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    _functions('plus': Name@82) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    _functions('println': Name@83) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    _functions('propertyDelegated': Name@84) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    _functions('set': Name@85) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@74
     classes('MyProperty': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
     classes('PropertyMetadataImpl': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@74
     classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@74
@@ -98,6 +86,18 @@ LazyJavaPackageFragment@39['lang'] {
     classes('println': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@74
     classes('propertyDelegated': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@74
     classes('set': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@74
+    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('MyProperty': Name@73) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('PropertyMetadataImpl': Name@75) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('foo': Name@76) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('get': Name@77) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('getContainer': Name@78) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('getMyConcreteProperty': Name@79) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('getMyProperty': Name@80) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('minus': Name@81) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('plus': Name@82) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('println': Name@83) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('propertyDelegated': Name@84) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('set': Name@85) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
     memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@74
 }

compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionGet.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/inference/labeledDelegatedExpression.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/inference/useCompleterWithoutExpectedType.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedType.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedTypeForVal.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/kt4640.lazy.log

@@ -4,51 +4,51 @@ DescriptorResolver@0 {
 }
 
 LazyJavaPackageFragmentProvider@3 {
-    _packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('ValueWrapper': FqName@7) = null
-    _packageFragments('foo': 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('kotlin': FqName@14) = null
-    _packageFragments('kotlin.Int': FqName@15) = null
-    _packageFragments('kotlin.io': FqName@16) = null
-    _packageFragments('kotlin.jvm': FqName@17) = null
+    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
+    packageFragments('Int': FqName@6) = null
+    packageFragments('ValueWrapper': FqName@7) = null
+    packageFragments('foo': 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('kotlin': FqName@14) = null
+    packageFragments('kotlin.Int': FqName@15) = null
+    packageFragments('kotlin.io': FqName@16) = null
+    packageFragments('kotlin.jvm': FqName@17) = null
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    _functions('PropertyMetadataImpl': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    _functions('ValueWrapper': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    _functions('get': Name@22) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    _functions('propertyDelegated': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('PropertyMetadataImpl': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('ValueWrapper': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('propertyDelegated': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('value': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    classes('PropertyMetadataImpl': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    classes('ValueWrapper': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    classes('propertyDelegated': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    classes('value': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('PropertyMetadataImpl': Name@20) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('ValueWrapper': Name@21) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('get': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('propertyDelegated': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@28) = EmptyList@19[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('PropertyMetadataImpl': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('ValueWrapper': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('get': Name@22) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('propertyDelegated': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('PropertyMetadataImpl': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('PropertyMetadataImpl': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@32
     classes('ValueWrapper': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@32
     classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@32
     classes('propertyDelegated': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('value': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('value': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('PropertyMetadataImpl': Name@20) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('ValueWrapper': Name@21) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('get': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('propertyDelegated': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
 }

compiler/testData/diagnostics/tests/delegatedProperty/localVariable.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedAmbiguity.lazy.log

@@ -1,63 +1,63 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('Any': FqName@3) = null
-    _packageFragments('Delegate': FqName@4) = null
-    _packageFragments('Int': FqName@5) = null
-    _packageFragments('PropertyMetadata': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('a': 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.PropertyMetadata': FqName@15) = null
-    _packageFragments('java.lang.String': FqName@16) = null
-    _packageFragments('kotlin': FqName@17) = null
-    _packageFragments('kotlin.Any': FqName@18) = null
-    _packageFragments('kotlin.Int': FqName@19) = null
-    _packageFragments('kotlin.PropertyMetadata': FqName@20) = null
-    _packageFragments('kotlin.String': FqName@21) = null
-    _packageFragments('kotlin.io': FqName@22) = null
-    _packageFragments('kotlin.jvm': FqName@23) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('Any': FqName@3) = null
+    packageFragments('Delegate': FqName@4) = null
+    packageFragments('Int': FqName@5) = null
+    packageFragments('PropertyMetadata': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('a': 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.PropertyMetadata': FqName@15) = null
+    packageFragments('java.lang.String': FqName@16) = null
+    packageFragments('kotlin': FqName@17) = null
+    packageFragments('kotlin.Any': FqName@18) = null
+    packageFragments('kotlin.Int': FqName@19) = null
+    packageFragments('kotlin.PropertyMetadata': FqName@20) = null
+    packageFragments('kotlin.String': FqName@21) = null
+    packageFragments('kotlin.io': FqName@22) = null
+    packageFragments('kotlin.jvm': FqName@23) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    _functions('Delegate': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('PropertyMetadataImpl': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('equals': Name@28) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('get': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('propertyDelegated': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Any': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Delegate': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Int': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('PropertyMetadata': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('Any': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('PropertyMetadata': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('get': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('propertyDelegated': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('Delegate': Name@26) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('equals': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('get': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('propertyDelegated': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@37) = EmptyList@25[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('Delegate': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    _functions('PropertyMetadataImpl': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    _functions('equals': Name@28) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    _functions('get': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    _functions('propertyDelegated': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('Delegate': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('get': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('propertyDelegated': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('Delegate': Name@26) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('equals': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('get': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('propertyDelegated': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
     memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
 }

compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedIncomplete.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedMissing.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedPrivate.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedWrongArguments.lazy.log

@@ -1,63 +1,63 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('Any': FqName@3) = null
-    _packageFragments('Delegate': FqName@4) = null
-    _packageFragments('Int': FqName@5) = null
-    _packageFragments('PropertyMetadata': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('a': 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.PropertyMetadata': FqName@15) = null
-    _packageFragments('java.lang.String': FqName@16) = null
-    _packageFragments('kotlin': FqName@17) = null
-    _packageFragments('kotlin.Any': FqName@18) = null
-    _packageFragments('kotlin.Int': FqName@19) = null
-    _packageFragments('kotlin.PropertyMetadata': FqName@20) = null
-    _packageFragments('kotlin.String': FqName@21) = null
-    _packageFragments('kotlin.io': FqName@22) = null
-    _packageFragments('kotlin.jvm': FqName@23) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('Any': FqName@3) = null
+    packageFragments('Delegate': FqName@4) = null
+    packageFragments('Int': FqName@5) = null
+    packageFragments('PropertyMetadata': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('a': 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.PropertyMetadata': FqName@15) = null
+    packageFragments('java.lang.String': FqName@16) = null
+    packageFragments('kotlin': FqName@17) = null
+    packageFragments('kotlin.Any': FqName@18) = null
+    packageFragments('kotlin.Int': FqName@19) = null
+    packageFragments('kotlin.PropertyMetadata': FqName@20) = null
+    packageFragments('kotlin.String': FqName@21) = null
+    packageFragments('kotlin.io': FqName@22) = null
+    packageFragments('kotlin.jvm': FqName@23) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    _functions('Delegate': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('PropertyMetadataImpl': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('equals': Name@28) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('get': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('propertyDelegated': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Any': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Delegate': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Int': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('PropertyMetadata': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('Any': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('PropertyMetadata': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('get': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('propertyDelegated': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('Delegate': Name@26) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('equals': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('get': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('propertyDelegated': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@37) = EmptyList@25[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('Delegate': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    _functions('PropertyMetadataImpl': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    _functions('equals': Name@28) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    _functions('get': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    _functions('propertyDelegated': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('Delegate': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('get': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('propertyDelegated': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('Delegate': Name@26) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('equals': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('get': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('propertyDelegated': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
     memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
 }

compiler/testData/diagnostics/tests/delegatedProperty/publicDelegatedProperty.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/redundantGetter.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/redundantSetter.lazy.log

@@ -1,63 +1,63 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('Any': FqName@3) = null
-    _packageFragments('Delegate': FqName@4) = null
-    _packageFragments('Int': FqName@5) = null
-    _packageFragments('PropertyMetadata': FqName@6) = null
-    _packageFragments('a': 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.Int': FqName@13) = null
-    _packageFragments('java.lang.PropertyMetadata': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Any': FqName@16) = null
-    _packageFragments('kotlin.Int': FqName@17) = null
-    _packageFragments('kotlin.PropertyMetadata': FqName@18) = null
-    _packageFragments('kotlin.io': FqName@19) = null
-    _packageFragments('kotlin.jvm': FqName@20) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('Any': FqName@3) = null
+    packageFragments('Delegate': FqName@4) = null
+    packageFragments('Int': FqName@5) = null
+    packageFragments('PropertyMetadata': FqName@6) = null
+    packageFragments('a': 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.Int': FqName@13) = null
+    packageFragments('java.lang.PropertyMetadata': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Any': FqName@16) = null
+    packageFragments('kotlin.Int': FqName@17) = null
+    packageFragments('kotlin.PropertyMetadata': FqName@18) = null
+    packageFragments('kotlin.io': FqName@19) = null
+    packageFragments('kotlin.jvm': FqName@20) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    _functions('Delegate': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('PropertyMetadataImpl': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('equals': Name@25) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('get': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('propertyDelegated': Name@27) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('set': Name@28) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Any': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Delegate': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Int': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('PropertyMetadata': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('PropertyMetadataImpl': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('get': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('propertyDelegated': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('set': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('Delegate': Name@23) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('equals': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('get': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('set': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@34) = EmptyList@22[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('Delegate': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('PropertyMetadataImpl': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('equals': Name@25) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('get': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('propertyDelegated': Name@27) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('set': Name@28) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Delegate': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('PropertyMetadataImpl': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('get': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('propertyDelegated': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('set': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('Delegate': Name@23) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('equals': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('get': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('set': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
     memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
 }

compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/setterWithSupertype.lazy.log

@@ -1,69 +1,69 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('A': FqName@3) = null
-    _packageFragments('Any': FqName@4) = null
-    _packageFragments('Base': FqName@5) = null
-    _packageFragments('Derived': FqName@6) = null
-    _packageFragments('PropertyMetadata': FqName@7) = null
-    _packageFragments('a': 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.Base': FqName@14) = null
-    _packageFragments('java.lang.Derived': FqName@15) = null
-    _packageFragments('java.lang.PropertyMetadata': FqName@16) = null
-    _packageFragments('kotlin': FqName@17) = null
-    _packageFragments('kotlin.Any': FqName@18) = null
-    _packageFragments('kotlin.Base': FqName@19) = null
-    _packageFragments('kotlin.Derived': FqName@20) = null
-    _packageFragments('kotlin.PropertyMetadata': FqName@21) = null
-    _packageFragments('kotlin.io': FqName@22) = null
-    _packageFragments('kotlin.jvm': FqName@23) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('A': FqName@3) = null
+    packageFragments('Any': FqName@4) = null
+    packageFragments('Base': FqName@5) = null
+    packageFragments('Derived': FqName@6) = null
+    packageFragments('PropertyMetadata': FqName@7) = null
+    packageFragments('a': 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.Base': FqName@14) = null
+    packageFragments('java.lang.Derived': FqName@15) = null
+    packageFragments('java.lang.PropertyMetadata': FqName@16) = null
+    packageFragments('kotlin': FqName@17) = null
+    packageFragments('kotlin.Any': FqName@18) = null
+    packageFragments('kotlin.Base': FqName@19) = null
+    packageFragments('kotlin.Derived': FqName@20) = null
+    packageFragments('kotlin.PropertyMetadata': FqName@21) = null
+    packageFragments('kotlin.io': FqName@22) = null
+    packageFragments('kotlin.jvm': FqName@23) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    _functions('A': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('Derived': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('PropertyMetadataImpl': Name@28) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('equals': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('get': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('propertyDelegated': Name@31) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('set': Name@32) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('A': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Any': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Derived': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('PropertyMetadata': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('get': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('set': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('A': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('Any': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('Derived': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('PropertyMetadata': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('get': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('set': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('A': Name@24) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('Derived': Name@27) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('equals': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('get': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('propertyDelegated': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('set': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@37) = EmptyList@25[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('A': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    _functions('Derived': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    _functions('PropertyMetadataImpl': Name@28) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    _functions('equals': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    _functions('get': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    _functions('propertyDelegated': Name@31) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    _functions('set': Name@32) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
     classes('A': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@41
     classes('Derived': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('get': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('set': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('get': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('set': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('A': Name@24) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('Derived': Name@27) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('equals': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('get': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('propertyDelegated': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('set': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
     memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
 }

compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/thisOfAnyType.lazy.log

@@ -1,64 +1,64 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('A': FqName@3) = null
-    _packageFragments('Any': FqName@4) = null
-    _packageFragments('Delegate': FqName@5) = null
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('PropertyMetadata': FqName@7) = null
-    _packageFragments('aTopLevel': 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.PropertyMetadata': FqName@15) = null
-    _packageFragments('kotlin': FqName@16) = null
-    _packageFragments('kotlin.Any': FqName@17) = null
-    _packageFragments('kotlin.Int': FqName@18) = null
-    _packageFragments('kotlin.PropertyMetadata': FqName@19) = null
-    _packageFragments('kotlin.io': FqName@20) = null
-    _packageFragments('kotlin.jvm': FqName@21) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('A': FqName@3) = null
+    packageFragments('Any': FqName@4) = null
+    packageFragments('Delegate': FqName@5) = null
+    packageFragments('Int': FqName@6) = null
+    packageFragments('PropertyMetadata': FqName@7) = null
+    packageFragments('aTopLevel': 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.PropertyMetadata': FqName@15) = null
+    packageFragments('kotlin': FqName@16) = null
+    packageFragments('kotlin.Any': FqName@17) = null
+    packageFragments('kotlin.Int': FqName@18) = null
+    packageFragments('kotlin.PropertyMetadata': FqName@19) = null
+    packageFragments('kotlin.io': FqName@20) = null
+    packageFragments('kotlin.jvm': FqName@21) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    _functions('Delegate': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('PropertyMetadataImpl': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('equals': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('get': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('propertyDelegated': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('set': Name@29) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Any': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('PropertyMetadata': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('PropertyMetadataImpl': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('get': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('set': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Any': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('Delegate': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('PropertyMetadata': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('Delegate': Name@24) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('PropertyMetadataImpl': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('get': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('propertyDelegated': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@35) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('lang': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    _functions('Delegate': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('PropertyMetadataImpl': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('equals': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('get': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('propertyDelegated': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('set': Name@29) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('PropertyMetadataImpl': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('get': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('set': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('Delegate': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('Delegate': Name@24) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('PropertyMetadataImpl': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('equals': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('get': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('propertyDelegated': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
 }

compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.lazy.log

@@ -1,64 +1,64 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('A': FqName@3) = null
-    _packageFragments('Delegate': FqName@4) = null
-    _packageFragments('Int': FqName@5) = null
-    _packageFragments('Nothing': FqName@6) = null
-    _packageFragments('PropertyMetadata': FqName@7) = null
-    _packageFragments('aTopLevel': 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.Nothing': FqName@14) = null
-    _packageFragments('java.lang.PropertyMetadata': FqName@15) = null
-    _packageFragments('kotlin': FqName@16) = null
-    _packageFragments('kotlin.Int': FqName@17) = null
-    _packageFragments('kotlin.Nothing': FqName@18) = null
-    _packageFragments('kotlin.PropertyMetadata': FqName@19) = null
-    _packageFragments('kotlin.io': FqName@20) = null
-    _packageFragments('kotlin.jvm': FqName@21) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('A': FqName@3) = null
+    packageFragments('Delegate': FqName@4) = null
+    packageFragments('Int': FqName@5) = null
+    packageFragments('Nothing': FqName@6) = null
+    packageFragments('PropertyMetadata': FqName@7) = null
+    packageFragments('aTopLevel': 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.Nothing': FqName@14) = null
+    packageFragments('java.lang.PropertyMetadata': FqName@15) = null
+    packageFragments('kotlin': FqName@16) = null
+    packageFragments('kotlin.Int': FqName@17) = null
+    packageFragments('kotlin.Nothing': FqName@18) = null
+    packageFragments('kotlin.PropertyMetadata': FqName@19) = null
+    packageFragments('kotlin.io': FqName@20) = null
+    packageFragments('kotlin.jvm': FqName@21) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    _functions('Delegate': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('PropertyMetadataImpl': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('equals': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('get': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('propertyDelegated': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('set': Name@29) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Nothing': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('PropertyMetadata': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('PropertyMetadataImpl': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('get': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('set': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('Nothing': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('PropertyMetadata': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('Delegate': Name@22) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('PropertyMetadataImpl': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('get': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('propertyDelegated': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@35) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('lang': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    _functions('Delegate': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('PropertyMetadataImpl': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('equals': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('get': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('propertyDelegated': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('set': Name@29) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
     classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('PropertyMetadataImpl': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('get': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('set': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('Delegate': Name@22) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('PropertyMetadataImpl': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('equals': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('get': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('propertyDelegated': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
 }

compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingType.lazy.log

@@ -1,64 +1,64 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('A': FqName@3) = null
-    _packageFragments('Delegate': FqName@4) = null
-    _packageFragments('Int': FqName@5) = null
-    _packageFragments('Nothing': FqName@6) = null
-    _packageFragments('PropertyMetadata': FqName@7) = null
-    _packageFragments('aTopLevel': 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.Nothing': FqName@14) = null
-    _packageFragments('java.lang.PropertyMetadata': FqName@15) = null
-    _packageFragments('kotlin': FqName@16) = null
-    _packageFragments('kotlin.Int': FqName@17) = null
-    _packageFragments('kotlin.Nothing': FqName@18) = null
-    _packageFragments('kotlin.PropertyMetadata': FqName@19) = null
-    _packageFragments('kotlin.io': FqName@20) = null
-    _packageFragments('kotlin.jvm': FqName@21) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('A': FqName@3) = null
+    packageFragments('Delegate': FqName@4) = null
+    packageFragments('Int': FqName@5) = null
+    packageFragments('Nothing': FqName@6) = null
+    packageFragments('PropertyMetadata': FqName@7) = null
+    packageFragments('aTopLevel': 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.Nothing': FqName@14) = null
+    packageFragments('java.lang.PropertyMetadata': FqName@15) = null
+    packageFragments('kotlin': FqName@16) = null
+    packageFragments('kotlin.Int': FqName@17) = null
+    packageFragments('kotlin.Nothing': FqName@18) = null
+    packageFragments('kotlin.PropertyMetadata': FqName@19) = null
+    packageFragments('kotlin.io': FqName@20) = null
+    packageFragments('kotlin.jvm': FqName@21) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    _functions('Delegate': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('PropertyMetadataImpl': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('equals': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('get': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('propertyDelegated': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('set': Name@29) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Nothing': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('PropertyMetadata': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('PropertyMetadataImpl': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('get': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('set': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('Nothing': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('PropertyMetadata': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('Delegate': Name@22) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('PropertyMetadataImpl': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('get': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('propertyDelegated': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@35) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('lang': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    _functions('Delegate': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('PropertyMetadataImpl': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('equals': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('get': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('propertyDelegated': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('set': Name@29) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
     classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('PropertyMetadataImpl': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('get': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('set': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('Delegate': Name@22) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('PropertyMetadataImpl': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('equals': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('get': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('propertyDelegated': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
 }

compiler/testData/diagnostics/tests/delegatedProperty/twoGetMethods.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.lazy.log

@@ -1,63 +1,63 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('Any': FqName@3) = null
-    _packageFragments('Delegate': FqName@4) = null
-    _packageFragments('Int': FqName@5) = null
-    _packageFragments('PropertyMetadata': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('c': 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.PropertyMetadata': FqName@15) = null
-    _packageFragments('java.lang.String': FqName@16) = null
-    _packageFragments('kotlin': FqName@17) = null
-    _packageFragments('kotlin.Any': FqName@18) = null
-    _packageFragments('kotlin.Int': FqName@19) = null
-    _packageFragments('kotlin.PropertyMetadata': FqName@20) = null
-    _packageFragments('kotlin.String': FqName@21) = null
-    _packageFragments('kotlin.io': FqName@22) = null
-    _packageFragments('kotlin.jvm': FqName@23) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('Any': FqName@3) = null
+    packageFragments('Delegate': FqName@4) = null
+    packageFragments('Int': FqName@5) = null
+    packageFragments('PropertyMetadata': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('c': 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.PropertyMetadata': FqName@15) = null
+    packageFragments('java.lang.String': FqName@16) = null
+    packageFragments('kotlin': FqName@17) = null
+    packageFragments('kotlin.Any': FqName@18) = null
+    packageFragments('kotlin.Int': FqName@19) = null
+    packageFragments('kotlin.PropertyMetadata': FqName@20) = null
+    packageFragments('kotlin.String': FqName@21) = null
+    packageFragments('kotlin.io': FqName@22) = null
+    packageFragments('kotlin.jvm': FqName@23) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    _functions('Delegate': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('PropertyMetadataImpl': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('equals': Name@28) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('get': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('propertyDelegated': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Any': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Delegate': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Int': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('PropertyMetadata': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('Any': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('PropertyMetadata': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('get': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('propertyDelegated': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('Delegate': Name@26) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('equals': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('get': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('propertyDelegated': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@37) = EmptyList@25[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('Delegate': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    _functions('PropertyMetadataImpl': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    _functions('equals': Name@28) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    _functions('get': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    _functions('propertyDelegated': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('Delegate': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('get': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('propertyDelegated': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('Delegate': Name@26) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('equals': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('get': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('propertyDelegated': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
     memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
 }

compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetWithGeneric.lazy.log

@@ -1,70 +1,70 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('A': FqName@3) = null
-    _packageFragments('B': FqName@4) = null
-    _packageFragments('C': FqName@5) = null
-    _packageFragments('Delegate': FqName@6) = null
-    _packageFragments('Int': FqName@7) = null
-    _packageFragments('Nothing': FqName@8) = null
-    _packageFragments('PropertyMetadata': FqName@9) = null
-    _packageFragments('T': FqName@10) = null
-    _packageFragments('bTopLevel': FqName@11) = null
-    _packageFragments('cTopLevel': 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.C': FqName@18) = null
-    _packageFragments('java.lang.Int': FqName@19) = null
-    _packageFragments('java.lang.Nothing': FqName@20) = null
-    _packageFragments('java.lang.PropertyMetadata': FqName@21) = null
-    _packageFragments('java.lang.T': FqName@22) = null
-    _packageFragments('kotlin': FqName@23) = null
-    _packageFragments('kotlin.A': FqName@24) = null
-    _packageFragments('kotlin.C': FqName@25) = null
-    _packageFragments('kotlin.Int': FqName@26) = null
-    _packageFragments('kotlin.Nothing': FqName@27) = null
-    _packageFragments('kotlin.PropertyMetadata': FqName@28) = null
-    _packageFragments('kotlin.T': FqName@29) = null
-    _packageFragments('kotlin.io': FqName@30) = null
-    _packageFragments('kotlin.jvm': FqName@31) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('A': FqName@3) = null
+    packageFragments('B': FqName@4) = null
+    packageFragments('C': FqName@5) = null
+    packageFragments('Delegate': FqName@6) = null
+    packageFragments('Int': FqName@7) = null
+    packageFragments('Nothing': FqName@8) = null
+    packageFragments('PropertyMetadata': FqName@9) = null
+    packageFragments('T': FqName@10) = null
+    packageFragments('bTopLevel': FqName@11) = null
+    packageFragments('cTopLevel': 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.C': FqName@18) = null
+    packageFragments('java.lang.Int': FqName@19) = null
+    packageFragments('java.lang.Nothing': FqName@20) = null
+    packageFragments('java.lang.PropertyMetadata': FqName@21) = null
+    packageFragments('java.lang.T': FqName@22) = null
+    packageFragments('kotlin': FqName@23) = null
+    packageFragments('kotlin.A': FqName@24) = null
+    packageFragments('kotlin.C': FqName@25) = null
+    packageFragments('kotlin.Int': FqName@26) = null
+    packageFragments('kotlin.Nothing': FqName@27) = null
+    packageFragments('kotlin.PropertyMetadata': FqName@28) = null
+    packageFragments('kotlin.T': FqName@29) = null
+    packageFragments('kotlin.io': FqName@30) = null
+    packageFragments('kotlin.jvm': FqName@31) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    _functions('Delegate': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    _functions('PropertyMetadataImpl': Name@35) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    _functions('equals': Name@36) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    _functions('get': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    _functions('propertyDelegated': Name@38) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('Delegate': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('Int': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('Nothing': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('PropertyMetadata': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('PropertyMetadataImpl': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('equals': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('get': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('propertyDelegated': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('Delegate': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('Int': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('Nothing': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('PropertyMetadata': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('PropertyMetadataImpl': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('equals': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('get': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('propertyDelegated': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('Delegate': Name@32) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('PropertyMetadataImpl': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('equals': Name@38) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('get': Name@39) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('propertyDelegated': Name@40) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@14['java'] {
-    _functions('lang': Name@44) = EmptyList@33[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@16['lang'] {
-    _functions('Delegate': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    _functions('PropertyMetadataImpl': Name@35) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    _functions('equals': Name@36) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    _functions('get': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    _functions('propertyDelegated': Name@38) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@48
     classes('Delegate': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('PropertyMetadataImpl': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('equals': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('get': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('propertyDelegated': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('PropertyMetadataImpl': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('equals': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('get': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('propertyDelegated': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('Delegate': Name@32) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('PropertyMetadataImpl': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('equals': Name@38) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('get': Name@39) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('propertyDelegated': Name@40) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
     memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
 }

compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForSetParameter.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForThisGetParameter.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInGet.lazy.log

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

compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInSet.lazy.log

@@ -1,64 +1,64 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('A': FqName@3) = null
-    _packageFragments('Any': FqName@4) = null
-    _packageFragments('Delegate': FqName@5) = null
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('PropertyMetadata': FqName@7) = null
-    _packageFragments('aTopLevel': 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.PropertyMetadata': FqName@15) = null
-    _packageFragments('kotlin': FqName@16) = null
-    _packageFragments('kotlin.Any': FqName@17) = null
-    _packageFragments('kotlin.Int': FqName@18) = null
-    _packageFragments('kotlin.PropertyMetadata': FqName@19) = null
-    _packageFragments('kotlin.io': FqName@20) = null
-    _packageFragments('kotlin.jvm': FqName@21) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('A': FqName@3) = null
+    packageFragments('Any': FqName@4) = null
+    packageFragments('Delegate': FqName@5) = null
+    packageFragments('Int': FqName@6) = null
+    packageFragments('PropertyMetadata': FqName@7) = null
+    packageFragments('aTopLevel': 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.PropertyMetadata': FqName@15) = null
+    packageFragments('kotlin': FqName@16) = null
+    packageFragments('kotlin.Any': FqName@17) = null
+    packageFragments('kotlin.Int': FqName@18) = null
+    packageFragments('kotlin.PropertyMetadata': FqName@19) = null
+    packageFragments('kotlin.io': FqName@20) = null
+    packageFragments('kotlin.jvm': FqName@21) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    _functions('Delegate': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('PropertyMetadataImpl': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('equals': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('get': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('propertyDelegated': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    _functions('set': Name@29) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Any': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('PropertyMetadata': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('PropertyMetadataImpl': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('get': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('set': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('Any': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('Delegate': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('PropertyMetadata': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('Delegate': Name@24) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('PropertyMetadataImpl': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('get': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('propertyDelegated': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@10['java'] {
-    _functions('lang': Name@35) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('lang': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    _functions('Delegate': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('PropertyMetadataImpl': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('equals': Name@26) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('get': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('propertyDelegated': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('set': Name@29) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('PropertyMetadataImpl': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('get': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('set': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('Delegate': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('Delegate': Name@24) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('PropertyMetadataImpl': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('equals': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('get': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('propertyDelegated': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
 }

compiler/testData/diagnostics/tests/delegatedProperty/wrongSetterReturnType.lazy.log

@@ -1,63 +1,63 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('Any': FqName@3) = null
-    _packageFragments('Delegate': FqName@4) = null
-    _packageFragments('Int': FqName@5) = null
-    _packageFragments('PropertyMetadata': FqName@6) = null
-    _packageFragments('b': 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.Int': FqName@13) = null
-    _packageFragments('java.lang.PropertyMetadata': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Any': FqName@16) = null
-    _packageFragments('kotlin.Int': FqName@17) = null
-    _packageFragments('kotlin.PropertyMetadata': FqName@18) = null
-    _packageFragments('kotlin.io': FqName@19) = null
-    _packageFragments('kotlin.jvm': FqName@20) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('Any': FqName@3) = null
+    packageFragments('Delegate': FqName@4) = null
+    packageFragments('Int': FqName@5) = null
+    packageFragments('PropertyMetadata': FqName@6) = null
+    packageFragments('b': 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.Int': FqName@13) = null
+    packageFragments('java.lang.PropertyMetadata': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Any': FqName@16) = null
+    packageFragments('kotlin.Int': FqName@17) = null
+    packageFragments('kotlin.PropertyMetadata': FqName@18) = null
+    packageFragments('kotlin.io': FqName@19) = null
+    packageFragments('kotlin.jvm': FqName@20) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    _functions('Delegate': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('PropertyMetadataImpl': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('equals': Name@25) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('get': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('propertyDelegated': Name@27) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    _functions('set': Name@28) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Any': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Delegate': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Int': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('PropertyMetadata': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('PropertyMetadataImpl': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('get': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('propertyDelegated': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('set': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('Delegate': Name@23) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('equals': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('get': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('set': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@34) = EmptyList@22[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('Delegate': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('PropertyMetadataImpl': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('equals': Name@25) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('get': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('propertyDelegated': Name@27) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    _functions('set': Name@28) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Delegate': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('PropertyMetadataImpl': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('get': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('propertyDelegated': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('set': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('Delegate': Name@23) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('equals': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('get': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('set': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
     memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
 }