Update lazy logs after field rename

compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.lazy.log

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

compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.lazy.log

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

compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.lazy.log

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

compiler/testData/diagnostics/tests/varargs/NilaryVsVararg.lazy.log

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

compiler/testData/diagnostics/tests/varargs/UnaryVsVararg.lazy.log

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

compiler/testData/diagnostics/tests/varargs/kt1781.lazy.log

@@ -1,55 +1,55 @@
 LazyJavaClassDescriptor@0['JavaClass'] {
-    _constructors = ArrayList@1[2] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'] } // through LazyJavaClassMemberScope@4
-    _functionTypeForSamInterface = null
-    _typeConstructor = LazyJavaClassTypeConstructor@5['JavaClass']
-    defaultType = JetTypeImpl@6['JavaClass']
+    constructors = ArrayList@1[2] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'] } // through LazyJavaClassMemberScope@4
+    defaultType = JetTypeImpl@5['JavaClass']
+    functionTypeForSamInterface = null
+    typeConstructor = LazyJavaClassTypeConstructor@6['JavaClass']
 }
 
-LazyJavaClassTypeConstructor@5['JavaClass'] {
-    _parameters = ArrayList@7[empty]
+LazyJavaClassTypeConstructor@6['JavaClass'] {
+    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('<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
     topLevelClasses(JavaClassImpl@26['JavaClass']) = LazyJavaClassDescriptor@0['JavaClass']
 }
 
 LazyJavaPackageFragment@18['<root>'] {
-    _functions('JavaClass': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('JavaClass': Name@27) = LazyJavaClassDescriptor@0['JavaClass'] // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('JavaClass': Name@27) = LazyJavaClassDescriptor@0['JavaClass'] // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('JavaClass': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@20['java'] {
-    _functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@22['lang'] {
-    _functions('JavaClass': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     classes('JavaClass': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('JavaClass': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
 }

compiler/testData/diagnostics/tests/varargs/kt1835.lazy.log

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

compiler/testData/diagnostics/tests/varargs/kt1838-param.lazy.log

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

compiler/testData/diagnostics/tests/varargs/kt1838-val.lazy.log

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

compiler/testData/diagnostics/tests/varargs/kt422.lazy.log

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

compiler/testData/diagnostics/tests/varargs/varargsAndFunctionLiterals.lazy.log

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