Update lazy logs after field rename

compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.lazy.log

@@ -1,36 +1,36 @@
 LazyAnnotationDescriptor@0 {
-    _resolutionResults = OverloadResolutionResultsImpl@1
-    _type = JetTypeImpl@2['A']
-    _valueArguments(ValueParameterDescriptorImpl@3['x']) = IntegerValueTypeConstant@4
-    _valueArguments(ValueParameterDescriptorImpl@5['y']) = StringValue@6
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['A']
+    valueArguments(ValueParameterDescriptorImpl@3['x']) = IntegerValueTypeConstant@4
+    valueArguments(ValueParameterDescriptorImpl@5['y']) = StringValue@6
 }
 
 LazyJavaClassDescriptor@7['A'] {
-    _constructors = ArrayList@8[1] { JavaConstructorDescriptor@9['<init>'] } // through LazyJavaClassMemberScope@10
-    _typeConstructor = LazyJavaClassTypeConstructor@11['A']
-    defaultType = JetTypeImpl@12['A']
+    constructors = ArrayList@8[1] { JavaConstructorDescriptor@9['<init>'] } // through LazyJavaClassMemberScope@10
+    defaultType = JetTypeImpl@11['A']
+    typeConstructor = LazyJavaClassTypeConstructor@12['A']
 }
 
-LazyJavaClassTypeConstructor@11['A'] {
-    _parameters = ArrayList@13[empty]
+LazyJavaClassTypeConstructor@12['A'] {
+    parameters = ArrayList@13[empty]
 }
 
 LazyJavaClassifierType@14['String'] {
-    _arguments = ArrayList@15[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@16
-    classifier = JavaClassImpl@17['String']
+    arguments = ArrayList@15[empty]
+    classifier = JavaClassImpl@16['String']
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaPackageFragmentProvider@18 {
-    _packageFragments('<root>': FqName@19) = LazyJavaPackageFragment@20['<root>']
-    _packageFragments('A': FqName@21) = null
-    _packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    _packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    _packageFragments('java.lang.A': FqName@26) = null
-    _packageFragments('kotlin': FqName@27) = null
-    _packageFragments('kotlin.A': FqName@28) = null
-    _packageFragments('kotlin.io': FqName@29) = null
-    _packageFragments('kotlin.jvm': FqName@30) = null
+    packageFragments('<root>': FqName@19) = LazyJavaPackageFragment@20['<root>']
+    packageFragments('A': FqName@21) = null
+    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
+    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
+    packageFragments('java.lang.A': FqName@26) = null
+    packageFragments('kotlin': FqName@27) = null
+    packageFragments('kotlin.A': FqName@28) = null
+    packageFragments('kotlin.io': FqName@29) = null
+    packageFragments('kotlin.jvm': FqName@30) = null
     topLevelClasses(JavaClassImpl@31['A']) = LazyJavaClassDescriptor@7['A']
 }
 
@@ -39,8 +39,8 @@ LazyJavaPackageFragment@20['<root>'] {
 }
 
 LazyJavaPackageFragment@23['java'] {
-    _functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('lang': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@35
 }

compiler/testData/diagnostics/tests/namedArguments/disallowForJavaConstructor.lazy.log

@@ -3,58 +3,58 @@ DescriptorResolver@0 {
 }
 
 LazyJavaClassDescriptor@2['A'] {
-    _constructors = ArrayList@3[1] { JavaConstructorDescriptor@4['<init>'] } // through LazyJavaClassMemberScope@5
-    _functionTypeForSamInterface = null
-    _typeConstructor = LazyJavaClassTypeConstructor@6['A']
+    constructors = ArrayList@3[1] { JavaConstructorDescriptor@4['<init>'] } // through LazyJavaClassMemberScope@5
     defaultType = JetTypeImpl@1['A']
+    functionTypeForSamInterface = null
+    typeConstructor = LazyJavaClassTypeConstructor@6['A']
 }
 
 LazyJavaClassTypeConstructor@6['A'] {
-    _parameters = ArrayList@7[empty]
+    parameters = ArrayList@7[empty]
 }
 
 LazyJavaClassifierType@8['String'] {
-    _arguments = ArrayList@9[empty]
-    _nullable = 'false': Boolean@10
-    _typeConstructor = DeserializedClassTypeConstructor@11
-    classifier = JavaClassImpl@12['String']
+    arguments = ArrayList@9[empty]
+    classifier = JavaClassImpl@10['String']
+    nullable = 'false': Boolean@11
+    typeConstructor = DeserializedClassTypeConstructor@12
 }
 
 LazyJavaClassifierType@13['String'] {
-    _arguments = ArrayList@14[empty]
-    _nullable = 'true': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@11
-    classifier = JavaClassImpl@12['String']
+    arguments = ArrayList@14[empty]
+    classifier = JavaClassImpl@10['String']
+    nullable = 'true': Boolean@15
+    typeConstructor = DeserializedClassTypeConstructor@12
 }
 
 LazyJavaPackageFragmentProvider@16 {
-    _packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    _packageFragments('java': FqName@19) = LazyJavaPackageFragment@20['java']
-    _packageFragments('java.lang': FqName@21) = LazyJavaPackageFragment@22['lang']
-    _packageFragments('kotlin': FqName@23) = null
-    _packageFragments('kotlin.io': FqName@24) = null
-    _packageFragments('kotlin.jvm': FqName@25) = null
-    _packageFragments('test': FqName@26) = null
+    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
+    packageFragments('java': FqName@19) = LazyJavaPackageFragment@20['java']
+    packageFragments('java.lang': FqName@21) = LazyJavaPackageFragment@22['lang']
+    packageFragments('kotlin': FqName@23) = null
+    packageFragments('kotlin.io': FqName@24) = null
+    packageFragments('kotlin.jvm': FqName@25) = null
+    packageFragments('test': FqName@26) = null
     topLevelClasses(JavaClassImpl@27['A']) = LazyJavaClassDescriptor@2['A']
 }
 
 LazyJavaPackageFragment@18['<root>'] {
-    _functions('A': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('A': Name@28) = LazyJavaClassDescriptor@2['A'] // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('A': Name@28) = LazyJavaClassDescriptor@2['A'] // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('A': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@29
 }
 
 LazyJavaPackageFragment@20['java'] {
-    _functions('lang': Name@33) = EmptyList@29[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@22['lang'] {
-    _functions('A': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     classes('A': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('A': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
 }

compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.lazy.log

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

compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.lazy.log

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

compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.lazy.log

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

compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.lazy.log

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