Update lazy logs after field rename

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.lazy.log

@@ -3,24 +3,24 @@ DescriptorResolver@0 {
 }
 
 LazyAnnotationDescriptor@2 {
-    _resolutionResults = OverloadResolutionResultsImpl@3
-    _type = JetTypeImpl@4['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@5['i']) = ArrayValue@6
+    resolutionResults = OverloadResolutionResultsImpl@3
+    type = JetTypeImpl@4['Ann']
+    valueArguments(ValueParameterDescriptorImpl@5['i']) = ArrayValue@6
 }
 
 LazyJavaPackageFragmentProvider@7 {
-    _packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    _packageFragments('Ann': FqName@10) = null
-    _packageFragments('Boolean': FqName@11) = null
-    _packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    _packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    _packageFragments('java.lang.Ann': FqName@16) = null
-    _packageFragments('java.lang.Boolean': FqName@17) = null
-    _packageFragments('kotlin': FqName@18) = null
-    _packageFragments('kotlin.Ann': FqName@19) = null
-    _packageFragments('kotlin.Boolean': FqName@20) = null
-    _packageFragments('kotlin.io': FqName@21) = null
-    _packageFragments('kotlin.jvm': FqName@22) = null
+    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
+    packageFragments('Ann': FqName@10) = null
+    packageFragments('Boolean': FqName@11) = null
+    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
+    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
+    packageFragments('java.lang.Ann': FqName@16) = null
+    packageFragments('java.lang.Boolean': FqName@17) = null
+    packageFragments('kotlin': FqName@18) = null
+    packageFragments('kotlin.Ann': FqName@19) = null
+    packageFragments('kotlin.Boolean': FqName@20) = null
+    packageFragments('kotlin.io': FqName@21) = null
+    packageFragments('kotlin.jvm': FqName@22) = null
 }
 
 LazyJavaPackageFragment@9['<root>'] {
@@ -28,8 +28,8 @@ LazyJavaPackageFragment@9['<root>'] {
 }
 
 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
 }

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.lazy.log

@@ -5,48 +5,48 @@ DescriptorResolver@0 {
 }
 
 LazyAnnotationDescriptor@4 {
-    _resolutionResults = OverloadResolutionResultsImpl@5
-    _type = JetTypeImpl@6['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@7['i']) = ArrayValue@8
+    resolutionResults = OverloadResolutionResultsImpl@5
+    type = JetTypeImpl@6['Ann']
+    valueArguments(ValueParameterDescriptorImpl@7['i']) = ArrayValue@8
 }
 
 LazyJavaPackageFragmentProvider@9 {
-    _packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
-    _packageFragments('Ann': FqName@12) = null
-    _packageFragments('Boolean': FqName@13) = null
-    _packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    _packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    _packageFragments('java.lang.Ann': FqName@18) = null
-    _packageFragments('java.lang.Boolean': FqName@19) = null
-    _packageFragments('kotlin': FqName@20) = null
-    _packageFragments('kotlin.Ann': FqName@21) = null
-    _packageFragments('kotlin.Boolean': FqName@22) = null
-    _packageFragments('kotlin.io': FqName@23) = null
-    _packageFragments('kotlin.jvm': FqName@24) = null
+    packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
+    packageFragments('Ann': FqName@12) = null
+    packageFragments('Boolean': FqName@13) = null
+    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
+    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
+    packageFragments('java.lang.Ann': FqName@18) = null
+    packageFragments('java.lang.Boolean': FqName@19) = null
+    packageFragments('kotlin': FqName@20) = null
+    packageFragments('kotlin.Ann': FqName@21) = null
+    packageFragments('kotlin.Boolean': FqName@22) = null
+    packageFragments('kotlin.io': FqName@23) = null
+    packageFragments('kotlin.jvm': FqName@24) = null
 }
 
 LazyJavaPackageFragment@11['<root>'] {
-    _functions('compareTo': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    _functions('equals': Name@28) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Boolean': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('Boolean': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('compareTo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('compareTo': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@15['java'] {
-    _functions('lang': Name@32) = EmptyList@26[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@17['lang'] {
-    _functions('compareTo': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('equals': Name@28) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('compareTo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('compareTo': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('equals': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
 }

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.lazy.log

@@ -1,52 +1,52 @@
 LazyAnnotationDescriptor@0 {
-    _resolutionResults = OverloadResolutionResultsImpl@1
-    _type = JetTypeImpl@2['AnnE']
-    _valueArguments(ValueParameterDescriptorImpl@3['i']) = null
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['AnnE']
+    valueArguments(ValueParameterDescriptorImpl@3['i']) = null
 }
 
 LazyAnnotationDescriptor@4 {
-    _resolutionResults = OverloadResolutionResultsImpl@5
-    _type = JetTypeImpl@6['AnnE']
-    _valueArguments(ValueParameterDescriptorImpl@3['i']) = null
+    resolutionResults = OverloadResolutionResultsImpl@5
+    type = JetTypeImpl@6['AnnE']
+    valueArguments(ValueParameterDescriptorImpl@3['i']) = null
 }
 
 LazyJavaPackageFragmentProvider@7 {
-    _packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    _packageFragments('AnnE': FqName@10) = null
-    _packageFragments('MyEnum': FqName@11) = null
-    _packageFragments('Test': FqName@12) = null
-    _packageFragments('Test2': FqName@13) = null
-    _packageFragments('e': FqName@14) = null
-    _packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
-    _packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
-    _packageFragments('java.lang.AnnE': FqName@19) = null
-    _packageFragments('java.lang.MyEnum': FqName@20) = null
-    _packageFragments('kotlin': FqName@21) = null
-    _packageFragments('kotlin.AnnE': FqName@22) = null
-    _packageFragments('kotlin.MyEnum': FqName@23) = null
-    _packageFragments('kotlin.io': FqName@24) = null
-    _packageFragments('kotlin.jvm': FqName@25) = null
+    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
+    packageFragments('AnnE': FqName@10) = null
+    packageFragments('MyEnum': FqName@11) = null
+    packageFragments('Test': FqName@12) = null
+    packageFragments('Test2': FqName@13) = null
+    packageFragments('e': FqName@14) = null
+    packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
+    packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
+    packageFragments('java.lang.AnnE': FqName@19) = null
+    packageFragments('java.lang.MyEnum': FqName@20) = null
+    packageFragments('kotlin': FqName@21) = null
+    packageFragments('kotlin.AnnE': FqName@22) = null
+    packageFragments('kotlin.MyEnum': FqName@23) = null
+    packageFragments('kotlin.io': FqName@24) = null
+    packageFragments('kotlin.jvm': FqName@25) = null
 }
 
 LazyJavaPackageFragment@9['<root>'] {
-    _functions('Test': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('e': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('Test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('e': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('Test': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@16['java'] {
-    _functions('lang': Name@32) = EmptyList@27[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@18['lang'] {
-    _functions('Test': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     classes('Test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('e': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('e': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('Test': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
 }

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.lazy.log

@@ -1,7 +1,7 @@
 LazyAnnotationDescriptor@0 {
-    _resolutionResults = OverloadResolutionResultsImpl@1
-    _type = JetTypeImpl@2['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@3['i']) = ArrayValue@4
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['Ann']
+    valueArguments(ValueParameterDescriptorImpl@3['i']) = ArrayValue@4
 }
 
 LazyJavaClassDescriptor@5['Test'] {
@@ -9,85 +9,85 @@ LazyJavaClassDescriptor@5['Test'] {
     <name not found> = IntValue@8 // through LazyJavaStaticClassScope@9
     <name not found> = IntValue@10 // through LazyJavaStaticClassScope@9
     <name not found> = null // through LazyJavaStaticClassScope@9
-    _constructors = ArrayList@11[1] { JavaConstructorDescriptor@12['<init>'] } // through LazyJavaClassMemberScope@7
-    _functionTypeForSamInterface = null
-    _properties('i1': Name@13) = ArrayList@14[1] { JavaPropertyDescriptor@15['i1'] } // through LazyJavaStaticClassScope@9
-    _properties('i1': Name@13) = EmptyList@16[empty] // through LazyJavaClassMemberScope@7
-    _properties('i2': Name@17) = ArrayList@18[1] { JavaPropertyDescriptor@19['i2'] } // through LazyJavaStaticClassScope@9
-    _properties('i2': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@7
-    _properties('i3': Name@20) = ArrayList@21[1] { JavaPropertyDescriptor@22['i3'] } // through LazyJavaStaticClassScope@9
-    _properties('i3': Name@20) = EmptyList@16[empty] // through LazyJavaClassMemberScope@7
-    _properties('i4': Name@23) = ArrayList@24[1] { JavaPropertyDescriptor@25['i4'] } // through LazyJavaStaticClassScope@9
-    _properties('i4': Name@23) = EmptyList@16[empty] // through LazyJavaClassMemberScope@7
-    _properties('i5': Name@26) = ArrayList@27[1] { JavaPropertyDescriptor@28['i5'] } // through LazyJavaStaticClassScope@9
-    _properties('i5': Name@26) = EmptyList@16[empty] // through LazyJavaClassMemberScope@7
-    _properties('i6': Name@29) = ArrayList@30[1] { JavaPropertyDescriptor@31['i6'] } // through LazyJavaStaticClassScope@9
-    _properties('i6': Name@29) = EmptyList@16[empty] // through LazyJavaClassMemberScope@7
-    _properties('i7': Name@32) = ArrayList@33[1] { JavaPropertyDescriptor@34['i7'] } // through LazyJavaClassMemberScope@7
-    _typeConstructor = LazyJavaClassTypeConstructor@35['Test']
-    defaultType = JetTypeImpl@36['Test']
-    enumEntryIndex = LinkedHashMap@37 // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@39 // through LazyJavaStaticClassScope@9
-    nestedClassIndex = LinkedHashMap@40 // through LazyJavaClassMemberScope@7
-    nestedClasses('i1': Name@13) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('i2': Name@17) = null // through LazyJavaClassMemberScope@7
+    constructors = ArrayList@11[1] { JavaConstructorDescriptor@12['<init>'] } // through LazyJavaClassMemberScope@7
+    defaultType = JetTypeImpl@13['Test']
+    enumEntryIndex = LinkedHashMap@14 // through LazyJavaClassMemberScope@7
+    functionTypeForSamInterface = null
+    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@7
+    memberIndex = computeMemberIndex$1@16 // through LazyJavaStaticClassScope@9
+    nestedClassIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@7
+    nestedClasses('i1': Name@18) = null // through LazyJavaClassMemberScope@7
+    nestedClasses('i2': Name@19) = null // through LazyJavaClassMemberScope@7
     nestedClasses('i3': Name@20) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('i4': Name@23) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('i5': Name@26) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('i6': Name@29) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('i7': Name@32) = null // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@41['<this>']
+    nestedClasses('i4': Name@21) = null // through LazyJavaClassMemberScope@7
+    nestedClasses('i5': Name@22) = null // through LazyJavaClassMemberScope@7
+    nestedClasses('i6': Name@23) = null // through LazyJavaClassMemberScope@7
+    nestedClasses('i7': Name@24) = null // through LazyJavaClassMemberScope@7
+    properties('i1': Name@18) = ArrayList@25[1] { JavaPropertyDescriptor@26['i1'] } // through LazyJavaStaticClassScope@9
+    properties('i1': Name@18) = EmptyList@27[empty] // through LazyJavaClassMemberScope@7
+    properties('i2': Name@19) = ArrayList@28[1] { JavaPropertyDescriptor@29['i2'] } // through LazyJavaStaticClassScope@9
+    properties('i2': Name@19) = EmptyList@27[empty] // through LazyJavaClassMemberScope@7
+    properties('i3': Name@20) = ArrayList@30[1] { JavaPropertyDescriptor@31['i3'] } // through LazyJavaStaticClassScope@9
+    properties('i3': Name@20) = EmptyList@27[empty] // through LazyJavaClassMemberScope@7
+    properties('i4': Name@21) = ArrayList@32[1] { JavaPropertyDescriptor@33['i4'] } // through LazyJavaStaticClassScope@9
+    properties('i4': Name@21) = EmptyList@27[empty] // through LazyJavaClassMemberScope@7
+    properties('i5': Name@22) = ArrayList@34[1] { JavaPropertyDescriptor@35['i5'] } // through LazyJavaStaticClassScope@9
+    properties('i5': Name@22) = EmptyList@27[empty] // through LazyJavaClassMemberScope@7
+    properties('i6': Name@23) = ArrayList@36[1] { JavaPropertyDescriptor@37['i6'] } // through LazyJavaStaticClassScope@9
+    properties('i6': Name@23) = EmptyList@27[empty] // through LazyJavaClassMemberScope@7
+    properties('i7': Name@24) = ArrayList@38[1] { JavaPropertyDescriptor@39['i7'] } // through LazyJavaClassMemberScope@7
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@40['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@41['Test']
 }
 
-LazyJavaClassTypeConstructor@35['Test'] {
-    _parameters = ArrayList@42[empty]
-    _supertypes = ArrayList@43[1] { JetTypeImpl@44['Any'] }
+LazyJavaClassTypeConstructor@41['Test'] {
+    parameters = ArrayList@42[empty]
+    supertypes = ArrayList@43[1] { JetTypeImpl@44['Any'] }
 }
 
 LazyJavaClassifierType@45['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@46
-    classifier = JavaClassImpl@47['Object']
+    classifier = JavaClassImpl@46['Object']
+    typeConstructor = DeserializedClassTypeConstructor@47
 }
 
 LazyJavaPackageFragmentProvider@48 {
-    _packageFragments('<root>': FqName@49) = LazyJavaPackageFragment@50['<root>']
-    _packageFragments('A': FqName@51) = null
-    _packageFragments('Ann': FqName@52) = null
-    _packageFragments('Int': FqName@53) = null
-    _packageFragments('Test': FqName@54) = null
-    _packageFragments('java': FqName@55) = LazyJavaPackageFragment@56['java']
-    _packageFragments('java.lang': FqName@57) = LazyJavaPackageFragment@58['lang']
-    _packageFragments('java.lang.Ann': FqName@59) = null
-    _packageFragments('java.lang.Int': FqName@60) = null
-    _packageFragments('java.lang.Test': FqName@61) = null
-    _packageFragments('kotlin': FqName@62) = null
-    _packageFragments('kotlin.Ann': FqName@63) = null
-    _packageFragments('kotlin.Int': FqName@64) = null
-    _packageFragments('kotlin.Test': FqName@65) = null
-    _packageFragments('kotlin.io': FqName@66) = null
-    _packageFragments('kotlin.jvm': FqName@67) = null
+    packageFragments('<root>': FqName@49) = LazyJavaPackageFragment@50['<root>']
+    packageFragments('A': FqName@51) = null
+    packageFragments('Ann': FqName@52) = null
+    packageFragments('Int': FqName@53) = null
+    packageFragments('Test': FqName@54) = null
+    packageFragments('java': FqName@55) = LazyJavaPackageFragment@56['java']
+    packageFragments('java.lang': FqName@57) = LazyJavaPackageFragment@58['lang']
+    packageFragments('java.lang.Ann': FqName@59) = null
+    packageFragments('java.lang.Int': FqName@60) = null
+    packageFragments('java.lang.Test': FqName@61) = null
+    packageFragments('kotlin': FqName@62) = null
+    packageFragments('kotlin.Ann': FqName@63) = null
+    packageFragments('kotlin.Int': FqName@64) = null
+    packageFragments('kotlin.Test': FqName@65) = null
+    packageFragments('kotlin.io': FqName@66) = null
+    packageFragments('kotlin.jvm': FqName@67) = null
     topLevelClasses(JavaClassImpl@68['Test']) = LazyJavaClassDescriptor@5['Test']
 }
 
 LazyJavaPackageFragment@50['<root>'] {
-    _functions('Test': Name@69) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('Int': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('Test': Name@72) = LazyJavaClassDescriptor@5['Test'] // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('Int': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('Test': Name@71) = LazyJavaClassDescriptor@5['Test'] // through LazyPackageFragmentScopeForJavaPackage@70
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('Test': Name@73) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@70
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@70
 }
 
 LazyJavaPackageFragment@56['java'] {
-    _functions('lang': Name@75) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('lang': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('lang': Name@77) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@76
     memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@58['lang'] {
-    _functions('Test': Name@69) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('Test': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('Test': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('Test': Name@73) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@79
     memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@79
 }

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.lazy.log

@@ -11,31 +11,31 @@ DescriptorResolver@0 {
 }
 
 LazyAnnotationDescriptor@4 {
-    _resolutionResults = OverloadResolutionResultsImpl@5
-    _type = JetTypeImpl@6['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@7['i']) = ArrayValue@8
+    resolutionResults = OverloadResolutionResultsImpl@5
+    type = JetTypeImpl@6['Ann']
+    valueArguments(ValueParameterDescriptorImpl@7['i']) = ArrayValue@8
 }
 
 LazyJavaPackageFragmentProvider@9 {
-    _packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
-    _packageFragments('Ann': FqName@12) = null
-    _packageFragments('Int': FqName@13) = null
-    _packageFragments('Test': FqName@14) = null
-    _packageFragments('i1': FqName@15) = null
-    _packageFragments('i2': FqName@16) = null
-    _packageFragments('i3': FqName@17) = null
-    _packageFragments('i4': FqName@18) = null
-    _packageFragments('i5': FqName@19) = null
-    _packageFragments('i6': FqName@20) = null
-    _packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
-    _packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
-    _packageFragments('java.lang.Ann': FqName@25) = null
-    _packageFragments('java.lang.Int': FqName@26) = null
-    _packageFragments('kotlin': FqName@27) = null
-    _packageFragments('kotlin.Ann': FqName@28) = null
-    _packageFragments('kotlin.Int': FqName@29) = null
-    _packageFragments('kotlin.io': FqName@30) = null
-    _packageFragments('kotlin.jvm': FqName@31) = null
+    packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
+    packageFragments('Ann': FqName@12) = null
+    packageFragments('Int': FqName@13) = null
+    packageFragments('Test': FqName@14) = null
+    packageFragments('i1': FqName@15) = null
+    packageFragments('i2': FqName@16) = null
+    packageFragments('i3': FqName@17) = null
+    packageFragments('i4': FqName@18) = null
+    packageFragments('i5': FqName@19) = null
+    packageFragments('i6': FqName@20) = null
+    packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
+    packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
+    packageFragments('java.lang.Ann': FqName@25) = null
+    packageFragments('java.lang.Int': FqName@26) = null
+    packageFragments('kotlin': FqName@27) = null
+    packageFragments('kotlin.Ann': FqName@28) = null
+    packageFragments('kotlin.Int': FqName@29) = null
+    packageFragments('kotlin.io': FqName@30) = null
+    packageFragments('kotlin.jvm': FqName@31) = null
 }
 
 LazyJavaPackageFragment@11['<root>'] {
@@ -50,10 +50,10 @@ LazyJavaPackageFragment@11['<root>'] {
 }
 
 LazyJavaPackageFragment@22['java'] {
-    _functions('lang': Name@41) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('lang': Name@43) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@42
 }
 
 LazyJavaPackageFragment@24['lang'] {

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.lazy.log

@@ -9,47 +9,47 @@ DescriptorResolver@0 {
 }
 
 LazyAnnotationDescriptor@8 {
-    _resolutionResults = OverloadResolutionResultsImpl@9
-    _type = JetTypeImpl@10['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@11['i']) = ArrayValue@12
+    resolutionResults = OverloadResolutionResultsImpl@9
+    type = JetTypeImpl@10['Ann']
+    valueArguments(ValueParameterDescriptorImpl@11['i']) = ArrayValue@12
 }
 
 LazyJavaPackageFragmentProvider@13 {
-    _packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
-    _packageFragments('Ann': FqName@16) = null
-    _packageFragments('String': FqName@17) = null
-    _packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    _packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    _packageFragments('java.lang.Ann': FqName@22) = null
-    _packageFragments('java.lang.String': FqName@23) = null
-    _packageFragments('kotlin': FqName@24) = null
-    _packageFragments('kotlin.Ann': FqName@25) = null
-    _packageFragments('kotlin.String': FqName@26) = null
-    _packageFragments('kotlin.io': FqName@27) = null
-    _packageFragments('kotlin.jvm': FqName@28) = null
-    _packageFragments('topLevel': FqName@29) = null
+    packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
+    packageFragments('Ann': FqName@16) = null
+    packageFragments('String': FqName@17) = null
+    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
+    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
+    packageFragments('java.lang.Ann': FqName@22) = null
+    packageFragments('java.lang.String': FqName@23) = null
+    packageFragments('kotlin': FqName@24) = null
+    packageFragments('kotlin.Ann': FqName@25) = null
+    packageFragments('kotlin.String': FqName@26) = null
+    packageFragments('kotlin.io': FqName@27) = null
+    packageFragments('kotlin.jvm': FqName@28) = null
+    packageFragments('topLevel': FqName@29) = null
 }
 
 LazyJavaPackageFragment@15['<root>'] {
-    _functions('plus': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('String': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('plus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('topLevel': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('plus': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('topLevel': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('plus': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@19['java'] {
-    _functions('lang': Name@37) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
 }
 
 LazyJavaPackageFragment@21['lang'] {
-    _functions('plus': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('plus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('topLevel': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('plus': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('topLevel': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('plus': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
     memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
 }