Update lazy logs after field rename

compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.lazy.log

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

compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeUnmappedArguments.lazy.log

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

compiler/testData/diagnostics/tests/resolve/nestedCalls/argumentsInParentheses.lazy.log

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

compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.lazy.log

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

compiler/testData/diagnostics/tests/resolve/nestedCalls/completeUnmappedArguments.lazy.log

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

compiler/testData/diagnostics/tests/resolve/nestedCalls/kt5971NestedSafeCall.lazy.log

@@ -1,37 +1,37 @@
 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('foo': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('String': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('foo': 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('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('foo': 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('foo': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('foo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('foo': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
 }