Update lazy logs after field rename

compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.lazy.log

@@ -39,116 +39,116 @@ DescriptorResolver@18 {
 }
 
 LazyJavaPackageFragmentProvider@20 {
-    _packageFragments('$b': FqName@21) = null
-    _packageFragments('<root>': FqName@22) = LazyJavaPackageFragment@23['<root>']
-    _packageFragments('A': FqName@24) = null
-    _packageFragments('Boolean': FqName@25) = null
-    _packageFragments('Int': FqName@26) = null
-    _packageFragments('M': FqName@27) = null
-    _packageFragments('Open': FqName@28) = null
-    _packageFragments('ProtocolState': FqName@29) = null
-    _packageFragments('String': FqName@30) = null
-    _packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
-    _packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
-    _packageFragments('java.lang.$b': FqName@35) = null
-    _packageFragments('java.lang.A': FqName@36) = null
-    _packageFragments('java.lang.Boolean': FqName@37) = null
-    _packageFragments('java.lang.Int': FqName@38) = null
-    _packageFragments('java.lang.M': FqName@39) = null
-    _packageFragments('java.lang.Open': FqName@40) = null
-    _packageFragments('java.lang.ProtocolState': FqName@41) = null
-    _packageFragments('java.lang.String': FqName@42) = null
-    _packageFragments('kotlin': FqName@43) = null
-    _packageFragments('kotlin.$b': FqName@44) = null
-    _packageFragments('kotlin.A': FqName@45) = null
-    _packageFragments('kotlin.Boolean': FqName@46) = null
-    _packageFragments('kotlin.Int': FqName@47) = null
-    _packageFragments('kotlin.M': FqName@48) = null
-    _packageFragments('kotlin.Open': FqName@49) = null
-    _packageFragments('kotlin.ProtocolState': FqName@50) = null
-    _packageFragments('kotlin.String': FqName@51) = null
-    _packageFragments('kotlin.io': FqName@52) = null
-    _packageFragments('kotlin.jvm': FqName@53) = null
-    _packageFragments('uninitialized_reassigned_variables': FqName@54) = null
-    _packageFragments('uninitialized_reassigned_variables.$b': FqName@55) = null
-    _packageFragments('uninitialized_reassigned_variables.A': FqName@56) = null
-    _packageFragments('uninitialized_reassigned_variables.AnonymousInitializers': FqName@57) = null
-    _packageFragments('uninitialized_reassigned_variables.Boolean': FqName@58) = null
-    _packageFragments('uninitialized_reassigned_variables.ClassObject': FqName@59) = null
-    _packageFragments('uninitialized_reassigned_variables.ForwardAccessToBackingField': FqName@60) = null
-    _packageFragments('uninitialized_reassigned_variables.Int': FqName@61) = null
-    _packageFragments('uninitialized_reassigned_variables.LocalValsVsProperties': FqName@62) = null
-    _packageFragments('uninitialized_reassigned_variables.M': FqName@63) = null
-    _packageFragments('uninitialized_reassigned_variables.Open': FqName@64) = null
-    _packageFragments('uninitialized_reassigned_variables.Outer': FqName@65) = null
-    _packageFragments('uninitialized_reassigned_variables.ProtocolState': FqName@66) = null
-    _packageFragments('uninitialized_reassigned_variables.String': FqName@67) = null
-    _packageFragments('uninitialized_reassigned_variables.TestObjectDeclaration': FqName@68) = null
-    _packageFragments('uninitialized_reassigned_variables.TestObjectExpression': FqName@69) = null
-    _packageFragments('uninitialized_reassigned_variables.x': FqName@70) = null
-    _packageFragments('uninitialized_reassigned_variables.y': FqName@71) = null
-    _packageFragments('uninitialized_reassigned_variables.z': FqName@72) = null
+    packageFragments('$b': FqName@21) = null
+    packageFragments('<root>': FqName@22) = LazyJavaPackageFragment@23['<root>']
+    packageFragments('A': FqName@24) = null
+    packageFragments('Boolean': FqName@25) = null
+    packageFragments('Int': FqName@26) = null
+    packageFragments('M': FqName@27) = null
+    packageFragments('Open': FqName@28) = null
+    packageFragments('ProtocolState': FqName@29) = null
+    packageFragments('String': FqName@30) = null
+    packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
+    packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
+    packageFragments('java.lang.$b': FqName@35) = null
+    packageFragments('java.lang.A': FqName@36) = null
+    packageFragments('java.lang.Boolean': FqName@37) = null
+    packageFragments('java.lang.Int': FqName@38) = null
+    packageFragments('java.lang.M': FqName@39) = null
+    packageFragments('java.lang.Open': FqName@40) = null
+    packageFragments('java.lang.ProtocolState': FqName@41) = null
+    packageFragments('java.lang.String': FqName@42) = null
+    packageFragments('kotlin': FqName@43) = null
+    packageFragments('kotlin.$b': FqName@44) = null
+    packageFragments('kotlin.A': FqName@45) = null
+    packageFragments('kotlin.Boolean': FqName@46) = null
+    packageFragments('kotlin.Int': FqName@47) = null
+    packageFragments('kotlin.M': FqName@48) = null
+    packageFragments('kotlin.Open': FqName@49) = null
+    packageFragments('kotlin.ProtocolState': FqName@50) = null
+    packageFragments('kotlin.String': FqName@51) = null
+    packageFragments('kotlin.io': FqName@52) = null
+    packageFragments('kotlin.jvm': FqName@53) = null
+    packageFragments('uninitialized_reassigned_variables': FqName@54) = null
+    packageFragments('uninitialized_reassigned_variables.$b': FqName@55) = null
+    packageFragments('uninitialized_reassigned_variables.A': FqName@56) = null
+    packageFragments('uninitialized_reassigned_variables.AnonymousInitializers': FqName@57) = null
+    packageFragments('uninitialized_reassigned_variables.Boolean': FqName@58) = null
+    packageFragments('uninitialized_reassigned_variables.ClassObject': FqName@59) = null
+    packageFragments('uninitialized_reassigned_variables.ForwardAccessToBackingField': FqName@60) = null
+    packageFragments('uninitialized_reassigned_variables.Int': FqName@61) = null
+    packageFragments('uninitialized_reassigned_variables.LocalValsVsProperties': FqName@62) = null
+    packageFragments('uninitialized_reassigned_variables.M': FqName@63) = null
+    packageFragments('uninitialized_reassigned_variables.Open': FqName@64) = null
+    packageFragments('uninitialized_reassigned_variables.Outer': FqName@65) = null
+    packageFragments('uninitialized_reassigned_variables.ProtocolState': FqName@66) = null
+    packageFragments('uninitialized_reassigned_variables.String': FqName@67) = null
+    packageFragments('uninitialized_reassigned_variables.TestObjectDeclaration': FqName@68) = null
+    packageFragments('uninitialized_reassigned_variables.TestObjectExpression': FqName@69) = null
+    packageFragments('uninitialized_reassigned_variables.x': FqName@70) = null
+    packageFragments('uninitialized_reassigned_variables.y': FqName@71) = null
+    packageFragments('uninitialized_reassigned_variables.z': FqName@72) = null
 }
 
 LazyJavaPackageFragment@32['java'] {
-    _functions('lang': Name@73) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('lang': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('lang': Name@76) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@74
 }
 
 LazyJavaPackageFragment@34['lang'] {
-    _functions('$b': Name@79) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('A': Name@81) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('compareTo': Name@82) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('dec': Name@83) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('doSmth': Name@84) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('equals': Name@85) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('hasNext': Name@86) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('inc': Name@87) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('iterator': Name@88) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('minus': Name@89) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('minusAssign': Name@90) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('next': Name@91) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('plus': Name@92) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('plusAssign': Name@93) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('rangeTo': Name@94) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('signal': Name@95) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('times': Name@96) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('timesAssign': Name@97) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('$b': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('$b': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
     classes('A': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('a': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('b': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('c': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('compareTo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('dec': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('doSmth': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('equals': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('hasNext': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('i': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('inc': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('iterator': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('j': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('k': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('l': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('m': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('minus': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('minusAssign': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('n': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('next': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('o': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('p': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('plus': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('plusAssign': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('rangeTo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('signal': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('times': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('timesAssign': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('x': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('y': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('yy': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('z': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('a': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('b': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('c': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('compareTo': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('dec': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('doSmth': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('equals': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('hasNext': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('i': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('inc': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('iterator': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('j': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('k': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('l': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('m': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('minus': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('minusAssign': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('n': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('next': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('o': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('p': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('plus': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('plusAssign': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('rangeTo': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('signal': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('times': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('timesAssign': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('x': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('y': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('yy': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('z': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('$b': Name@113) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('A': Name@81) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('compareTo': Name@85) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('dec': Name@86) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('doSmth': Name@87) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('equals': Name@88) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('hasNext': Name@89) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('inc': Name@91) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('iterator': Name@92) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('minus': Name@97) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('minusAssign': Name@98) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('next': Name@100) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('plus': Name@103) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('plusAssign': Name@104) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('rangeTo': Name@105) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('signal': Name@106) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('times': Name@107) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('timesAssign': Name@108) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@80
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.lazy.log

@@ -4,184 +4,184 @@ DescriptorResolver@0 {
 }
 
 LazyJavaClassDescriptor@2['AbstractCollection'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@3['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractCollection']
 }
 
 LazyJavaClassDescriptor@4['AbstractSet'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@5['AbstractSet']
+    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractSet']
 }
 
 LazyJavaClassDescriptor@6['HashSet'] {
-    _constructors = ArrayList@7[5] { JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], JavaConstructorDescriptor@10['<init>'], ... } // through LazyJavaClassMemberScope@11
-    _functionTypeForSamInterface = null
-    _typeConstructor = LazyJavaClassTypeConstructor@12['HashSet']
-    defaultType = JetTypeImpl@13['HashSet<1>']
+    constructors = ArrayList@7[5] { JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], JavaConstructorDescriptor@10['<init>'], ... } // through LazyJavaClassMemberScope@11
+    defaultType = JetTypeImpl@12['HashSet<1>']
+    functionTypeForSamInterface = null
+    typeConstructor = LazyJavaClassTypeConstructor@13['HashSet']
 }
 
 LazyJavaClassDescriptor@14['Serializable'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
 }
 
 LazyJavaClassTypeConstructor@3['AbstractCollection'] {
-    _supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Collection<E>'] }
+    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Collection<E>'] }
 }
 
 LazyJavaClassTypeConstructor@5['AbstractSet'] {
-    _parameters = ArrayList@18[1] { LazyJavaTypeParameterDescriptor@19['E'] }
-    _supertypes = ArrayList@20[2] { LazyJavaClassifierType@21['AbstractCollection<E>'], LazyJavaClassifierType@22['Set<E>'] }
+    parameters = ArrayList@18[1] { LazyJavaTypeParameterDescriptor@19['E'] }
+    supertypes = ArrayList@20[2] { LazyJavaClassifierType@21['AbstractCollection<E>'], LazyJavaClassifierType@22['Set<E>'] }
 }
 
-LazyJavaClassTypeConstructor@12['HashSet'] {
-    _parameters = ArrayList@23[1] { LazyJavaTypeParameterDescriptor@24['E'] }
-    _supertypes = ArrayList@25[4] { LazyJavaClassifierType@26['AbstractSet<E>'], LazyJavaClassifierType@27['Set<E>'], LazyJavaClassifierType@28['Cloneable'], ... }
+LazyJavaClassTypeConstructor@13['HashSet'] {
+    parameters = ArrayList@23[1] { LazyJavaTypeParameterDescriptor@24['E'] }
+    supertypes = ArrayList@25[4] { LazyJavaClassifierType@26['AbstractSet<E>'], LazyJavaClassifierType@27['Set<E>'], LazyJavaClassifierType@28['Cloneable'], ... }
 }
 
 LazyJavaClassTypeConstructor@15['Serializable'] {
-    _supertypes = ArrayList@29[1] { JetTypeImpl@30['Any'] }
+    supertypes = ArrayList@29[1] { JetTypeImpl@30['Any'] }
 }
 
 LazyJavaClassifierType@21['AbstractCollection<E>'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@3['AbstractCollection']
     classifier = JavaClassImpl@31['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractCollection']
 }
 
 LazyJavaClassifierType@26['AbstractSet<E>'] {
-    _arguments = ArrayList@32[1] { TypeProjectionImpl@33 }
-    _typeConstructor = LazyJavaClassTypeConstructor@5['AbstractSet']
+    arguments = ArrayList@32[1] { TypeProjectionImpl@33 }
     classifier = JavaClassImpl@34['AbstractSet']
+    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractSet']
 }
 
 LazyJavaClassifierType@28['Cloneable'] {
-    _typeConstructor = DeserializedClassTypeConstructor@35
-    classifier = JavaClassImpl@36['Cloneable']
+    classifier = JavaClassImpl@35['Cloneable']
+    typeConstructor = DeserializedClassTypeConstructor@36
 }
 
 LazyJavaClassifierType@37['Collection<? extends E>'] {
-    _arguments = ArrayList@38[1] { TypeProjectionImpl@39 }
-    _memberScope = SubstitutingScope@40
-    _nullable = 'false': Boolean@41
-    _typeConstructor = DeserializedClassTypeConstructor@42
-    classifier = JavaClassImpl@43['Collection']
+    arguments = ArrayList@38[1] { TypeProjectionImpl@39 }
+    classifier = JavaClassImpl@40['Collection']
+    memberScope = SubstitutingScope@41
+    nullable = 'false': Boolean@42
+    typeConstructor = DeserializedClassTypeConstructor@43
 }
 
 LazyJavaClassifierType@44['Collection<? extends E>'] {
-    _arguments = ArrayList@45[1] { TypeProjectionImpl@46 }
-    _memberScope = SubstitutingScope@47
-    _nullable = 'true': Boolean@48
-    _typeConstructor = DeserializedClassTypeConstructor@49
-    classifier = JavaClassImpl@43['Collection']
+    arguments = ArrayList@45[1] { TypeProjectionImpl@46 }
+    classifier = JavaClassImpl@40['Collection']
+    memberScope = SubstitutingScope@47
+    nullable = 'true': Boolean@48
+    typeConstructor = DeserializedClassTypeConstructor@49
 }
 
 LazyJavaClassifierType@17['Collection<E>'] {
-    _typeConstructor = DeserializedClassTypeConstructor@42
     classifier = JavaClassImpl@50['Collection']
+    typeConstructor = DeserializedClassTypeConstructor@43
 }
 
 LazyJavaClassifierType@51['E'] {
-    _arguments = ArrayList@52[empty]
-    _nullable = 'false': Boolean@41
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-    classifier = JavaTypeParameterImpl@54['E']
+    arguments = ArrayList@52[empty]
+    classifier = JavaTypeParameterImpl@53['E']
+    nullable = 'false': Boolean@42
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
 LazyJavaClassifierType@55['E'] {
-    _arguments = ArrayList@56[empty]
-    _nullable = 'false': Boolean@41
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-    classifier = JavaTypeParameterImpl@58['E']
+    arguments = ArrayList@56[empty]
+    classifier = JavaTypeParameterImpl@57['E']
+    nullable = 'false': Boolean@42
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
-LazyJavaClassifierType@59['E'] {
-    _arguments = ArrayList@60[empty]
-    _nullable = 'false': Boolean@41
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-    classifier = JavaTypeParameterImpl@61['E']
+LazyJavaClassifierType@58['E'] {
+    arguments = ArrayList@59[empty]
+    classifier = JavaTypeParameterImpl@60['E']
+    nullable = 'false': Boolean@42
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@61
 }
 
 LazyJavaClassifierType@62['E'] {
-    _arguments = ArrayList@63[empty]
-    _nullable = 'false': Boolean@41
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    arguments = ArrayList@63[empty]
     classifier = JavaTypeParameterImpl@64['E']
+    nullable = 'false': Boolean@42
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
 LazyJavaClassifierType@65['E'] {
-    _arguments = ArrayList@66[empty]
-    _nullable = 'true': Boolean@48
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-    classifier = JavaTypeParameterImpl@54['E']
+    arguments = ArrayList@66[empty]
+    classifier = JavaTypeParameterImpl@57['E']
+    nullable = 'true': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
 LazyJavaClassifierType@67['E'] {
-    _arguments = ArrayList@68[empty]
-    _nullable = 'true': Boolean@48
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-    classifier = JavaTypeParameterImpl@58['E']
+    arguments = ArrayList@68[empty]
+    classifier = JavaTypeParameterImpl@53['E']
+    nullable = 'true': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
 LazyJavaClassifierType@69['E'] {
-    _arguments = ArrayList@70[empty]
-    _nullable = 'true': Boolean@48
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-    classifier = JavaTypeParameterImpl@61['E']
+    arguments = ArrayList@70[empty]
+    classifier = JavaTypeParameterImpl@64['E']
+    nullable = 'true': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
 LazyJavaClassifierType@71['E'] {
-    _arguments = ArrayList@72[empty]
-    _nullable = 'true': Boolean@48
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-    classifier = JavaTypeParameterImpl@64['E']
+    arguments = ArrayList@72[empty]
+    classifier = JavaTypeParameterImpl@60['E']
+    nullable = 'true': Boolean@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@61
 }
 
 LazyJavaClassifierType@73['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@74
-    classifier = JavaClassImpl@75['Object']
+    classifier = JavaClassImpl@74['Object']
+    typeConstructor = DeserializedClassTypeConstructor@75
 }
 
 LazyJavaClassifierType@76['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@74
     classifier = JavaClassImpl@77['Object']
+    typeConstructor = DeserializedClassTypeConstructor@75
 }
 
 LazyJavaClassifierType@78['Serializable'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
     classifier = JavaClassImpl@79['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
 }
 
 LazyJavaClassifierType@22['Set<E>'] {
-    _arguments = ArrayList@80[1] { TypeProjectionImpl@81 }
-    _memberScope = SubstitutingScope@82
-    _nullable = 'false': Boolean@41
-    _typeConstructor = DeserializedClassTypeConstructor@83
-    classifier = JavaClassImpl@84['Set']
+    arguments = ArrayList@80[1] { TypeProjectionImpl@81 }
+    classifier = JavaClassImpl@82['Set']
+    memberScope = SubstitutingScope@83
+    nullable = 'false': Boolean@42
+    typeConstructor = DeserializedClassTypeConstructor@84
 }
 
 LazyJavaClassifierType@27['Set<E>'] {
-    _typeConstructor = DeserializedClassTypeConstructor@83
     classifier = JavaClassImpl@85['Set']
+    typeConstructor = DeserializedClassTypeConstructor@84
 }
 
 LazyJavaPackageFragmentProvider@86 {
-    _packageFragments('<root>': FqName@87) = LazyJavaPackageFragment@88['<root>']
-    _packageFragments('MutableSet': FqName@89) = null
-    _packageFragments('String': FqName@90) = null
-    _packageFragments('a': FqName@91) = null
-    _packageFragments('a.MutableSet': FqName@92) = null
-    _packageFragments('a.R': FqName@93) = null
-    _packageFragments('a.String': FqName@94) = null
-    _packageFragments('a.a': FqName@95) = null
-    _packageFragments('java': FqName@96) = LazyJavaPackageFragment@97['java']
-    _packageFragments('java.io': FqName@98) = LazyJavaPackageFragment@99['io']
-    _packageFragments('java.lang': FqName@100) = LazyJavaPackageFragment@101['lang']
-    _packageFragments('java.lang.MutableSet': FqName@102) = null
-    _packageFragments('java.lang.String': FqName@103) = null
-    _packageFragments('java.util': FqName@104) = LazyJavaPackageFragment@105['util']
-    _packageFragments('java.util.HashSet': FqName@106) = null
-    _packageFragments('kotlin': FqName@107) = null
-    _packageFragments('kotlin.MutableSet': FqName@108) = null
-    _packageFragments('kotlin.String': FqName@109) = null
-    _packageFragments('kotlin.io': FqName@110) = null
-    _packageFragments('kotlin.jvm': FqName@111) = null
+    packageFragments('<root>': FqName@87) = LazyJavaPackageFragment@88['<root>']
+    packageFragments('MutableSet': FqName@89) = null
+    packageFragments('String': FqName@90) = null
+    packageFragments('a': FqName@91) = null
+    packageFragments('a.MutableSet': FqName@92) = null
+    packageFragments('a.R': FqName@93) = null
+    packageFragments('a.String': FqName@94) = null
+    packageFragments('a.a': FqName@95) = null
+    packageFragments('java': FqName@96) = LazyJavaPackageFragment@97['java']
+    packageFragments('java.io': FqName@98) = LazyJavaPackageFragment@99['io']
+    packageFragments('java.lang': FqName@100) = LazyJavaPackageFragment@101['lang']
+    packageFragments('java.lang.MutableSet': FqName@102) = null
+    packageFragments('java.lang.String': FqName@103) = null
+    packageFragments('java.util': FqName@104) = LazyJavaPackageFragment@105['util']
+    packageFragments('java.util.HashSet': FqName@106) = null
+    packageFragments('kotlin': FqName@107) = null
+    packageFragments('kotlin.MutableSet': FqName@108) = null
+    packageFragments('kotlin.String': FqName@109) = null
+    packageFragments('kotlin.io': FqName@110) = null
+    packageFragments('kotlin.jvm': FqName@111) = null
     topLevelClasses(JavaClassImpl@31['AbstractCollection']) = LazyJavaClassDescriptor@2['AbstractCollection']
     topLevelClasses(JavaClassImpl@34['AbstractSet']) = LazyJavaClassDescriptor@4['AbstractSet']
     topLevelClasses(JavaClassImpl@112['HashSet']) = LazyJavaClassDescriptor@6['HashSet']
@@ -189,40 +189,40 @@ LazyJavaPackageFragmentProvider@86 {
 }
 
 LazyJavaPackageFragment@97['java'] {
-    _functions('lang': Name@113) = EmptyList@114[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    _functions('util': Name@116) = EmptyList@114[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('lang': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('util': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@119 // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('lang': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@114
+    classes('util': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@114
+    deserializedPackageScope = Empty@116 // through LazyPackageFragmentScopeForJavaPackage@114
+    functions('lang': Name@117) = EmptyList@118[empty] // through LazyPackageFragmentScopeForJavaPackage@114
+    functions('util': Name@119) = EmptyList@118[empty] // through LazyPackageFragmentScopeForJavaPackage@114
+    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@114
 }
 
 LazyJavaPackageFragment@101['lang'] {
-    _functions('HashSet': Name@121) = EmptyList@114[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    _functions('equals': Name@123) = EmptyList@114[empty] // through LazyPackageFragmentScopeForJavaPackage@122
     classes('HashSet': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('a': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('b': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('equals': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    deserializedPackageScope = Empty@119 // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('a': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('b': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('equals': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    deserializedPackageScope = Empty@116 // through LazyPackageFragmentScopeForJavaPackage@122
+    functions('HashSet': Name@121) = EmptyList@118[empty] // through LazyPackageFragmentScopeForJavaPackage@122
+    functions('equals': Name@125) = EmptyList@118[empty] // through LazyPackageFragmentScopeForJavaPackage@122
     memberIndex = computeMemberIndex$1@126 // through LazyPackageFragmentScopeForJavaPackage@122
 }
 
 LazyJavaPackageFragment@105['util'] {
-    _functions('HashSet': Name@127) = EmptyList@114[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('HashSet': Name@129) = LazyJavaClassDescriptor@6['HashSet'] // through LazyPackageFragmentScopeForJavaPackage@128
-    deserializedPackageScope = Empty@119 // through LazyPackageFragmentScopeForJavaPackage@128
+    classes('HashSet': Name@127) = LazyJavaClassDescriptor@6['HashSet'] // through LazyPackageFragmentScopeForJavaPackage@128
+    deserializedPackageScope = Empty@116 // through LazyPackageFragmentScopeForJavaPackage@128
+    functions('HashSet': Name@129) = EmptyList@118[empty] // through LazyPackageFragmentScopeForJavaPackage@128
     memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@128
 }
 
 LazyJavaTypeParameterDescriptor@24['E'] {
     defaultType = JetTypeImpl@131['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
     upperBounds = LinkedHashSet@132[1] { NullableType@133 }
 }
 
 LazyJavaTypeParameterDescriptor@19['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@61
 }
 
 LazyJavaTypeParameterResolver@134 {

compiler/testData/diagnostics/tests/controlFlowAnalysis/breakOrContinueInLoopCondition.lazy.log

@@ -1,53 +1,53 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('Boolean': FqName@3) = null
-    _packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    _packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    _packageFragments('java.lang.Boolean': FqName@8) = null
-    _packageFragments('kotlin': FqName@9) = null
-    _packageFragments('kotlin.Boolean': FqName@10) = null
-    _packageFragments('kotlin.io': FqName@11) = null
-    _packageFragments('kotlin.jvm': FqName@12) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('Boolean': FqName@3) = null
+    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
+    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
+    packageFragments('java.lang.Boolean': FqName@8) = null
+    packageFragments('kotlin': FqName@9) = null
+    packageFragments('kotlin.Boolean': FqName@10) = null
+    packageFragments('kotlin.io': FqName@11) = null
+    packageFragments('kotlin.jvm': FqName@12) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    _functions('equals': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    _functions('hasNext': Name@16) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    _functions('inc': Name@17) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    _functions('iterator': Name@18) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    _functions('next': Name@19) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    _functions('rangeTo': Name@20) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('Boolean': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('equals': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('hasNext': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('inc': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('iterator': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('next': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('rangeTo': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@15
+    classes('Boolean': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
+    classes('equals': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
+    classes('hasNext': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
+    classes('inc': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@14
+    classes('iterator': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@14
+    classes('next': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@14
+    classes('rangeTo': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@14
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@14
+    functions('equals': Name@15) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@14
+    functions('hasNext': Name@16) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@14
+    functions('inc': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@14
+    functions('iterator': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@14
+    functions('next': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@14
+    functions('rangeTo': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@14
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@5['java'] {
-    _functions('lang': Name@24) = EmptyList@14[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@7['lang'] {
-    _functions('equals': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    _functions('hasNext': Name@16) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    _functions('inc': Name@17) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    _functions('iterator': Name@18) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    _functions('next': Name@19) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    _functions('rangeTo': Name@20) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('equals': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('equals': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('hasNext': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('inc': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('iterator': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('next': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('rangeTo': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('equals': Name@15) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('hasNext': Name@16) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('inc': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('iterator': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('next': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('rangeTo': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/checkInnerLocalDeclarations.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/checkPropertyAccessor.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commasAndWhitespaces.lazy.log

@@ -3,154 +3,154 @@ 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@23['String']
+    arguments = ArrayList@25[empty]
+    classifier = JavaClassImpl@20['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
-    _arguments = ArrayList@28[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@16
-    classifier = JavaClassImpl@20['String']
+    arguments = ArrayList@28[empty]
+    classifier = JavaClassImpl@15['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
-    _arguments = ArrayList@30[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@16
-    classifier = JavaClassImpl@17['String']
+    arguments = ArrayList@30[empty]
+    classifier = JavaClassImpl@23['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@31['Throwable'] {
-    _arguments = ArrayList@32[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@34['Throwable']
+    arguments = ArrayList@32[empty]
+    classifier = JavaClassImpl@33['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@35['Throwable'] {
-    _arguments = ArrayList@36[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@36[empty]
     classifier = JavaClassImpl@37['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@38['Throwable'] {
-    _arguments = ArrayList@39[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@39[empty]
     classifier = JavaClassImpl@40['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@41['Throwable'] {
-    _arguments = ArrayList@42[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@34['Throwable']
+    arguments = ArrayList@42[empty]
+    classifier = JavaClassImpl@33['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
-    _arguments = ArrayList@44[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@44[empty]
     classifier = JavaClassImpl@37['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
-    _arguments = ArrayList@46[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@46[empty]
     classifier = JavaClassImpl@40['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@12['Throwable'] {
-    _arguments = ArrayList@47[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@47[empty]
     classifier = JavaClassImpl@48['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaPackageFragmentProvider@49 {
-    _packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    _packageFragments('Any': FqName@52) = null
-    _packageFragments('Int': FqName@53) = null
-    _packageFragments('String': FqName@54) = null
-    _packageFragments('java': FqName@55) = LazyJavaPackageFragment@56['java']
-    _packageFragments('java.lang': FqName@57) = LazyJavaPackageFragment@58['lang']
-    _packageFragments('java.lang.Any': FqName@59) = null
-    _packageFragments('java.lang.Int': FqName@60) = null
-    _packageFragments('java.lang.String': FqName@61) = null
-    _packageFragments('kotlin': FqName@62) = null
-    _packageFragments('kotlin.Any': FqName@63) = null
-    _packageFragments('kotlin.Int': FqName@64) = null
-    _packageFragments('kotlin.String': FqName@65) = null
-    _packageFragments('kotlin.io': FqName@66) = null
-    _packageFragments('kotlin.jvm': FqName@67) = null
+    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
+    packageFragments('Any': FqName@52) = null
+    packageFragments('Int': FqName@53) = null
+    packageFragments('String': FqName@54) = null
+    packageFragments('java': FqName@55) = LazyJavaPackageFragment@56['java']
+    packageFragments('java.lang': FqName@57) = LazyJavaPackageFragment@58['lang']
+    packageFragments('java.lang.Any': FqName@59) = null
+    packageFragments('java.lang.Int': FqName@60) = null
+    packageFragments('java.lang.String': FqName@61) = null
+    packageFragments('kotlin': FqName@62) = null
+    packageFragments('kotlin.Any': FqName@63) = null
+    packageFragments('kotlin.Int': FqName@64) = null
+    packageFragments('kotlin.String': FqName@65) = null
+    packageFragments('kotlin.io': FqName@66) = null
+    packageFragments('kotlin.jvm': FqName@67) = null
     topLevelClasses(JavaClassImpl@68['Exception']) = LazyJavaClassDescriptor@2['Exception']
 }
 
 LazyJavaPackageFragment@51['<root>'] {
-    _functions('Exception': Name@69) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    _functions('bar': Name@72) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    _functions('todo': Name@73) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('Any': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('Exception': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('String': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('bar': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('todo': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('Any': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('Exception': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('Int': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('String': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('bar': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('todo': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('Exception': Name@71) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('bar': Name@74) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('todo': Name@75) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@70
+    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@70
 }
 
 LazyJavaPackageFragment@56['java'] {
-    _functions('lang': Name@79) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('lang': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('lang': Name@81) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
 }
 
 LazyJavaPackageFragment@58['lang'] {
-    _functions('Exception': Name@69) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    _functions('bar': Name@72) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    _functions('todo': Name@73) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('Exception': Name@69) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('bar': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('todo': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('Exception': Name@71) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('bar': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('todo': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('Exception': Name@71) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('bar': Name@74) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('todo': Name@75) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@83
     memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commentsInDeadCode.lazy.log

@@ -3,144 +3,144 @@ 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
-    classifier = JavaClassImpl@20['String']
+    arguments = ArrayList@28[empty]
+    classifier = JavaClassImpl@15['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@20['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@37['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
-    _arguments = ArrayList@46[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@40['Throwable']
+    arguments = ArrayList@46[empty]
+    classifier = JavaClassImpl@33['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@12['Throwable'] {
-    _arguments = ArrayList@47[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@47[empty]
     classifier = JavaClassImpl@48['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaPackageFragmentProvider@49 {
-    _packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    _packageFragments('Any': FqName@52) = null
-    _packageFragments('Int': FqName@53) = null
-    _packageFragments('String': FqName@54) = null
-    _packageFragments('a': FqName@55) = null
-    _packageFragments('a.Any': FqName@56) = null
-    _packageFragments('a.Int': FqName@57) = null
-    _packageFragments('a.String': FqName@58) = null
-    _packageFragments('java': FqName@59) = LazyJavaPackageFragment@60['java']
-    _packageFragments('java.lang': FqName@61) = LazyJavaPackageFragment@62['lang']
-    _packageFragments('java.lang.Any': FqName@63) = null
-    _packageFragments('java.lang.Int': FqName@64) = null
-    _packageFragments('java.lang.String': FqName@65) = null
-    _packageFragments('kotlin': FqName@66) = null
-    _packageFragments('kotlin.Any': FqName@67) = null
-    _packageFragments('kotlin.Int': FqName@68) = null
-    _packageFragments('kotlin.String': FqName@69) = null
-    _packageFragments('kotlin.io': FqName@70) = null
-    _packageFragments('kotlin.jvm': FqName@71) = null
+    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
+    packageFragments('Any': FqName@52) = null
+    packageFragments('Int': FqName@53) = null
+    packageFragments('String': FqName@54) = null
+    packageFragments('a': FqName@55) = null
+    packageFragments('a.Any': FqName@56) = null
+    packageFragments('a.Int': FqName@57) = null
+    packageFragments('a.String': FqName@58) = null
+    packageFragments('java': FqName@59) = LazyJavaPackageFragment@60['java']
+    packageFragments('java.lang': FqName@61) = LazyJavaPackageFragment@62['lang']
+    packageFragments('java.lang.Any': FqName@63) = null
+    packageFragments('java.lang.Int': FqName@64) = null
+    packageFragments('java.lang.String': FqName@65) = null
+    packageFragments('kotlin': FqName@66) = null
+    packageFragments('kotlin.Any': FqName@67) = null
+    packageFragments('kotlin.Int': FqName@68) = null
+    packageFragments('kotlin.String': FqName@69) = null
+    packageFragments('kotlin.io': FqName@70) = null
+    packageFragments('kotlin.jvm': FqName@71) = null
     topLevelClasses(JavaClassImpl@72['Exception']) = LazyJavaClassDescriptor@2['Exception']
 }
 
 LazyJavaPackageFragment@60['java'] {
-    _functions('lang': Name@73) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('lang': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('lang': Name@76) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@74
 }
 
 LazyJavaPackageFragment@62['lang'] {
-    _functions('Exception': Name@79) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('bar': Name@81) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('todo': Name@82) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     classes('Exception': Name@79) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@80
     classes('bar': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@80
     classes('todo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@80
+    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('Exception': Name@79) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('bar': Name@81) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('todo': Name@82) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@80
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInInvokeCall.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInReceiver.lazy.log

@@ -3,150 +3,150 @@ 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
+    arguments = ArrayList@25[empty]
     classifier = JavaClassImpl@20['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@23['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
-    _arguments = ArrayList@30[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@16
-    classifier = JavaClassImpl@17['String']
+    arguments = ArrayList@30[empty]
+    classifier = JavaClassImpl@15['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@31['Throwable'] {
-    _arguments = ArrayList@32[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@34['Throwable']
+    arguments = ArrayList@32[empty]
+    classifier = JavaClassImpl@33['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@35['Throwable'] {
-    _arguments = ArrayList@36[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@36[empty]
     classifier = JavaClassImpl@37['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@38['Throwable'] {
-    _arguments = ArrayList@39[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@39[empty]
     classifier = JavaClassImpl@40['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@41['Throwable'] {
-    _arguments = ArrayList@42[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@42[empty]
     classifier = JavaClassImpl@40['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
-    _arguments = ArrayList@44[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@34['Throwable']
+    arguments = ArrayList@44[empty]
+    classifier = JavaClassImpl@37['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
-    _arguments = ArrayList@46[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@37['Throwable']
+    arguments = ArrayList@46[empty]
+    classifier = JavaClassImpl@33['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@12['Throwable'] {
-    _arguments = ArrayList@47[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@47[empty]
     classifier = JavaClassImpl@48['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaPackageFragmentProvider@49 {
-    _packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    _packageFragments('Any': FqName@52) = null
-    _packageFragments('Int': FqName@53) = null
-    _packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
-    _packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
-    _packageFragments('java.lang.Any': FqName@58) = null
-    _packageFragments('java.lang.Int': FqName@59) = null
-    _packageFragments('kotlin': FqName@60) = null
-    _packageFragments('kotlin.Any': FqName@61) = null
-    _packageFragments('kotlin.Int': FqName@62) = null
-    _packageFragments('kotlin.io': FqName@63) = null
-    _packageFragments('kotlin.jvm': FqName@64) = null
+    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
+    packageFragments('Any': FqName@52) = null
+    packageFragments('Int': FqName@53) = null
+    packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
+    packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
+    packageFragments('java.lang.Any': FqName@58) = null
+    packageFragments('java.lang.Int': FqName@59) = null
+    packageFragments('kotlin': FqName@60) = null
+    packageFragments('kotlin.Any': FqName@61) = null
+    packageFragments('kotlin.Int': FqName@62) = null
+    packageFragments('kotlin.io': FqName@63) = null
+    packageFragments('kotlin.jvm': FqName@64) = null
     topLevelClasses(JavaClassImpl@65['Exception']) = LazyJavaClassDescriptor@2['Exception']
 }
 
 LazyJavaPackageFragment@51['<root>'] {
-    _functions('Exception': Name@66) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    _functions('bar': Name@69) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    _functions('todo': Name@70) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('Any': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('Exception': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('Int': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('bar': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('todo': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('Any': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('Exception': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('Int': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('bar': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('todo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('Exception': Name@68) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('bar': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('todo': Name@71) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@67
 }
 
 LazyJavaPackageFragment@55['java'] {
-    _functions('lang': Name@75) = EmptyList@67[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@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
     memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@57['lang'] {
-    _functions('Exception': Name@66) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    _functions('bar': Name@69) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    _functions('todo': Name@70) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('Exception': Name@66) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('bar': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('todo': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('Exception': Name@68) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('bar': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('todo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('Exception': Name@68) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('bar': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('todo': Name@71) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
     memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@79
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeDifferentExamples.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeFromDifferentSources.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@15['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
-    _arguments = ArrayList@28[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@16
-    classifier = JavaClassImpl@20['String']
+    arguments = ArrayList@28[empty]
+    classifier = JavaClassImpl@23['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@20['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@34['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@40['Throwable']
+    arguments = ArrayList@44[empty]
+    classifier = JavaClassImpl@37['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
-    _arguments = ArrayList@46[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@37['Throwable']
+    arguments = ArrayList@46[empty]
+    classifier = JavaClassImpl@33['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@12['Throwable'] {
-    _arguments = ArrayList@47[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@47[empty]
     classifier = JavaClassImpl@48['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaPackageFragmentProvider@49 {
-    _packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    _packageFragments('A': FqName@52) = null
-    _packageFragments('Nothing': FqName@53) = null
-    _packageFragments('c': FqName@54) = null
-    _packageFragments('c.A': FqName@55) = null
-    _packageFragments('c.Nothing': FqName@56) = null
-    _packageFragments('java': FqName@57) = LazyJavaPackageFragment@58['java']
-    _packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
-    _packageFragments('java.lang.A': FqName@61) = null
-    _packageFragments('java.lang.Nothing': FqName@62) = null
-    _packageFragments('kotlin': FqName@63) = null
-    _packageFragments('kotlin.A': FqName@64) = null
-    _packageFragments('kotlin.Nothing': FqName@65) = null
-    _packageFragments('kotlin.io': FqName@66) = null
-    _packageFragments('kotlin.jvm': FqName@67) = null
+    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
+    packageFragments('A': FqName@52) = null
+    packageFragments('Nothing': FqName@53) = null
+    packageFragments('c': FqName@54) = null
+    packageFragments('c.A': FqName@55) = null
+    packageFragments('c.Nothing': FqName@56) = null
+    packageFragments('java': FqName@57) = LazyJavaPackageFragment@58['java']
+    packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
+    packageFragments('java.lang.A': FqName@61) = null
+    packageFragments('java.lang.Nothing': FqName@62) = null
+    packageFragments('kotlin': FqName@63) = null
+    packageFragments('kotlin.A': FqName@64) = null
+    packageFragments('kotlin.Nothing': FqName@65) = null
+    packageFragments('kotlin.io': FqName@66) = null
+    packageFragments('kotlin.jvm': FqName@67) = null
     topLevelClasses(JavaClassImpl@68['Exception']) = LazyJavaClassDescriptor@2['Exception']
 }
 
 LazyJavaPackageFragment@58['java'] {
-    _functions('lang': Name@69) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('lang': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('lang': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('lang': Name@72) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@70
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@70
 }
 
 LazyJavaPackageFragment@60['lang'] {
-    _functions('Exception': Name@75) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    _functions('bar': Name@77) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    _functions('plus': Name@78) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
     classes('Exception': Name@75) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@76
     classes('bar': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@76
     classes('plus': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('Exception': Name@75) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('bar': Name@77) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('plus': Name@78) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
     memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@76
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInArrayAccess.lazy.log

@@ -3,174 +3,174 @@ 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@23['String']
+    arguments = ArrayList@25[empty]
+    classifier = JavaClassImpl@20['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
-    _arguments = ArrayList@28[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@16
-    classifier = JavaClassImpl@20['String']
+    arguments = ArrayList@28[empty]
+    classifier = JavaClassImpl@15['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
-    _arguments = ArrayList@30[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@16
-    classifier = JavaClassImpl@17['String']
+    arguments = ArrayList@30[empty]
+    classifier = JavaClassImpl@23['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@31['Throwable'] {
-    _arguments = ArrayList@32[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@34['Throwable']
+    arguments = ArrayList@32[empty]
+    classifier = JavaClassImpl@33['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@35['Throwable'] {
-    _arguments = ArrayList@36[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@36[empty]
     classifier = JavaClassImpl@37['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@38['Throwable'] {
-    _arguments = ArrayList@39[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@39[empty]
     classifier = JavaClassImpl@40['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@41['Throwable'] {
-    _arguments = ArrayList@42[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@34['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
+    arguments = ArrayList@44[empty]
     classifier = JavaClassImpl@37['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
-    _arguments = ArrayList@46[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@40['Throwable']
+    arguments = ArrayList@46[empty]
+    classifier = JavaClassImpl@33['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@12['Throwable'] {
-    _arguments = ArrayList@47[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@47[empty]
     classifier = JavaClassImpl@48['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaPackageFragmentProvider@49 {
-    _packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    _packageFragments('Any': FqName@52) = null
-    _packageFragments('Array': FqName@53) = null
-    _packageFragments('Int': FqName@54) = null
-    _packageFragments('Nothing': FqName@55) = null
-    _packageFragments('String': FqName@56) = null
-    _packageFragments('java': FqName@57) = LazyJavaPackageFragment@58['java']
-    _packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
-    _packageFragments('java.lang.Any': FqName@61) = null
-    _packageFragments('java.lang.Array': FqName@62) = null
-    _packageFragments('java.lang.Int': FqName@63) = null
-    _packageFragments('java.lang.Nothing': FqName@64) = null
-    _packageFragments('java.lang.String': FqName@65) = null
-    _packageFragments('kotlin': FqName@66) = null
-    _packageFragments('kotlin.Any': FqName@67) = null
-    _packageFragments('kotlin.Array': FqName@68) = null
-    _packageFragments('kotlin.Int': FqName@69) = null
-    _packageFragments('kotlin.Nothing': FqName@70) = null
-    _packageFragments('kotlin.String': FqName@71) = null
-    _packageFragments('kotlin.io': FqName@72) = null
-    _packageFragments('kotlin.jvm': FqName@73) = null
+    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
+    packageFragments('Any': FqName@52) = null
+    packageFragments('Array': FqName@53) = null
+    packageFragments('Int': FqName@54) = null
+    packageFragments('Nothing': FqName@55) = null
+    packageFragments('String': FqName@56) = null
+    packageFragments('java': FqName@57) = LazyJavaPackageFragment@58['java']
+    packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
+    packageFragments('java.lang.Any': FqName@61) = null
+    packageFragments('java.lang.Array': FqName@62) = null
+    packageFragments('java.lang.Int': FqName@63) = null
+    packageFragments('java.lang.Nothing': FqName@64) = null
+    packageFragments('java.lang.String': FqName@65) = null
+    packageFragments('kotlin': FqName@66) = null
+    packageFragments('kotlin.Any': FqName@67) = null
+    packageFragments('kotlin.Array': FqName@68) = null
+    packageFragments('kotlin.Int': FqName@69) = null
+    packageFragments('kotlin.Nothing': FqName@70) = null
+    packageFragments('kotlin.String': FqName@71) = null
+    packageFragments('kotlin.io': FqName@72) = null
+    packageFragments('kotlin.jvm': FqName@73) = null
     topLevelClasses(JavaClassImpl@74['Exception']) = LazyJavaClassDescriptor@2['Exception']
 }
 
 LazyJavaPackageFragment@51['<root>'] {
-    _functions('Exception': Name@75) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    _functions('get': Name@78) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    _functions('plus': Name@79) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    _functions('plusAssign': Name@80) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    _functions('set': Name@81) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    _functions('todo': Name@82) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('Any': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('Array': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('Exception': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('Nothing': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('get': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('plus': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('plusAssign': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('set': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('todo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('Any': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('Array': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('Exception': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('Nothing': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('get': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('plus': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('plusAssign': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('set': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('todo': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('Exception': Name@78) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('get': Name@82) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('plus': Name@83) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('plusAssign': Name@84) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('set': Name@85) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('todo': Name@86) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@58['java'] {
-    _functions('lang': Name@90) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@91
+    classes('lang': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
+    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@91
+    functions('lang': Name@92) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@91
     memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@91
 }
 
 LazyJavaPackageFragment@60['lang'] {
-    _functions('Exception': Name@75) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    _functions('get': Name@78) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    _functions('plus': Name@79) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    _functions('plusAssign': Name@80) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    _functions('set': Name@81) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    _functions('todo': Name@82) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('Exception': Name@75) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('get': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('plus': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('plusAssign': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('set': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('todo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('Exception': Name@78) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('get': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('plus': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('plusAssign': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('set': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('todo': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('Exception': Name@78) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('get': Name@82) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('plus': Name@83) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('plusAssign': Name@84) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('set': Name@85) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('todo': Name@86) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@94
     memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInAssignment.lazy.log

@@ -3,150 +3,150 @@ 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@20['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
-    _arguments = ArrayList@28[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@16
-    classifier = JavaClassImpl@20['String']
+    arguments = ArrayList@28[empty]
+    classifier = JavaClassImpl@23['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@33['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@40['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('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    _packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    _packageFragments('java.lang.Int': FqName@57) = null
-    _packageFragments('kotlin': FqName@58) = null
-    _packageFragments('kotlin.Int': FqName@59) = null
-    _packageFragments('kotlin.io': FqName@60) = null
-    _packageFragments('kotlin.jvm': FqName@61) = null
+    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
+    packageFragments('Int': FqName@52) = null
+    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
+    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
+    packageFragments('java.lang.Int': FqName@57) = null
+    packageFragments('kotlin': FqName@58) = null
+    packageFragments('kotlin.Int': FqName@59) = null
+    packageFragments('kotlin.io': FqName@60) = null
+    packageFragments('kotlin.jvm': FqName@61) = null
     topLevelClasses(JavaClassImpl@62['Exception']) = LazyJavaClassDescriptor@2['Exception']
 }
 
 LazyJavaPackageFragment@51['<root>'] {
-    _functions('Exception': Name@63) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    _functions('plus': Name@66) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    _functions('plusAssign': Name@67) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    _functions('todo': Name@68) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Exception': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Int': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('plus': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('plusAssign': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('todo': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('Exception': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Int': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('plus': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('plusAssign': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('todo': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('Exception': Name@63) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('plus': Name@66) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('plusAssign': Name@67) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('todo': Name@68) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
 LazyJavaPackageFragment@54['java'] {
-    _functions('lang': Name@72) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('lang': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('lang': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('lang': Name@74) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@73
     memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
 LazyJavaPackageFragment@56['lang'] {
-    _functions('Exception': Name@63) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    _functions('plus': Name@66) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    _functions('plusAssign': Name@67) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    _functions('todo': Name@68) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@76
     classes('Exception': Name@63) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@76
     classes('plus': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@76
     classes('plusAssign': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@76
     classes('todo': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('Exception': Name@63) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('plus': Name@66) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('plusAssign': Name@67) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('todo': Name@68) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
     memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInBinaryExpressions.lazy.log

@@ -3,162 +3,162 @@ 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
-    classifier = JavaClassImpl@23['String']
+    arguments = ArrayList@28[empty]
+    classifier = JavaClassImpl@20['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
-    _arguments = ArrayList@30[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@16
-    classifier = JavaClassImpl@20['String']
+    arguments = ArrayList@30[empty]
+    classifier = JavaClassImpl@15['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@31['Throwable'] {
-    _arguments = ArrayList@32[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@34['Throwable']
+    arguments = ArrayList@32[empty]
+    classifier = JavaClassImpl@33['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@35['Throwable'] {
-    _arguments = ArrayList@36[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@36[empty]
     classifier = JavaClassImpl@37['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@38['Throwable'] {
-    _arguments = ArrayList@39[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@39[empty]
     classifier = JavaClassImpl@40['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@41['Throwable'] {
-    _arguments = ArrayList@42[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@40['Throwable']
+    arguments = ArrayList@42[empty]
+    classifier = JavaClassImpl@37['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
-    _arguments = ArrayList@44[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@37['Throwable']
+    arguments = ArrayList@44[empty]
+    classifier = JavaClassImpl@40['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
-    _arguments = ArrayList@46[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@34['Throwable']
+    arguments = ArrayList@46[empty]
+    classifier = JavaClassImpl@33['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@12['Throwable'] {
-    _arguments = ArrayList@47[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@47[empty]
     classifier = JavaClassImpl@48['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaPackageFragmentProvider@49 {
-    _packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    _packageFragments('Boolean': FqName@52) = null
-    _packageFragments('Int': FqName@53) = null
-    _packageFragments('String': FqName@54) = null
-    _packageFragments('java': FqName@55) = LazyJavaPackageFragment@56['java']
-    _packageFragments('java.lang': FqName@57) = LazyJavaPackageFragment@58['lang']
-    _packageFragments('java.lang.Boolean': FqName@59) = null
-    _packageFragments('java.lang.Int': FqName@60) = null
-    _packageFragments('java.lang.String': FqName@61) = null
-    _packageFragments('kotlin': FqName@62) = null
-    _packageFragments('kotlin.Boolean': FqName@63) = null
-    _packageFragments('kotlin.Int': FqName@64) = null
-    _packageFragments('kotlin.String': FqName@65) = null
-    _packageFragments('kotlin.io': FqName@66) = null
-    _packageFragments('kotlin.jvm': FqName@67) = null
+    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
+    packageFragments('Boolean': FqName@52) = null
+    packageFragments('Int': FqName@53) = null
+    packageFragments('String': FqName@54) = null
+    packageFragments('java': FqName@55) = LazyJavaPackageFragment@56['java']
+    packageFragments('java.lang': FqName@57) = LazyJavaPackageFragment@58['lang']
+    packageFragments('java.lang.Boolean': FqName@59) = null
+    packageFragments('java.lang.Int': FqName@60) = null
+    packageFragments('java.lang.String': FqName@61) = null
+    packageFragments('kotlin': FqName@62) = null
+    packageFragments('kotlin.Boolean': FqName@63) = null
+    packageFragments('kotlin.Int': FqName@64) = null
+    packageFragments('kotlin.String': FqName@65) = null
+    packageFragments('kotlin.io': FqName@66) = null
+    packageFragments('kotlin.jvm': FqName@67) = null
     topLevelClasses(JavaClassImpl@68['Exception']) = LazyJavaClassDescriptor@2['Exception']
 }
 
 LazyJavaPackageFragment@51['<root>'] {
-    _functions('Exception': Name@69) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    _functions('bar': Name@72) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    _functions('plus': Name@73) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    _functions('times': Name@74) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    _functions('todo': Name@75) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('Boolean': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('Exception': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('Int': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('String': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('bar': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('plus': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('times': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('todo': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('Boolean': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('Exception': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('Int': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('String': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('bar': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('plus': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('times': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('todo': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('Exception': Name@71) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('bar': Name@74) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('plus': Name@75) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('times': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('todo': Name@77) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@70
+    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@70
 }
 
 LazyJavaPackageFragment@56['java'] {
-    _functions('lang': Name@81) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('lang': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@82
+    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@82
+    functions('lang': Name@83) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@82
     memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@82
 }
 
 LazyJavaPackageFragment@58['lang'] {
-    _functions('Exception': Name@69) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    _functions('bar': Name@72) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    _functions('plus': Name@73) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    _functions('times': Name@74) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    _functions('todo': Name@75) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('Exception': Name@69) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('bar': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('plus': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('times': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('todo': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('Exception': Name@71) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('bar': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('plus': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('times': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('todo': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('Exception': Name@71) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('bar': Name@74) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('plus': Name@75) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('times': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('todo': Name@77) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
     memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@85
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInCalls.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInDeadCode.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInIf.lazy.log

@@ -3,146 +3,146 @@ 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
+    arguments = ArrayList@25[empty]
     classifier = JavaClassImpl@20['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
-    _arguments = ArrayList@28[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@16
-    classifier = JavaClassImpl@23['String']
+    arguments = ArrayList@28[empty]
+    classifier = JavaClassImpl@15['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
-    _arguments = ArrayList@30[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@16
-    classifier = JavaClassImpl@17['String']
+    arguments = ArrayList@30[empty]
+    classifier = JavaClassImpl@23['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@31['Throwable'] {
-    _arguments = ArrayList@32[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@34['Throwable']
+    arguments = ArrayList@32[empty]
+    classifier = JavaClassImpl@33['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@35['Throwable'] {
-    _arguments = ArrayList@36[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@36[empty]
     classifier = JavaClassImpl@37['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@38['Throwable'] {
-    _arguments = ArrayList@39[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@39[empty]
     classifier = JavaClassImpl@40['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@41['Throwable'] {
-    _arguments = ArrayList@42[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@34['Throwable']
+    arguments = ArrayList@42[empty]
+    classifier = JavaClassImpl@33['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
-    _arguments = ArrayList@44[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@44[empty]
     classifier = JavaClassImpl@37['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
-    _arguments = ArrayList@46[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@46[empty]
     classifier = JavaClassImpl@40['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@12['Throwable'] {
-    _arguments = ArrayList@47[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@47[empty]
     classifier = JavaClassImpl@48['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaPackageFragmentProvider@49 {
-    _packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    _packageFragments('Boolean': FqName@52) = null
-    _packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    _packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    _packageFragments('java.lang.Boolean': FqName@57) = null
-    _packageFragments('kotlin': FqName@58) = null
-    _packageFragments('kotlin.Boolean': FqName@59) = null
-    _packageFragments('kotlin.io': FqName@60) = null
-    _packageFragments('kotlin.jvm': FqName@61) = null
+    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
+    packageFragments('Boolean': FqName@52) = null
+    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
+    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
+    packageFragments('java.lang.Boolean': FqName@57) = null
+    packageFragments('kotlin': FqName@58) = null
+    packageFragments('kotlin.Boolean': FqName@59) = null
+    packageFragments('kotlin.io': FqName@60) = null
+    packageFragments('kotlin.jvm': FqName@61) = null
     topLevelClasses(JavaClassImpl@62['Exception']) = LazyJavaClassDescriptor@2['Exception']
 }
 
 LazyJavaPackageFragment@51['<root>'] {
-    _functions('Exception': Name@63) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    _functions('bar': Name@66) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    _functions('todo': Name@67) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Boolean': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Exception': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('bar': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('todo': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('Boolean': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Exception': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('bar': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('todo': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('Exception': Name@65) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('bar': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('todo': Name@67) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
 LazyJavaPackageFragment@54['java'] {
-    _functions('lang': Name@71) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('lang': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('lang': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('lang': Name@73) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
 }
 
 LazyJavaPackageFragment@56['lang'] {
-    _functions('Exception': Name@63) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    _functions('bar': Name@66) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    _functions('todo': Name@67) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('Exception': Name@63) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('Exception': Name@65) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@75
     classes('bar': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@75
     classes('todo': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@75
+    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('Exception': Name@65) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('bar': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('todo': Name@67) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
     memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInInnerExpressions.lazy.log

@@ -3,162 +3,162 @@ 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
+    arguments = ArrayList@25[empty]
     classifier = JavaClassImpl@23['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
-    _arguments = ArrayList@28[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@16
-    classifier = JavaClassImpl@17['String']
+    arguments = ArrayList@28[empty]
+    classifier = JavaClassImpl@20['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
-    _arguments = ArrayList@30[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@16
-    classifier = JavaClassImpl@20['String']
+    arguments = ArrayList@30[empty]
+    classifier = JavaClassImpl@15['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@31['Throwable'] {
-    _arguments = ArrayList@32[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@34['Throwable']
+    arguments = ArrayList@32[empty]
+    classifier = JavaClassImpl@33['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@35['Throwable'] {
-    _arguments = ArrayList@36[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@36[empty]
     classifier = JavaClassImpl@37['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@38['Throwable'] {
-    _arguments = ArrayList@39[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@39[empty]
     classifier = JavaClassImpl@40['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@41['Throwable'] {
-    _arguments = ArrayList@42[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@42[empty]
     classifier = JavaClassImpl@40['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
-    _arguments = ArrayList@44[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@34['Throwable']
+    arguments = ArrayList@44[empty]
+    classifier = JavaClassImpl@33['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
-    _arguments = ArrayList@46[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    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('Array': FqName@52) = null
-    _packageFragments('Int': FqName@53) = null
-    _packageFragments('Nothing': FqName@54) = null
-    _packageFragments('String': FqName@55) = null
-    _packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    _packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    _packageFragments('java.lang.Array': FqName@60) = null
-    _packageFragments('java.lang.Int': FqName@61) = null
-    _packageFragments('java.lang.Nothing': FqName@62) = null
-    _packageFragments('java.lang.String': FqName@63) = null
-    _packageFragments('kotlin': FqName@64) = null
-    _packageFragments('kotlin.Array': FqName@65) = null
-    _packageFragments('kotlin.Int': FqName@66) = null
-    _packageFragments('kotlin.Nothing': FqName@67) = null
-    _packageFragments('kotlin.String': FqName@68) = null
-    _packageFragments('kotlin.io': FqName@69) = null
-    _packageFragments('kotlin.jvm': FqName@70) = null
+    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
+    packageFragments('Array': FqName@52) = null
+    packageFragments('Int': FqName@53) = null
+    packageFragments('Nothing': FqName@54) = null
+    packageFragments('String': FqName@55) = null
+    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
+    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
+    packageFragments('java.lang.Array': FqName@60) = null
+    packageFragments('java.lang.Int': FqName@61) = null
+    packageFragments('java.lang.Nothing': FqName@62) = null
+    packageFragments('java.lang.String': FqName@63) = null
+    packageFragments('kotlin': FqName@64) = null
+    packageFragments('kotlin.Array': FqName@65) = null
+    packageFragments('kotlin.Int': FqName@66) = null
+    packageFragments('kotlin.Nothing': FqName@67) = null
+    packageFragments('kotlin.String': FqName@68) = null
+    packageFragments('kotlin.io': FqName@69) = null
+    packageFragments('kotlin.jvm': FqName@70) = null
     topLevelClasses(JavaClassImpl@71['Exception']) = LazyJavaClassDescriptor@2['Exception']
 }
 
 LazyJavaPackageFragment@51['<root>'] {
-    _functions('Exception': Name@72) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    _functions('get': Name@75) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    _functions('times': Name@76) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    _functions('todo': Name@77) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('Array': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('Exception': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('Nothing': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('get': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('times': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('todo': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('Array': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('Exception': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('Nothing': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('String': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('get': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('times': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('todo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('Exception': Name@74) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('get': Name@78) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('times': Name@79) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('todo': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
 LazyJavaPackageFragment@57['java'] {
-    _functions('lang': Name@84) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('lang': Name@86) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
     memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
 LazyJavaPackageFragment@59['lang'] {
-    _functions('Exception': Name@72) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    _functions('get': Name@75) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    _functions('times': Name@76) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    _functions('todo': Name@77) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('Exception': Name@72) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('get': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('times': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('todo': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('Exception': Name@74) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('get': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('times': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('todo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('Exception': Name@74) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('get': Name@78) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('times': Name@79) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('todo': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
     memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLocalDeclarations.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLoops.lazy.log

@@ -4,155 +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@24['String']
+    arguments = ArrayList@26[empty]
+    classifier = JavaClassImpl@16['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@24['String']
+    nullable = 'true': Boolean@27
+    typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@30['String'] {
-    _arguments = ArrayList@31[empty]
-    _nullable = 'true': Boolean@27
-    _typeConstructor = DeserializedClassTypeConstructor@17
+    arguments = ArrayList@31[empty]
     classifier = JavaClassImpl@21['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@41['Throwable']
+    nullable = 'true': Boolean@27
+    typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@44['Throwable'] {
-    _arguments = ArrayList@45[empty]
-    _nullable = 'true': Boolean@27
-    _typeConstructor = DeserializedClassTypeConstructor@34
+    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@41['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('Nothing': FqName@53) = null
-    _packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
-    _packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
-    _packageFragments('java.lang.Nothing': FqName@58) = null
-    _packageFragments('kotlin': FqName@59) = null
-    _packageFragments('kotlin.Nothing': FqName@60) = null
-    _packageFragments('kotlin.io': FqName@61) = null
-    _packageFragments('kotlin.jvm': FqName@62) = null
+    packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
+    packageFragments('Nothing': FqName@53) = null
+    packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
+    packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
+    packageFragments('java.lang.Nothing': FqName@58) = null
+    packageFragments('kotlin': FqName@59) = null
+    packageFragments('kotlin.Nothing': FqName@60) = null
+    packageFragments('kotlin.io': FqName@61) = null
+    packageFragments('kotlin.jvm': FqName@62) = null
     topLevelClasses(JavaClassImpl@63['Exception']) = LazyJavaClassDescriptor@3['Exception']
 }
 
 LazyJavaPackageFragment@52['<root>'] {
-    _functions('Exception': Name@64) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('bar': Name@67) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('hasNext': Name@68) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('iterator': Name@69) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('next': Name@70) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('rangeTo': Name@71) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    _functions('todo': Name@72) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Exception': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Nothing': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('bar': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('hasNext': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('iterator': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('next': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('rangeTo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('todo': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('Exception': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('Nothing': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('bar': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('hasNext': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('iterator': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('next': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('rangeTo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('todo': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('Exception': Name@64) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('bar': Name@67) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('hasNext': Name@68) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('iterator': Name@69) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('next': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('rangeTo': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('todo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@65
 }
 
 LazyJavaPackageFragment@55['java'] {
-    _functions('lang': Name@76) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('lang': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('lang': Name@78) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@77
     memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
 }
 
 LazyJavaPackageFragment@57['lang'] {
-    _functions('Exception': Name@64) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('bar': Name@67) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('hasNext': Name@68) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('iterator': Name@69) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('next': Name@70) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('rangeTo': Name@71) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('todo': Name@72) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     classes('Exception': Name@64) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@80
     classes('bar': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@80
     classes('hasNext': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@80
@@ -160,6 +153,13 @@ LazyJavaPackageFragment@57['lang'] {
     classes('next': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@80
     classes('rangeTo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@80
     classes('todo': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@80
+    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('Exception': Name@64) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('bar': Name@67) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('hasNext': Name@68) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('iterator': Name@69) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('next': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('rangeTo': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('todo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInReturn.lazy.log

@@ -3,138 +3,138 @@ 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
+    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@17['String']
+    arguments = ArrayList@30[empty]
+    classifier = JavaClassImpl@15['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@31['Throwable'] {
-    _arguments = ArrayList@32[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@34['Throwable']
+    arguments = ArrayList@32[empty]
+    classifier = JavaClassImpl@33['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@35['Throwable'] {
-    _arguments = ArrayList@36[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@36[empty]
     classifier = JavaClassImpl@37['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@38['Throwable'] {
-    _arguments = ArrayList@39[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@39[empty]
     classifier = JavaClassImpl@40['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@41['Throwable'] {
-    _arguments = ArrayList@42[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@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@40['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@34['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('java': FqName@52) = LazyJavaPackageFragment@53['java']
-    _packageFragments('java.lang': FqName@54) = LazyJavaPackageFragment@55['lang']
-    _packageFragments('kotlin': FqName@56) = null
-    _packageFragments('kotlin.io': FqName@57) = null
-    _packageFragments('kotlin.jvm': FqName@58) = null
+    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
+    packageFragments('java': FqName@52) = LazyJavaPackageFragment@53['java']
+    packageFragments('java.lang': FqName@54) = LazyJavaPackageFragment@55['lang']
+    packageFragments('kotlin': FqName@56) = null
+    packageFragments('kotlin.io': FqName@57) = null
+    packageFragments('kotlin.jvm': FqName@58) = null
     topLevelClasses(JavaClassImpl@59['Exception']) = LazyJavaClassDescriptor@2['Exception']
 }
 
 LazyJavaPackageFragment@51['<root>'] {
-    _functions('Exception': Name@60) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    _functions('todo': Name@63) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('Exception': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('todo': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@62
+    classes('Exception': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('todo': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('Exception': Name@60) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('todo': Name@62) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@61
 }
 
 LazyJavaPackageFragment@53['java'] {
-    _functions('lang': Name@66) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('lang': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('lang': Name@68) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@67
     memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
 }
 
 LazyJavaPackageFragment@55['lang'] {
-    _functions('Exception': Name@60) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    _functions('todo': Name@63) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@70
     classes('Exception': Name@60) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('todo': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('todo': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('Exception': Name@60) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('todo': Name@62) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
     memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInUnaryExpr.lazy.log

@@ -3,154 +3,154 @@ DescriptorResolver@0 {
 }
 
 LazyJavaClassDescriptor@2['Exception'] {
-    _constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    _functionTypeForSamInterface = null
-    _typeConstructor = LazyJavaClassTypeConstructor@8['Exception']
-    defaultType = JetTypeImpl@9['Exception']
+    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
+    defaultType = JetTypeImpl@8['Exception']
+    functionTypeForSamInterface = null
+    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
 }
 
-LazyJavaClassTypeConstructor@8['Exception'] {
-    _parameters = ArrayList@10[empty]
-    _supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
+LazyJavaClassTypeConstructor@9['Exception'] {
+    parameters = ArrayList@10[empty]
+    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
 }
 
 LazyJavaClassifierType@13['String'] {
-    _arguments = ArrayList@14[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@16
-    classifier = JavaClassImpl@17['String']
+    arguments = ArrayList@14[empty]
+    classifier = JavaClassImpl@15['String']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@18['String'] {
-    _arguments = ArrayList@19[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@16
+    arguments = ArrayList@19[empty]
     classifier = JavaClassImpl@20['String']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@21['String'] {
-    _arguments = ArrayList@22[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@16
+    arguments = ArrayList@22[empty]
     classifier = JavaClassImpl@23['String']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@24['String'] {
-    _arguments = ArrayList@25[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@16
-    classifier = JavaClassImpl@20['String']
+    arguments = ArrayList@25[empty]
+    classifier = JavaClassImpl@23['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
-    _arguments = ArrayList@28[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@16
-    classifier = JavaClassImpl@17['String']
+    arguments = ArrayList@28[empty]
+    classifier = JavaClassImpl@20['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
-    _arguments = ArrayList@30[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@16
-    classifier = JavaClassImpl@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@34['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@40['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
+    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('Any': FqName@52) = null
-    _packageFragments('Nothing': FqName@53) = null
-    _packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
-    _packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
-    _packageFragments('java.lang.Any': FqName@58) = null
-    _packageFragments('java.lang.Nothing': FqName@59) = null
-    _packageFragments('kotlin': FqName@60) = null
-    _packageFragments('kotlin.Any': FqName@61) = null
-    _packageFragments('kotlin.Nothing': FqName@62) = null
-    _packageFragments('kotlin.io': FqName@63) = null
-    _packageFragments('kotlin.jvm': FqName@64) = null
+    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
+    packageFragments('Any': FqName@52) = null
+    packageFragments('Nothing': FqName@53) = null
+    packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
+    packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
+    packageFragments('java.lang.Any': FqName@58) = null
+    packageFragments('java.lang.Nothing': FqName@59) = null
+    packageFragments('kotlin': FqName@60) = null
+    packageFragments('kotlin.Any': FqName@61) = null
+    packageFragments('kotlin.Nothing': FqName@62) = null
+    packageFragments('kotlin.io': FqName@63) = null
+    packageFragments('kotlin.jvm': FqName@64) = null
     topLevelClasses(JavaClassImpl@65['Exception']) = LazyJavaClassDescriptor@2['Exception']
 }
 
 LazyJavaPackageFragment@51['<root>'] {
-    _functions('Exception': Name@66) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    _functions('inc': Name@69) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    _functions('not': Name@70) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    _functions('todo': Name@71) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('Any': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('Exception': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('Nothing': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('inc': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('not': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('todo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('Any': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('Exception': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('Nothing': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('inc': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('not': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('todo': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('Exception': Name@68) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('inc': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('not': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('todo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@67
 }
 
 LazyJavaPackageFragment@55['java'] {
-    _functions('lang': Name@76) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('lang': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('lang': Name@78) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@77
     memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
 }
 
 LazyJavaPackageFragment@57['lang'] {
-    _functions('Exception': Name@66) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('inc': Name@69) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('not': Name@70) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    _functions('todo': Name@71) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('Exception': Name@66) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('inc': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('not': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('todo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('Exception': Name@68) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('inc': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('not': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('todo': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('Exception': Name@68) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('inc': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('not': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('todo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInWhileFromBreak.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_1.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_2.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_3.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt3162tryAsInitializer.lazy.log

@@ -1,31 +1,31 @@
 LazyJavaClassDescriptor@0['Exception'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
 }
 
 LazyJavaClassTypeConstructor@1['Exception'] {
-    _parameters = ArrayList@2[empty]
-    _supertypes = ArrayList@3[1] { LazyJavaClassifierType@4['Throwable'] }
+    parameters = ArrayList@2[empty]
+    supertypes = ArrayList@3[1] { LazyJavaClassifierType@4['Throwable'] }
 }
 
 LazyJavaClassifierType@4['Throwable'] {
-    _arguments = ArrayList@5[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@6
-    classifier = JavaClassImpl@7['Throwable']
+    arguments = ArrayList@5[empty]
+    classifier = JavaClassImpl@6['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@7
 }
 
 LazyJavaPackageFragmentProvider@8 {
-    _packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    _packageFragments('Exception': FqName@11) = null
-    _packageFragments('String': FqName@12) = null
-    _packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    _packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    _packageFragments('java.lang.Exception': FqName@17) = null
-    _packageFragments('java.lang.String': FqName@18) = null
-    _packageFragments('kotlin': FqName@19) = null
-    _packageFragments('kotlin.Exception': FqName@20) = null
-    _packageFragments('kotlin.String': FqName@21) = null
-    _packageFragments('kotlin.io': FqName@22) = null
-    _packageFragments('kotlin.jvm': FqName@23) = null
+    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
+    packageFragments('Exception': FqName@11) = null
+    packageFragments('String': FqName@12) = null
+    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
+    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
+    packageFragments('java.lang.Exception': FqName@17) = null
+    packageFragments('java.lang.String': FqName@18) = null
+    packageFragments('kotlin': FqName@19) = null
+    packageFragments('kotlin.Exception': FqName@20) = null
+    packageFragments('kotlin.String': FqName@21) = null
+    packageFragments('kotlin.io': FqName@22) = null
+    packageFragments('kotlin.jvm': FqName@23) = null
     topLevelClasses(JavaClassImpl@24['Exception']) = LazyJavaClassDescriptor@0['Exception']
 }
 
@@ -35,10 +35,10 @@ LazyJavaPackageFragment@10['<root>'] {
 }
 
 LazyJavaPackageFragment@14['java'] {
-    _functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('lang': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@29
 }
 
 LazyJavaPackageFragment@16['lang'] {

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt5200DeadCodeInLambdas.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/ReturnFromFunctionInObject.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt4034.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturnInWhen.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1001.lazy.log

@@ -1,58 +1,58 @@
 LazyJavaClassDescriptor@0['Exception'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
 }
 
 LazyJavaClassTypeConstructor@1['Exception'] {
-    _parameters = ArrayList@2[empty]
-    _supertypes = ArrayList@3[1] { LazyJavaClassifierType@4['Throwable'] }
+    parameters = ArrayList@2[empty]
+    supertypes = ArrayList@3[1] { LazyJavaClassifierType@4['Throwable'] }
 }
 
 LazyJavaClassifierType@4['Throwable'] {
-    _arguments = ArrayList@5[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@6
-    classifier = JavaClassImpl@7['Throwable']
+    arguments = ArrayList@5[empty]
+    classifier = JavaClassImpl@6['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@7
 }
 
 LazyJavaPackageFragmentProvider@8 {
-    _packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    _packageFragments('Array': FqName@11) = null
-    _packageFragments('Exception': FqName@12) = null
-    _packageFragments('Int': FqName@13) = null
-    _packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    _packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    _packageFragments('java.lang.Array': FqName@18) = null
-    _packageFragments('java.lang.Exception': FqName@19) = null
-    _packageFragments('java.lang.Int': FqName@20) = null
-    _packageFragments('kotlin': FqName@21) = null
-    _packageFragments('kotlin.Array': FqName@22) = null
-    _packageFragments('kotlin.Exception': FqName@23) = null
-    _packageFragments('kotlin.Int': FqName@24) = null
-    _packageFragments('kotlin.io': FqName@25) = null
-    _packageFragments('kotlin.jvm': FqName@26) = null
-    _packageFragments('kt1001': FqName@27) = null
-    _packageFragments('kt1001.Array': FqName@28) = null
-    _packageFragments('kt1001.Exception': FqName@29) = null
-    _packageFragments('kt1001.Int': FqName@30) = null
+    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
+    packageFragments('Array': FqName@11) = null
+    packageFragments('Exception': FqName@12) = null
+    packageFragments('Int': FqName@13) = null
+    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
+    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
+    packageFragments('java.lang.Array': FqName@18) = null
+    packageFragments('java.lang.Exception': FqName@19) = null
+    packageFragments('java.lang.Int': FqName@20) = null
+    packageFragments('kotlin': FqName@21) = null
+    packageFragments('kotlin.Array': FqName@22) = null
+    packageFragments('kotlin.Exception': FqName@23) = null
+    packageFragments('kotlin.Int': FqName@24) = null
+    packageFragments('kotlin.io': FqName@25) = null
+    packageFragments('kotlin.jvm': FqName@26) = null
+    packageFragments('kt1001': FqName@27) = null
+    packageFragments('kt1001.Array': FqName@28) = null
+    packageFragments('kt1001.Exception': FqName@29) = null
+    packageFragments('kt1001.Int': FqName@30) = null
     topLevelClasses(JavaClassImpl@31['Exception']) = LazyJavaClassDescriptor@0['Exception']
 }
 
 LazyJavaPackageFragment@15['java'] {
-    _functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@17['lang'] {
-    _functions('doSmth': Name@38) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('hasNext': Name@40) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('iterator': Name@41) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    _functions('next': Name@42) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Exception': Name@43) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('doSmth': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('hasNext': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('iterator': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('next': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('Exception': Name@38) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('doSmth': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('hasNext': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('iterator': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('next': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('doSmth': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('hasNext': Name@41) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('iterator': Name@42) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('next': Name@43) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
     memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@39
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.lazy.log

@@ -1,41 +1,41 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('Int': FqName@3) = null
-    _packageFragments('List': 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.List': FqName@10) = null
-    _packageFragments('kotlin': FqName@11) = null
-    _packageFragments('kotlin.Int': FqName@12) = null
-    _packageFragments('kotlin.List': FqName@13) = null
-    _packageFragments('kotlin.io': FqName@14) = null
-    _packageFragments('kotlin.jvm': FqName@15) = null
-    _packageFragments('kt1027': FqName@16) = null
-    _packageFragments('kt1027.Int': FqName@17) = null
-    _packageFragments('kt1027.List': FqName@18) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('Int': FqName@3) = null
+    packageFragments('List': 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.List': FqName@10) = null
+    packageFragments('kotlin': FqName@11) = null
+    packageFragments('kotlin.Int': FqName@12) = null
+    packageFragments('kotlin.List': FqName@13) = null
+    packageFragments('kotlin.io': FqName@14) = null
+    packageFragments('kotlin.jvm': FqName@15) = null
+    packageFragments('kt1027': FqName@16) = null
+    packageFragments('kt1027.Int': FqName@17) = null
+    packageFragments('kt1027.List': FqName@18) = null
 }
 
 LazyJavaPackageFragment@6['java'] {
-    _functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    _functions('doSmth': Name@25) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('hasNext': Name@27) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('iterator': Name@28) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('next': Name@29) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('plus': Name@30) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    _functions('plusAssign': Name@31) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     classes('doSmth': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('hasNext': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('iterator': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('next': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('plus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('plusAssign': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('doSmth': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('hasNext': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('iterator': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('next': Name@29) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('plus': Name@30) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('plusAssign': Name@31) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@26
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.lazy.log

@@ -3,43 +3,35 @@ DescriptorResolver@0 {
 }
 
 LazyJavaPackageFragmentProvider@2 {
-    _packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    _packageFragments('Char': FqName@5) = null
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('Set': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.Char': FqName@12) = null
-    _packageFragments('java.lang.Int': FqName@13) = null
-    _packageFragments('java.lang.Set': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.Char': FqName@16) = null
-    _packageFragments('kotlin.Int': FqName@17) = null
-    _packageFragments('kotlin.Set': FqName@18) = null
-    _packageFragments('kotlin.io': FqName@19) = null
-    _packageFragments('kotlin.jvm': FqName@20) = null
-    _packageFragments('kt1066': FqName@21) = null
-    _packageFragments('kt1066.Char': FqName@22) = null
-    _packageFragments('kt1066.Int': FqName@23) = null
-    _packageFragments('kt1066.Set': FqName@24) = null
+    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
+    packageFragments('Char': FqName@5) = null
+    packageFragments('Int': FqName@6) = null
+    packageFragments('Set': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.Char': FqName@12) = null
+    packageFragments('java.lang.Int': FqName@13) = null
+    packageFragments('java.lang.Set': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.Char': FqName@16) = null
+    packageFragments('kotlin.Int': FqName@17) = null
+    packageFragments('kotlin.Set': FqName@18) = null
+    packageFragments('kotlin.io': FqName@19) = null
+    packageFragments('kotlin.jvm': FqName@20) = null
+    packageFragments('kt1066': FqName@21) = null
+    packageFragments('kt1066.Char': FqName@22) = null
+    packageFragments('kt1066.Int': FqName@23) = null
+    packageFragments('kt1066.Set': FqName@24) = null
 }
 
 LazyJavaPackageFragment@9['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@11['lang'] {
-    _functions('compareTo': Name@31) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('contains': Name@33) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('equals': Name@34) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('mod': Name@35) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('plus': Name@36) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('plusAssign': Name@37) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('randomDigit': Name@38) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('toChar': Name@39) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     classes('compareTo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
     classes('contains': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
     classes('equals': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
@@ -48,6 +40,14 @@ LazyJavaPackageFragment@11['lang'] {
     classes('plusAssign': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@32
     classes('randomDigit': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@32
     classes('toChar': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('compareTo': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('contains': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('equals': Name@34) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('mod': Name@35) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('plus': Name@36) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('plusAssign': Name@37) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('randomDigit': Name@38) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('toChar': Name@39) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@32
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1156.lazy.log

@@ -1,339 +1,339 @@
 LazyJavaClassDescriptor@0['Appendable'] {
-    _functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    _properties('println': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    _typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
-    memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@3
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
+    memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
+    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
+    typeConstructor = LazyJavaClassTypeConstructor@6['Appendable']
 }
 
 LazyJavaClassDescriptor@7['AutoCloseable'] {
-    _functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
-    _properties('println': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
-    _typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@8
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
+    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@8
+    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
+    typeConstructor = LazyJavaClassTypeConstructor@10['AutoCloseable']
 }
 
 LazyJavaClassDescriptor@11['Closeable'] {
-    _functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    _properties('println': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    _typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@12
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
+    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@12
+    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
+    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
 }
 
 LazyJavaClassDescriptor@15['Exception'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@16['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@16['Exception']
 }
 
 LazyJavaClassDescriptor@17['FilterOutputStream'] {
-    _functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
-    _properties('println': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
-    _typeConstructor = LazyJavaClassTypeConstructor@19['FilterOutputStream']
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@18
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
+    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
+    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
+    typeConstructor = LazyJavaClassTypeConstructor@20['FilterOutputStream']
 }
 
 LazyJavaClassDescriptor@21['OutputStream'] {
-    _functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@22
-    _properties('println': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@22
-    _typeConstructor = LazyJavaClassTypeConstructor@23['OutputStream']
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@22
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@22
+    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
+    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@22
+    typeConstructor = LazyJavaClassTypeConstructor@24['OutputStream']
 }
 
 LazyJavaClassDescriptor@25['PrintStream'] {
-    _functions('println': Name@4) = ArrayList@26[10] { JavaMethodDescriptor@27['println'], JavaMethodDescriptor@28['println'], JavaMethodDescriptor@29['println'], ... } // through LazyJavaClassMemberScope@30
-    _properties('println': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@30
-    _typeConstructor = LazyJavaClassTypeConstructor@31['PrintStream']
-    defaultType = JetTypeImpl@32['PrintStream']
-    enumEntryIndex = LinkedHashMap@33 // through LazyJavaClassMemberScope@30
-    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@30
-    nestedClassIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@30
-    nestedClasses('println': Name@4) = null // through LazyJavaClassMemberScope@30
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@36['<this>']
+    defaultType = JetTypeImpl@26['PrintStream']
+    enumEntryIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@28
+    functions('println': Name@5) = ArrayList@29[10] { JavaMethodDescriptor@30['println'], JavaMethodDescriptor@31['println'], JavaMethodDescriptor@32['println'], ... } // through LazyJavaClassMemberScope@28
+    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@28
+    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@28
+    nestedClasses('println': Name@5) = null // through LazyJavaClassMemberScope@28
+    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@28
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@35['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
 }
 
 LazyJavaClassDescriptor@37['RuntimeException'] {
-    _constructors = ArrayList@38[5] { JavaConstructorDescriptor@39['<init>'], JavaConstructorDescriptor@40['<init>'], JavaConstructorDescriptor@41['<init>'], ... } // through LazyJavaClassMemberScope@42
-    _functionTypeForSamInterface = null
-    _typeConstructor = LazyJavaClassTypeConstructor@43['RuntimeException']
-    defaultType = JetTypeImpl@44['RuntimeException']
+    constructors = ArrayList@38[5] { JavaConstructorDescriptor@39['<init>'], JavaConstructorDescriptor@40['<init>'], JavaConstructorDescriptor@41['<init>'], ... } // through LazyJavaClassMemberScope@42
+    defaultType = JetTypeImpl@43['RuntimeException']
+    functionTypeForSamInterface = null
+    typeConstructor = LazyJavaClassTypeConstructor@44['RuntimeException']
 }
 
 LazyJavaClassDescriptor@45['System'] {
-    _properties('out': Name@46) = ArrayList@47[1] { JavaPropertyDescriptor@48['out'] } // through LazyJavaStaticClassScope@49
-    _properties('out': Name@46) = EmptyList@2[empty] // through LazyJavaClassMemberScope@50
-    _typeConstructor = LazyJavaClassTypeConstructor@51['System']
-    enumEntryIndex = LinkedHashMap@52 // through LazyJavaClassMemberScope@50
-    memberIndex = computeMemberIndex$1@53 // through LazyJavaClassMemberScope@50
-    memberIndex = computeMemberIndex$1@54 // through LazyJavaStaticClassScope@49
-    nestedClassIndex = LinkedHashMap@55 // through LazyJavaClassMemberScope@50
-    nestedClasses('out': Name@46) = null // through LazyJavaClassMemberScope@50
+    enumEntryIndex = LinkedHashMap@46 // through LazyJavaClassMemberScope@47
+    memberIndex = computeMemberIndex$1@48 // through LazyJavaClassMemberScope@47
+    memberIndex = computeMemberIndex$1@49 // through LazyJavaStaticClassScope@50
+    nestedClassIndex = LinkedHashMap@51 // through LazyJavaClassMemberScope@47
+    nestedClasses('out': Name@52) = null // through LazyJavaClassMemberScope@47
+    properties('out': Name@52) = ArrayList@53[1] { JavaPropertyDescriptor@54['out'] } // through LazyJavaStaticClassScope@50
+    properties('out': Name@52) = EmptyList@2[empty] // through LazyJavaClassMemberScope@47
+    typeConstructor = LazyJavaClassTypeConstructor@55['System']
 }
 
-LazyJavaClassTypeConstructor@5['Appendable'] {
-    _parameters = ArrayList@56[empty]
-    _supertypes = ArrayList@57[1] { JetTypeImpl@58['Any'] }
+LazyJavaClassTypeConstructor@6['Appendable'] {
+    parameters = ArrayList@56[empty]
+    supertypes = ArrayList@57[1] { JetTypeImpl@58['Any'] }
 }
 
-LazyJavaClassTypeConstructor@9['AutoCloseable'] {
-    _parameters = ArrayList@59[empty]
-    _supertypes = ArrayList@60[1] { JetTypeImpl@58['Any'] }
+LazyJavaClassTypeConstructor@10['AutoCloseable'] {
+    parameters = ArrayList@59[empty]
+    supertypes = ArrayList@60[1] { JetTypeImpl@58['Any'] }
 }
 
-LazyJavaClassTypeConstructor@13['Closeable'] {
-    _parameters = ArrayList@61[empty]
-    _supertypes = ArrayList@62[1] { LazyJavaClassifierType@63['AutoCloseable'] }
+LazyJavaClassTypeConstructor@14['Closeable'] {
+    parameters = ArrayList@61[empty]
+    supertypes = ArrayList@62[1] { LazyJavaClassifierType@63['AutoCloseable'] }
 }
 
 LazyJavaClassTypeConstructor@16['Exception'] {
-    _parameters = ArrayList@64[empty]
-    _supertypes = ArrayList@65[1] { LazyJavaClassifierType@66['Throwable'] }
+    parameters = ArrayList@64[empty]
+    supertypes = ArrayList@65[1] { LazyJavaClassifierType@66['Throwable'] }
 }
 
-LazyJavaClassTypeConstructor@19['FilterOutputStream'] {
-    _parameters = ArrayList@67[empty]
-    _supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['OutputStream'] }
+LazyJavaClassTypeConstructor@20['FilterOutputStream'] {
+    parameters = ArrayList@67[empty]
+    supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@23['OutputStream'] {
-    _parameters = ArrayList@70[empty]
-    _supertypes = ArrayList@71[1] { LazyJavaClassifierType@72['Closeable'] }
+LazyJavaClassTypeConstructor@24['OutputStream'] {
+    parameters = ArrayList@70[empty]
+    supertypes = ArrayList@71[1] { LazyJavaClassifierType@72['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@31['PrintStream'] {
-    _parameters = ArrayList@73[empty]
-    _supertypes = ArrayList@74[3] { LazyJavaClassifierType@75['FilterOutputStream'], LazyJavaClassifierType@76['Appendable'], LazyJavaClassifierType@77['Closeable'] }
+LazyJavaClassTypeConstructor@36['PrintStream'] {
+    parameters = ArrayList@73[empty]
+    supertypes = ArrayList@74[3] { LazyJavaClassifierType@75['FilterOutputStream'], LazyJavaClassifierType@76['Appendable'], LazyJavaClassifierType@77['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@43['RuntimeException'] {
-    _parameters = ArrayList@78[empty]
-    _supertypes = ArrayList@79[1] { LazyJavaClassifierType@80['Exception'] }
+LazyJavaClassTypeConstructor@44['RuntimeException'] {
+    parameters = ArrayList@78[empty]
+    supertypes = ArrayList@79[1] { LazyJavaClassifierType@80['Exception'] }
 }
 
-LazyJavaClassTypeConstructor@51['System'] {
-    _supertypes = ArrayList@81[1] { JetTypeImpl@58['Any'] }
+LazyJavaClassTypeConstructor@55['System'] {
+    supertypes = ArrayList@81[1] { JetTypeImpl@58['Any'] }
 }
 
 LazyJavaClassifierType@76['Appendable'] {
-    _arguments = ArrayList@82[empty]
-    _memberScope = LazyJavaClassMemberScope@3
-    _typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
+    arguments = ArrayList@82[empty]
     classifier = JavaClassImpl@83['Appendable']
+    memberScope = LazyJavaClassMemberScope@3
+    typeConstructor = LazyJavaClassTypeConstructor@6['Appendable']
 }
 
 LazyJavaClassifierType@63['AutoCloseable'] {
-    _arguments = ArrayList@84[empty]
-    _memberScope = LazyJavaClassMemberScope@8
-    _typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
+    arguments = ArrayList@84[empty]
     classifier = JavaClassImpl@85['AutoCloseable']
-}
-
-LazyJavaClassifierType@72['Closeable'] {
-    _arguments = ArrayList@86[empty]
-    _memberScope = LazyJavaClassMemberScope@12
-    _typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
-    classifier = JavaClassImpl@87['Closeable']
+    memberScope = LazyJavaClassMemberScope@8
+    typeConstructor = LazyJavaClassTypeConstructor@10['AutoCloseable']
 }
 
 LazyJavaClassifierType@77['Closeable'] {
-    _arguments = ArrayList@88[empty]
-    _memberScope = LazyJavaClassMemberScope@12
-    _typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
+    arguments = ArrayList@86[empty]
+    classifier = JavaClassImpl@87['Closeable']
+    memberScope = LazyJavaClassMemberScope@12
+    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+}
+
+LazyJavaClassifierType@72['Closeable'] {
+    arguments = ArrayList@88[empty]
     classifier = JavaClassImpl@89['Closeable']
+    memberScope = LazyJavaClassMemberScope@12
+    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
 }
 
 LazyJavaClassifierType@80['Exception'] {
-    _arguments = ArrayList@90[empty]
-    _typeConstructor = LazyJavaClassTypeConstructor@16['Exception']
+    arguments = ArrayList@90[empty]
     classifier = JavaClassImpl@91['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@16['Exception']
 }
 
 LazyJavaClassifierType@75['FilterOutputStream'] {
-    _arguments = ArrayList@92[empty]
-    _memberScope = LazyJavaClassMemberScope@18
-    _typeConstructor = LazyJavaClassTypeConstructor@19['FilterOutputStream']
+    arguments = ArrayList@92[empty]
     classifier = JavaClassImpl@93['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@18
+    typeConstructor = LazyJavaClassTypeConstructor@20['FilterOutputStream']
 }
 
 LazyJavaClassifierType@94['Flushable'] {
-    _typeConstructor = TypeConstructorImpl$1@95
     classifier = null
+    typeConstructor = TypeConstructorImpl$1@95
 }
 
 LazyJavaClassifierType@96['Object'] {
-    _arguments = ArrayList@97[empty]
-    _nullable = 'false': Boolean@98
-    _typeConstructor = DeserializedClassTypeConstructor@99
-    classifier = JavaClassImpl@100['Object']
+    arguments = ArrayList@97[empty]
+    classifier = JavaClassImpl@98['Object']
+    nullable = 'false': Boolean@99
+    typeConstructor = DeserializedClassTypeConstructor@100
 }
 
 LazyJavaClassifierType@101['Object'] {
-    _arguments = ArrayList@102[empty]
-    _nullable = 'true': Boolean@103
-    _typeConstructor = DeserializedClassTypeConstructor@99
-    classifier = JavaClassImpl@100['Object']
+    arguments = ArrayList@102[empty]
+    classifier = JavaClassImpl@98['Object']
+    nullable = 'true': Boolean@103
+    typeConstructor = DeserializedClassTypeConstructor@100
 }
 
 LazyJavaClassifierType@104['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@99
     classifier = JavaClassImpl@105['Object']
+    typeConstructor = DeserializedClassTypeConstructor@100
 }
 
 LazyJavaClassifierType@106['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@99
     classifier = JavaClassImpl@107['Object']
+    typeConstructor = DeserializedClassTypeConstructor@100
 }
 
 LazyJavaClassifierType@108['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@99
     classifier = JavaClassImpl@109['Object']
+    typeConstructor = DeserializedClassTypeConstructor@100
 }
 
 LazyJavaClassifierType@110['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@99
     classifier = JavaClassImpl@111['Object']
+    typeConstructor = DeserializedClassTypeConstructor@100
 }
 
 LazyJavaClassifierType@69['OutputStream'] {
-    _arguments = ArrayList@112[empty]
-    _memberScope = LazyJavaClassMemberScope@22
-    _typeConstructor = LazyJavaClassTypeConstructor@23['OutputStream']
+    arguments = ArrayList@112[empty]
     classifier = JavaClassImpl@113['OutputStream']
+    memberScope = LazyJavaClassMemberScope@22
+    typeConstructor = LazyJavaClassTypeConstructor@24['OutputStream']
 }
 
 LazyJavaClassifierType@114['PrintStream'] {
-    _arguments = ArrayList@115[empty]
-    _memberScope = LazyJavaClassMemberScope@30
-    _nullable = 'false': Boolean@98
-    _typeConstructor = LazyJavaClassTypeConstructor@31['PrintStream']
+    arguments = ArrayList@115[empty]
     classifier = JavaClassImpl@116['PrintStream']
+    memberScope = LazyJavaClassMemberScope@28
+    nullable = 'false': Boolean@99
+    typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
 }
 
 LazyJavaClassifierType@117['PrintStream'] {
-    _arguments = ArrayList@118[empty]
-    _nullable = 'true': Boolean@103
-    _typeConstructor = LazyJavaClassTypeConstructor@31['PrintStream']
+    arguments = ArrayList@118[empty]
     classifier = JavaClassImpl@116['PrintStream']
+    nullable = 'true': Boolean@103
+    typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
 }
 
 LazyJavaClassifierType@119['String'] {
-    _arguments = ArrayList@120[empty]
-    _nullable = 'false': Boolean@98
-    _typeConstructor = DeserializedClassTypeConstructor@121
-    classifier = JavaClassImpl@122['String']
+    arguments = ArrayList@120[empty]
+    classifier = JavaClassImpl@121['String']
+    nullable = 'false': Boolean@99
+    typeConstructor = DeserializedClassTypeConstructor@122
 }
 
 LazyJavaClassifierType@123['String'] {
-    _arguments = ArrayList@124[empty]
-    _nullable = 'false': Boolean@98
-    _typeConstructor = DeserializedClassTypeConstructor@121
+    arguments = ArrayList@124[empty]
     classifier = JavaClassImpl@125['String']
+    nullable = 'false': Boolean@99
+    typeConstructor = DeserializedClassTypeConstructor@122
 }
 
 LazyJavaClassifierType@126['String'] {
-    _arguments = ArrayList@127[empty]
-    _nullable = 'false': Boolean@98
-    _typeConstructor = DeserializedClassTypeConstructor@121
+    arguments = ArrayList@127[empty]
     classifier = JavaClassImpl@128['String']
+    nullable = 'false': Boolean@99
+    typeConstructor = DeserializedClassTypeConstructor@122
 }
 
 LazyJavaClassifierType@129['String'] {
-    _arguments = ArrayList@130[empty]
-    _nullable = 'false': Boolean@98
-    _typeConstructor = DeserializedClassTypeConstructor@121
+    arguments = ArrayList@130[empty]
     classifier = JavaClassImpl@131['String']
+    nullable = 'false': Boolean@99
+    typeConstructor = DeserializedClassTypeConstructor@122
 }
 
 LazyJavaClassifierType@132['String'] {
-    _arguments = ArrayList@133[empty]
-    _nullable = 'true': Boolean@103
-    _typeConstructor = DeserializedClassTypeConstructor@121
-    classifier = JavaClassImpl@122['String']
+    arguments = ArrayList@133[empty]
+    classifier = JavaClassImpl@121['String']
+    nullable = 'true': Boolean@103
+    typeConstructor = DeserializedClassTypeConstructor@122
 }
 
 LazyJavaClassifierType@134['String'] {
-    _arguments = ArrayList@135[empty]
-    _nullable = 'true': Boolean@103
-    _typeConstructor = DeserializedClassTypeConstructor@121
+    arguments = ArrayList@135[empty]
     classifier = JavaClassImpl@131['String']
+    nullable = 'true': Boolean@103
+    typeConstructor = DeserializedClassTypeConstructor@122
 }
 
 LazyJavaClassifierType@136['String'] {
-    _arguments = ArrayList@137[empty]
-    _nullable = 'true': Boolean@103
-    _typeConstructor = DeserializedClassTypeConstructor@121
-    classifier = JavaClassImpl@125['String']
+    arguments = ArrayList@137[empty]
+    classifier = JavaClassImpl@128['String']
+    nullable = 'true': Boolean@103
+    typeConstructor = DeserializedClassTypeConstructor@122
 }
 
 LazyJavaClassifierType@138['String'] {
-    _arguments = ArrayList@139[empty]
-    _nullable = 'true': Boolean@103
-    _typeConstructor = DeserializedClassTypeConstructor@121
-    classifier = JavaClassImpl@128['String']
+    arguments = ArrayList@139[empty]
+    classifier = JavaClassImpl@125['String']
+    nullable = 'true': Boolean@103
+    typeConstructor = DeserializedClassTypeConstructor@122
 }
 
 LazyJavaClassifierType@140['Throwable'] {
-    _arguments = ArrayList@141[empty]
-    _nullable = 'false': Boolean@98
-    _typeConstructor = DeserializedClassTypeConstructor@142
-    classifier = JavaClassImpl@143['Throwable']
+    arguments = ArrayList@141[empty]
+    classifier = JavaClassImpl@142['Throwable']
+    nullable = 'false': Boolean@99
+    typeConstructor = DeserializedClassTypeConstructor@143
 }
 
 LazyJavaClassifierType@144['Throwable'] {
-    _arguments = ArrayList@145[empty]
-    _nullable = 'false': Boolean@98
-    _typeConstructor = DeserializedClassTypeConstructor@142
+    arguments = ArrayList@145[empty]
     classifier = JavaClassImpl@146['Throwable']
+    nullable = 'false': Boolean@99
+    typeConstructor = DeserializedClassTypeConstructor@143
 }
 
 LazyJavaClassifierType@147['Throwable'] {
-    _arguments = ArrayList@148[empty]
-    _nullable = 'false': Boolean@98
-    _typeConstructor = DeserializedClassTypeConstructor@142
+    arguments = ArrayList@148[empty]
     classifier = JavaClassImpl@149['Throwable']
+    nullable = 'false': Boolean@99
+    typeConstructor = DeserializedClassTypeConstructor@143
 }
 
 LazyJavaClassifierType@150['Throwable'] {
-    _arguments = ArrayList@151[empty]
-    _nullable = 'true': Boolean@103
-    _typeConstructor = DeserializedClassTypeConstructor@142
+    arguments = ArrayList@151[empty]
     classifier = JavaClassImpl@146['Throwable']
+    nullable = 'true': Boolean@103
+    typeConstructor = DeserializedClassTypeConstructor@143
 }
 
 LazyJavaClassifierType@152['Throwable'] {
-    _arguments = ArrayList@153[empty]
-    _nullable = 'true': Boolean@103
-    _typeConstructor = DeserializedClassTypeConstructor@142
-    classifier = JavaClassImpl@149['Throwable']
+    arguments = ArrayList@153[empty]
+    classifier = JavaClassImpl@142['Throwable']
+    nullable = 'true': Boolean@103
+    typeConstructor = DeserializedClassTypeConstructor@143
 }
 
 LazyJavaClassifierType@154['Throwable'] {
-    _arguments = ArrayList@155[empty]
-    _nullable = 'true': Boolean@103
-    _typeConstructor = DeserializedClassTypeConstructor@142
-    classifier = JavaClassImpl@143['Throwable']
+    arguments = ArrayList@155[empty]
+    classifier = JavaClassImpl@149['Throwable']
+    nullable = 'true': Boolean@103
+    typeConstructor = DeserializedClassTypeConstructor@143
 }
 
 LazyJavaClassifierType@66['Throwable'] {
-    _arguments = ArrayList@156[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@142
+    arguments = ArrayList@156[empty]
     classifier = JavaClassImpl@157['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@143
 }
 
 LazyJavaPackageFragmentProvider@158 {
-    _packageFragments('<root>': FqName@159) = LazyJavaPackageFragment@160['<root>']
-    _packageFragments('Int': FqName@161) = null
-    _packageFragments('System': FqName@162) = null
-    _packageFragments('java': FqName@163) = LazyJavaPackageFragment@164['java']
-    _packageFragments('java.io': FqName@165) = LazyJavaPackageFragment@166['io']
-    _packageFragments('java.lang': FqName@167) = LazyJavaPackageFragment@168['lang']
-    _packageFragments('java.lang.Int': FqName@169) = null
-    _packageFragments('java.lang.System': FqName@170) = null
-    _packageFragments('kotlin': FqName@171) = null
-    _packageFragments('kotlin.Int': FqName@172) = null
-    _packageFragments('kotlin.System': FqName@173) = null
-    _packageFragments('kotlin.io': FqName@174) = null
-    _packageFragments('kotlin.jvm': FqName@175) = null
+    packageFragments('<root>': FqName@159) = LazyJavaPackageFragment@160['<root>']
+    packageFragments('Int': FqName@161) = null
+    packageFragments('System': FqName@162) = null
+    packageFragments('java': FqName@163) = LazyJavaPackageFragment@164['java']
+    packageFragments('java.io': FqName@165) = LazyJavaPackageFragment@166['io']
+    packageFragments('java.lang': FqName@167) = LazyJavaPackageFragment@168['lang']
+    packageFragments('java.lang.Int': FqName@169) = null
+    packageFragments('java.lang.System': FqName@170) = null
+    packageFragments('kotlin': FqName@171) = null
+    packageFragments('kotlin.Int': FqName@172) = null
+    packageFragments('kotlin.System': FqName@173) = null
+    packageFragments('kotlin.io': FqName@174) = null
+    packageFragments('kotlin.jvm': FqName@175) = null
     topLevelClasses(JavaClassImpl@83['Appendable']) = LazyJavaClassDescriptor@0['Appendable']
     topLevelClasses(JavaClassImpl@85['AutoCloseable']) = LazyJavaClassDescriptor@7['AutoCloseable']
-    topLevelClasses(JavaClassImpl@89['Closeable']) = LazyJavaClassDescriptor@11['Closeable']
+    topLevelClasses(JavaClassImpl@87['Closeable']) = LazyJavaClassDescriptor@11['Closeable']
     topLevelClasses(JavaClassImpl@91['Exception']) = LazyJavaClassDescriptor@15['Exception']
     topLevelClasses(JavaClassImpl@93['FilterOutputStream']) = LazyJavaClassDescriptor@17['FilterOutputStream']
     topLevelClasses(JavaClassImpl@113['OutputStream']) = LazyJavaClassDescriptor@21['OutputStream']
@@ -343,29 +343,29 @@ LazyJavaPackageFragmentProvider@158 {
 }
 
 LazyJavaPackageFragment@160['<root>'] {
-    _functions('RuntimeException': Name@178) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    _functions('println': Name@4) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('Int': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('RuntimeException': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('Int': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('RuntimeException': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@179
     classes('System': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('println': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('println': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@179
     deserializedPackageScope = Empty@182 // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('RuntimeException': Name@180) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('println': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@179
     memberIndex = computeMemberIndex$1@183 // through LazyPackageFragmentScopeForJavaPackage@179
 }
 
 LazyJavaPackageFragment@164['java'] {
-    _functions('lang': Name@184) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('lang': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('lang': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@185
     deserializedPackageScope = Empty@182 // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('lang': Name@186) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@185
     memberIndex = computeMemberIndex$1@187 // through LazyPackageFragmentScopeForJavaPackage@185
 }
 
 LazyJavaPackageFragment@168['lang'] {
-    _functions('RuntimeException': Name@178) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@188
-    _functions('println': Name@4) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@188
-    classes('RuntimeException': Name@178) = LazyJavaClassDescriptor@37['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@188
+    classes('RuntimeException': Name@180) = LazyJavaClassDescriptor@37['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@188
     classes('System': Name@181) = LazyJavaClassDescriptor@45['System'] // through LazyPackageFragmentScopeForJavaPackage@188
-    classes('println': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@188
+    classes('println': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@188
     deserializedPackageScope = Empty@182 // through LazyPackageFragmentScopeForJavaPackage@188
+    functions('RuntimeException': Name@180) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@188
+    functions('println': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@188
     memberIndex = computeMemberIndex$1@189 // through LazyPackageFragmentScopeForJavaPackage@188
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.lazy.log

@@ -3,429 +3,429 @@ DescriptorResolver@0 {
 }
 
 LazyAnnotationDescriptor@1 {
-    _resolutionResults = OverloadResolutionResultsImpl@2
-    _type = JetTypeImpl@3['inline']
-    _valueArguments(ValueParameterDescriptorImpl@4['strategy']) = null
+    resolutionResults = OverloadResolutionResultsImpl@2
+    type = JetTypeImpl@3['inline']
+    valueArguments(ValueParameterDescriptorImpl@4['strategy']) = null
 }
 
 LazyJavaClassDescriptor@5['Lock'] {
-    _functions('lock': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['lock'] } // through LazyJavaClassMemberScope@9
-    _functions('unlock': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['unlock'] } // through LazyJavaClassMemberScope@9
-    _properties('lock': Name@13) = EmptyList@14[empty] // through LazyJavaClassMemberScope@9
-    _properties('unlock': Name@15) = EmptyList@14[empty] // through LazyJavaClassMemberScope@9
-    _typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
-    defaultType = JetTypeImpl@17['Lock']
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@9
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
+    defaultType = JetTypeImpl@6['Lock']
+    functions('lock': Name@7) = ArrayList@8[1] { JavaMethodDescriptor@9['lock'] } // through LazyJavaClassMemberScope@10
+    functions('unlock': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['unlock'] } // through LazyJavaClassMemberScope@10
+    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@10
+    properties('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
+    properties('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@18['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
 }
 
 LazyJavaClassDescriptor@20['ReadLock'] {
-    _functions('lock': Name@21) = ArrayList@22[1] { JavaMethodDescriptor@23['lock'] } // through LazyJavaClassMemberScope@24
-    _functions('unlock': Name@15) = ArrayList@25[1] { JavaMethodDescriptor@26['unlock'] } // through LazyJavaClassMemberScope@24
-    _properties('lock': Name@21) = EmptyList@14[empty] // through LazyJavaClassMemberScope@24
-    _properties('unlock': Name@15) = EmptyList@14[empty] // through LazyJavaClassMemberScope@24
-    _typeConstructor = LazyJavaClassTypeConstructor@27['ReadLock']
-    defaultType = JetTypeImpl@28['ReadLock']
-    enumEntryIndex = LinkedHashMap@29 // through LazyJavaClassMemberScope@24
-    memberIndex = computeMemberIndex$1@30 // through LazyJavaClassMemberScope@24
-    nestedClassIndex = LinkedHashMap@31 // through LazyJavaClassMemberScope@24
-    nestedClasses('lock': Name@21) = null // through LazyJavaClassMemberScope@24
-    nestedClasses('unlock': Name@15) = null // through LazyJavaClassMemberScope@24
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@32['<this>']
+    defaultType = JetTypeImpl@21['ReadLock']
+    enumEntryIndex = LinkedHashMap@22 // through LazyJavaClassMemberScope@23
+    functions('lock': Name@24) = ArrayList@25[1] { JavaMethodDescriptor@26['lock'] } // through LazyJavaClassMemberScope@23
+    functions('unlock': Name@17) = ArrayList@27[1] { JavaMethodDescriptor@28['unlock'] } // through LazyJavaClassMemberScope@23
+    memberIndex = computeMemberIndex$1@29 // through LazyJavaClassMemberScope@23
+    nestedClassIndex = LinkedHashMap@30 // through LazyJavaClassMemberScope@23
+    nestedClasses('lock': Name@24) = null // through LazyJavaClassMemberScope@23
+    nestedClasses('unlock': Name@17) = null // through LazyJavaClassMemberScope@23
+    properties('lock': Name@24) = EmptyList@16[empty] // through LazyJavaClassMemberScope@23
+    properties('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@23
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@31['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@32['ReadLock']
 }
 
 LazyJavaClassDescriptor@33['ReadWriteLock'] {
-    _functions('action': Name@34) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _functions('compareTo': Name@36) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _functions('equals': Name@37) = ArrayList@38[1] { DeserializedSimpleFunctionDescriptor@39['equals'] } // through LazyJavaClassMemberScope@35
-    _functions('getReadHoldCount': Name@40) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _functions('getWriteHoldCount': Name@41) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _functions('hasNext': Name@42) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _functions('invoke': Name@43) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _functions('iterator': Name@44) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _functions('lock': Name@13) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _functions('next': Name@45) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _functions('rangeTo': Name@46) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _functions('readLock': Name@47) = ArrayList@48[1] { JavaMethodDescriptor@49['readLock'] } // through LazyJavaClassMemberScope@35
-    _functions('unlock': Name@15) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _functions('writeLock': Name@50) = ArrayList@51[1] { JavaMethodDescriptor@52['writeLock'] } // through LazyJavaClassMemberScope@35
-    _properties('action': Name@34) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _properties('compareTo': Name@36) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _properties('equals': Name@37) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _properties('getReadHoldCount': Name@53) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _properties('getWriteHoldCount': Name@54) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _properties('hasNext': Name@42) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _properties('iterator': Name@44) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _properties('lock': Name@13) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _properties('next': Name@45) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _properties('rangeTo': Name@46) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _properties('readCount': Name@55) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _properties('readLock': Name@56) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _properties('rl': Name@57) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _properties('unlock': Name@15) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _properties('wl': Name@58) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _properties('writeCount': Name@59) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _properties('writeLock': Name@60) = EmptyList@14[empty] // through LazyJavaClassMemberScope@35
-    _typeConstructor = LazyJavaClassTypeConstructor@61['ReadWriteLock']
-    defaultType = JetTypeImpl@62['ReadWriteLock']
-    memberIndex = computeMemberIndex$1@63 // through LazyJavaClassMemberScope@35
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@64['<this>']
+    defaultType = JetTypeImpl@34['ReadWriteLock']
+    functions('action': Name@35) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    functions('compareTo': Name@37) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    functions('equals': Name@38) = ArrayList@39[1] { DeserializedSimpleFunctionDescriptor@40['equals'] } // through LazyJavaClassMemberScope@36
+    functions('getReadHoldCount': Name@41) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    functions('getWriteHoldCount': Name@42) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    functions('hasNext': Name@43) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    functions('invoke': Name@44) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    functions('iterator': Name@45) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    functions('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    functions('next': Name@46) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    functions('rangeTo': Name@47) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    functions('readLock': Name@48) = ArrayList@49[1] { JavaMethodDescriptor@50['readLock'] } // through LazyJavaClassMemberScope@36
+    functions('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    functions('writeLock': Name@51) = ArrayList@52[1] { JavaMethodDescriptor@53['writeLock'] } // through LazyJavaClassMemberScope@36
+    memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@36
+    properties('action': Name@35) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    properties('compareTo': Name@37) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    properties('equals': Name@38) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    properties('getReadHoldCount': Name@55) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    properties('getWriteHoldCount': Name@56) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    properties('hasNext': Name@43) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    properties('iterator': Name@45) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    properties('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    properties('next': Name@46) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    properties('rangeTo': Name@47) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    properties('readCount': Name@57) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    properties('readLock': Name@58) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    properties('rl': Name@59) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    properties('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    properties('wl': Name@60) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    properties('writeCount': Name@61) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    properties('writeLock': Name@62) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@63['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@64['ReadWriteLock']
 }
 
 LazyJavaClassDescriptor@65['ReentrantReadWriteLock'] {
-    _functionTypeForSamInterface = null
-    _functions('action': Name@34) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _functions('compareTo': Name@36) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _functions('equals': Name@37) = ArrayList@67[1] { DeserializedSimpleFunctionDescriptor@68['equals'] } // through LazyJavaClassMemberScope@66
-    _functions('getReadHoldCount': Name@53) = ArrayList@69[1] { JavaMethodDescriptor@70['getReadHoldCount'] } // through LazyJavaClassMemberScope@66
-    _functions('getWriteHoldCount': Name@54) = ArrayList@71[1] { JavaMethodDescriptor@72['getWriteHoldCount'] } // through LazyJavaClassMemberScope@66
-    _functions('hasNext': Name@42) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _functions('invoke': Name@43) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _functions('iterator': Name@44) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _functions('lock': Name@13) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _functions('next': Name@45) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _functions('rangeTo': Name@46) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _functions('readLock': Name@56) = ArrayList@73[1] { JavaMethodDescriptor@74['readLock'] } // through LazyJavaClassMemberScope@66
-    _functions('unlock': Name@15) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _functions('writeLock': Name@60) = ArrayList@75[1] { JavaMethodDescriptor@76['writeLock'] } // through LazyJavaClassMemberScope@66
-    _properties('action': Name@34) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _properties('compareTo': Name@36) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _properties('equals': Name@37) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _properties('getReadHoldCount': Name@53) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _properties('getWriteHoldCount': Name@54) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _properties('hasNext': Name@42) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _properties('iterator': Name@44) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _properties('lock': Name@13) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _properties('next': Name@45) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _properties('rangeTo': Name@46) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _properties('readCount': Name@55) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _properties('readLock': Name@56) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _properties('rl': Name@57) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _properties('unlock': Name@15) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _properties('wl': Name@58) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _properties('writeCount': Name@59) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _properties('writeLock': Name@60) = EmptyList@14[empty] // through LazyJavaClassMemberScope@66
-    _typeConstructor = LazyJavaClassTypeConstructor@77['ReentrantReadWriteLock']
-    defaultType = JetTypeImpl@78['ReentrantReadWriteLock']
-    enumEntryIndex = LinkedHashMap@79 // through LazyJavaClassMemberScope@66
-    memberIndex = computeMemberIndex$1@80 // through LazyJavaClassMemberScope@66
-    nestedClassIndex = LinkedHashMap@81 // through LazyJavaClassMemberScope@66
-    nestedClasses('ReadLock': Name@82) = LazyJavaClassDescriptor@20['ReadLock'] // through LazyJavaClassMemberScope@66
-    nestedClasses('WriteLock': Name@83) = LazyJavaClassDescriptor@84['WriteLock'] // through LazyJavaClassMemberScope@66
-    nestedClasses('action': Name@34) = null // through LazyJavaClassMemberScope@66
-    nestedClasses('getReadHoldCount': Name@53) = null // through LazyJavaClassMemberScope@66
-    nestedClasses('getWriteHoldCount': Name@54) = null // through LazyJavaClassMemberScope@66
-    nestedClasses('readCount': Name@55) = null // through LazyJavaClassMemberScope@66
-    nestedClasses('readLock': Name@56) = null // through LazyJavaClassMemberScope@66
-    nestedClasses('rl': Name@57) = null // through LazyJavaClassMemberScope@66
-    nestedClasses('wl': Name@58) = null // through LazyJavaClassMemberScope@66
-    nestedClasses('writeCount': Name@59) = null // through LazyJavaClassMemberScope@66
-    nestedClasses('writeLock': Name@60) = null // through LazyJavaClassMemberScope@66
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@85['<this>']
+    defaultType = JetTypeImpl@66['ReentrantReadWriteLock']
+    enumEntryIndex = LinkedHashMap@67 // through LazyJavaClassMemberScope@68
+    functionTypeForSamInterface = null
+    functions('action': Name@35) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    functions('compareTo': Name@37) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    functions('equals': Name@38) = ArrayList@69[1] { DeserializedSimpleFunctionDescriptor@70['equals'] } // through LazyJavaClassMemberScope@68
+    functions('getReadHoldCount': Name@55) = ArrayList@71[1] { JavaMethodDescriptor@72['getReadHoldCount'] } // through LazyJavaClassMemberScope@68
+    functions('getWriteHoldCount': Name@56) = ArrayList@73[1] { JavaMethodDescriptor@74['getWriteHoldCount'] } // through LazyJavaClassMemberScope@68
+    functions('hasNext': Name@43) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    functions('invoke': Name@44) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    functions('iterator': Name@45) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    functions('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    functions('next': Name@46) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    functions('rangeTo': Name@47) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    functions('readLock': Name@58) = ArrayList@75[1] { JavaMethodDescriptor@76['readLock'] } // through LazyJavaClassMemberScope@68
+    functions('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    functions('writeLock': Name@62) = ArrayList@77[1] { JavaMethodDescriptor@78['writeLock'] } // through LazyJavaClassMemberScope@68
+    memberIndex = computeMemberIndex$1@79 // through LazyJavaClassMemberScope@68
+    nestedClassIndex = LinkedHashMap@80 // through LazyJavaClassMemberScope@68
+    nestedClasses('ReadLock': Name@81) = LazyJavaClassDescriptor@20['ReadLock'] // through LazyJavaClassMemberScope@68
+    nestedClasses('WriteLock': Name@82) = LazyJavaClassDescriptor@83['WriteLock'] // through LazyJavaClassMemberScope@68
+    nestedClasses('action': Name@35) = null // through LazyJavaClassMemberScope@68
+    nestedClasses('getReadHoldCount': Name@55) = null // through LazyJavaClassMemberScope@68
+    nestedClasses('getWriteHoldCount': Name@56) = null // through LazyJavaClassMemberScope@68
+    nestedClasses('readCount': Name@57) = null // through LazyJavaClassMemberScope@68
+    nestedClasses('readLock': Name@58) = null // through LazyJavaClassMemberScope@68
+    nestedClasses('rl': Name@59) = null // through LazyJavaClassMemberScope@68
+    nestedClasses('wl': Name@60) = null // through LazyJavaClassMemberScope@68
+    nestedClasses('writeCount': Name@61) = null // through LazyJavaClassMemberScope@68
+    nestedClasses('writeLock': Name@62) = null // through LazyJavaClassMemberScope@68
+    properties('action': Name@35) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    properties('compareTo': Name@37) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    properties('equals': Name@38) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    properties('getReadHoldCount': Name@55) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    properties('getWriteHoldCount': Name@56) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    properties('hasNext': Name@43) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    properties('iterator': Name@45) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    properties('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    properties('next': Name@46) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    properties('rangeTo': Name@47) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    properties('readCount': Name@57) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    properties('readLock': Name@58) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    properties('rl': Name@59) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    properties('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    properties('wl': Name@60) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    properties('writeCount': Name@61) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    properties('writeLock': Name@62) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@84['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@85['ReentrantReadWriteLock']
 }
 
 LazyJavaClassDescriptor@86['Serializable'] {
-    _functions('action': Name@34) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _functions('compareTo': Name@36) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _functions('equals': Name@37) = ArrayList@88[1] { DeserializedSimpleFunctionDescriptor@89['equals'] } // through LazyJavaClassMemberScope@87
-    _functions('getReadHoldCount': Name@40) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _functions('getWriteHoldCount': Name@41) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _functions('hasNext': Name@42) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _functions('invoke': Name@43) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _functions('iterator': Name@44) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _functions('lock': Name@6) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _functions('next': Name@45) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _functions('rangeTo': Name@46) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _functions('readLock': Name@47) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _functions('unlock': Name@10) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _functions('writeLock': Name@50) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _properties('action': Name@34) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _properties('compareTo': Name@36) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _properties('equals': Name@37) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _properties('getReadHoldCount': Name@53) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _properties('getWriteHoldCount': Name@54) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _properties('hasNext': Name@42) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _properties('iterator': Name@44) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _properties('lock': Name@13) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _properties('next': Name@45) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _properties('rangeTo': Name@46) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _properties('readCount': Name@55) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _properties('readLock': Name@56) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _properties('rl': Name@57) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _properties('unlock': Name@15) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _properties('wl': Name@58) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _properties('writeCount': Name@59) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _properties('writeLock': Name@60) = EmptyList@14[empty] // through LazyJavaClassMemberScope@87
-    _typeConstructor = LazyJavaClassTypeConstructor@90['Serializable']
-    defaultType = JetTypeImpl@91['Serializable']
-    memberIndex = computeMemberIndex$1@92 // through LazyJavaClassMemberScope@87
+    defaultType = JetTypeImpl@87['Serializable']
+    functions('action': Name@35) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    functions('compareTo': Name@37) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    functions('equals': Name@38) = ArrayList@89[1] { DeserializedSimpleFunctionDescriptor@90['equals'] } // through LazyJavaClassMemberScope@88
+    functions('getReadHoldCount': Name@41) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    functions('getWriteHoldCount': Name@42) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    functions('hasNext': Name@43) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    functions('invoke': Name@44) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    functions('iterator': Name@45) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    functions('lock': Name@7) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    functions('next': Name@46) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    functions('rangeTo': Name@47) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    functions('readLock': Name@48) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    functions('unlock': Name@11) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    functions('writeLock': Name@51) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    memberIndex = computeMemberIndex$1@91 // through LazyJavaClassMemberScope@88
+    properties('action': Name@35) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    properties('compareTo': Name@37) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    properties('equals': Name@38) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    properties('getReadHoldCount': Name@55) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    properties('getWriteHoldCount': Name@56) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    properties('hasNext': Name@43) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    properties('iterator': Name@45) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    properties('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    properties('next': Name@46) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    properties('rangeTo': Name@47) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    properties('readCount': Name@57) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    properties('readLock': Name@58) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    properties('rl': Name@59) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    properties('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    properties('wl': Name@60) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    properties('writeCount': Name@61) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    properties('writeLock': Name@62) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
+    typeConstructor = LazyJavaClassTypeConstructor@92['Serializable']
 }
 
-LazyJavaClassDescriptor@84['WriteLock'] {
-    _functions('lock': Name@13) = ArrayList@93[1] { JavaMethodDescriptor@94['lock'] } // through LazyJavaClassMemberScope@95
-    _functions('unlock': Name@96) = ArrayList@97[1] { JavaMethodDescriptor@98['unlock'] } // through LazyJavaClassMemberScope@95
-    _properties('lock': Name@13) = EmptyList@14[empty] // through LazyJavaClassMemberScope@95
-    _properties('unlock': Name@96) = EmptyList@14[empty] // through LazyJavaClassMemberScope@95
-    _typeConstructor = LazyJavaClassTypeConstructor@99['WriteLock']
-    defaultType = JetTypeImpl@100['WriteLock']
-    enumEntryIndex = LinkedHashMap@101 // through LazyJavaClassMemberScope@95
-    memberIndex = computeMemberIndex$1@102 // through LazyJavaClassMemberScope@95
-    nestedClassIndex = LinkedHashMap@103 // through LazyJavaClassMemberScope@95
-    nestedClasses('lock': Name@13) = null // through LazyJavaClassMemberScope@95
-    nestedClasses('unlock': Name@96) = null // through LazyJavaClassMemberScope@95
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@104['<this>']
+LazyJavaClassDescriptor@83['WriteLock'] {
+    defaultType = JetTypeImpl@93['WriteLock']
+    enumEntryIndex = LinkedHashMap@94 // through LazyJavaClassMemberScope@95
+    functions('lock': Name@15) = ArrayList@96[1] { JavaMethodDescriptor@97['lock'] } // through LazyJavaClassMemberScope@95
+    functions('unlock': Name@98) = ArrayList@99[1] { JavaMethodDescriptor@100['unlock'] } // through LazyJavaClassMemberScope@95
+    memberIndex = computeMemberIndex$1@101 // through LazyJavaClassMemberScope@95
+    nestedClassIndex = LinkedHashMap@102 // through LazyJavaClassMemberScope@95
+    nestedClasses('lock': Name@15) = null // through LazyJavaClassMemberScope@95
+    nestedClasses('unlock': Name@98) = null // through LazyJavaClassMemberScope@95
+    properties('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@95
+    properties('unlock': Name@98) = EmptyList@16[empty] // through LazyJavaClassMemberScope@95
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@103['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@104['WriteLock']
 }
 
-LazyJavaClassTypeConstructor@16['Lock'] {
-    _parameters = ArrayList@105[empty]
-    _supertypes = ArrayList@106[1] { JetTypeImpl@107['Any'] }
+LazyJavaClassTypeConstructor@19['Lock'] {
+    parameters = ArrayList@105[empty]
+    supertypes = ArrayList@106[1] { JetTypeImpl@107['Any'] }
 }
 
-LazyJavaClassTypeConstructor@27['ReadLock'] {
-    _parameters = ArrayList@108[empty]
-    _supertypes = ArrayList@109[2] { LazyJavaClassifierType@110['Lock'], LazyJavaClassifierType@111['Serializable'] }
+LazyJavaClassTypeConstructor@32['ReadLock'] {
+    parameters = ArrayList@108[empty]
+    supertypes = ArrayList@109[2] { LazyJavaClassifierType@110['Lock'], LazyJavaClassifierType@111['Serializable'] }
 }
 
-LazyJavaClassTypeConstructor@61['ReadWriteLock'] {
-    _parameters = ArrayList@112[empty]
-    _supertypes = ArrayList@113[1] { JetTypeImpl@107['Any'] }
+LazyJavaClassTypeConstructor@64['ReadWriteLock'] {
+    parameters = ArrayList@112[empty]
+    supertypes = ArrayList@113[1] { JetTypeImpl@107['Any'] }
 }
 
-LazyJavaClassTypeConstructor@77['ReentrantReadWriteLock'] {
-    _parameters = ArrayList@114[empty]
-    _supertypes = ArrayList@115[2] { LazyJavaClassifierType@116['ReadWriteLock'], LazyJavaClassifierType@117['Serializable'] }
+LazyJavaClassTypeConstructor@85['ReentrantReadWriteLock'] {
+    parameters = ArrayList@114[empty]
+    supertypes = ArrayList@115[2] { LazyJavaClassifierType@116['ReadWriteLock'], LazyJavaClassifierType@117['Serializable'] }
 }
 
-LazyJavaClassTypeConstructor@90['Serializable'] {
-    _parameters = ArrayList@118[empty]
-    _supertypes = ArrayList@119[1] { JetTypeImpl@107['Any'] }
+LazyJavaClassTypeConstructor@92['Serializable'] {
+    parameters = ArrayList@118[empty]
+    supertypes = ArrayList@119[1] { JetTypeImpl@107['Any'] }
 }
 
-LazyJavaClassTypeConstructor@99['WriteLock'] {
-    _parameters = ArrayList@120[empty]
-    _supertypes = ArrayList@121[2] { LazyJavaClassifierType@122['Lock'], LazyJavaClassifierType@123['Serializable'] }
-}
-
-LazyJavaClassifierType@122['Lock'] {
-    _arguments = ArrayList@124[empty]
-    _memberScope = LazyJavaClassMemberScope@9
-    _typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
-    classifier = JavaClassImpl@125['Lock']
+LazyJavaClassTypeConstructor@104['WriteLock'] {
+    parameters = ArrayList@120[empty]
+    supertypes = ArrayList@121[2] { LazyJavaClassifierType@122['Lock'], LazyJavaClassifierType@123['Serializable'] }
 }
 
 LazyJavaClassifierType@110['Lock'] {
-    _arguments = ArrayList@126[empty]
-    _memberScope = LazyJavaClassMemberScope@9
-    _typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
+    arguments = ArrayList@124[empty]
+    classifier = JavaClassImpl@125['Lock']
+    memberScope = LazyJavaClassMemberScope@10
+    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
+}
+
+LazyJavaClassifierType@122['Lock'] {
+    arguments = ArrayList@126[empty]
     classifier = JavaClassImpl@127['Lock']
+    memberScope = LazyJavaClassMemberScope@10
+    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
 }
 
 LazyJavaClassifierType@128['Lock'] {
-    _arguments = ArrayList@129[empty]
-    _nullable = 'false': Boolean@130
-    _typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
-    classifier = JavaClassImpl@131['Lock']
+    arguments = ArrayList@129[empty]
+    classifier = JavaClassImpl@130['Lock']
+    nullable = 'false': Boolean@131
+    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
 }
 
 LazyJavaClassifierType@132['Lock'] {
-    _arguments = ArrayList@133[empty]
-    _nullable = 'false': Boolean@130
-    _typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
+    arguments = ArrayList@133[empty]
     classifier = JavaClassImpl@134['Lock']
+    nullable = 'false': Boolean@131
+    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
 }
 
 LazyJavaClassifierType@135['Lock'] {
-    _arguments = ArrayList@136[empty]
-    _nullable = 'true': Boolean@137
-    _typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
-    classifier = JavaClassImpl@131['Lock']
+    arguments = ArrayList@136[empty]
+    classifier = JavaClassImpl@130['Lock']
+    nullable = 'true': Boolean@137
+    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
 }
 
 LazyJavaClassifierType@138['Lock'] {
-    _arguments = ArrayList@139[empty]
-    _nullable = 'true': Boolean@137
-    _typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
+    arguments = ArrayList@139[empty]
     classifier = JavaClassImpl@134['Lock']
+    nullable = 'true': Boolean@137
+    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
 }
 
 LazyJavaClassifierType@140['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@141
-    classifier = JavaClassImpl@142['Object']
+    classifier = JavaClassImpl@141['Object']
+    typeConstructor = DeserializedClassTypeConstructor@142
 }
 
 LazyJavaClassifierType@143['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@141
     classifier = JavaClassImpl@144['Object']
+    typeConstructor = DeserializedClassTypeConstructor@142
 }
 
 LazyJavaClassifierType@145['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@141
     classifier = JavaClassImpl@146['Object']
+    typeConstructor = DeserializedClassTypeConstructor@142
 }
 
 LazyJavaClassifierType@147['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@141
     classifier = JavaClassImpl@148['Object']
+    typeConstructor = DeserializedClassTypeConstructor@142
 }
 
 LazyJavaClassifierType@149['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@141
     classifier = JavaClassImpl@150['Object']
+    typeConstructor = DeserializedClassTypeConstructor@142
 }
 
 LazyJavaClassifierType@151['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@141
     classifier = JavaClassImpl@152['Object']
+    typeConstructor = DeserializedClassTypeConstructor@142
 }
 
 LazyJavaClassifierType@153['ReadLock'] {
-    _arguments = ArrayList@154[empty]
-    _memberScope = LazyJavaClassMemberScope@24
-    _nullable = 'false': Boolean@130
-    _typeConstructor = LazyJavaClassTypeConstructor@27['ReadLock']
+    arguments = ArrayList@154[empty]
     classifier = JavaClassImpl@155['ReadLock']
+    memberScope = LazyJavaClassMemberScope@23
+    nullable = 'false': Boolean@131
+    typeConstructor = LazyJavaClassTypeConstructor@32['ReadLock']
 }
 
 LazyJavaClassifierType@156['ReadLock'] {
-    _arguments = ArrayList@157[empty]
-    _nullable = 'true': Boolean@137
-    _typeConstructor = LazyJavaClassTypeConstructor@27['ReadLock']
+    arguments = ArrayList@157[empty]
     classifier = JavaClassImpl@155['ReadLock']
+    nullable = 'true': Boolean@137
+    typeConstructor = LazyJavaClassTypeConstructor@32['ReadLock']
 }
 
 LazyJavaClassifierType@116['ReadWriteLock'] {
-    _arguments = ArrayList@158[empty]
-    _memberScope = LazyJavaClassMemberScope@35
-    _typeConstructor = LazyJavaClassTypeConstructor@61['ReadWriteLock']
+    arguments = ArrayList@158[empty]
     classifier = JavaClassImpl@159['ReadWriteLock']
-}
-
-LazyJavaClassifierType@123['Serializable'] {
-    _arguments = ArrayList@160[empty]
-    _memberScope = LazyJavaClassMemberScope@87
-    _typeConstructor = LazyJavaClassTypeConstructor@90['Serializable']
-    classifier = JavaClassImpl@161['Serializable']
-}
-
-LazyJavaClassifierType@117['Serializable'] {
-    _arguments = ArrayList@162[empty]
-    _memberScope = LazyJavaClassMemberScope@87
-    _typeConstructor = LazyJavaClassTypeConstructor@90['Serializable']
-    classifier = JavaClassImpl@163['Serializable']
+    memberScope = LazyJavaClassMemberScope@36
+    typeConstructor = LazyJavaClassTypeConstructor@64['ReadWriteLock']
 }
 
 LazyJavaClassifierType@111['Serializable'] {
-    _arguments = ArrayList@164[empty]
-    _memberScope = LazyJavaClassMemberScope@87
-    _typeConstructor = LazyJavaClassTypeConstructor@90['Serializable']
+    arguments = ArrayList@160[empty]
+    classifier = JavaClassImpl@161['Serializable']
+    memberScope = LazyJavaClassMemberScope@88
+    typeConstructor = LazyJavaClassTypeConstructor@92['Serializable']
+}
+
+LazyJavaClassifierType@123['Serializable'] {
+    arguments = ArrayList@162[empty]
+    classifier = JavaClassImpl@163['Serializable']
+    memberScope = LazyJavaClassMemberScope@88
+    typeConstructor = LazyJavaClassTypeConstructor@92['Serializable']
+}
+
+LazyJavaClassifierType@117['Serializable'] {
+    arguments = ArrayList@164[empty]
     classifier = JavaClassImpl@165['Serializable']
+    memberScope = LazyJavaClassMemberScope@88
+    typeConstructor = LazyJavaClassTypeConstructor@92['Serializable']
 }
 
 LazyJavaClassifierType@166['WriteLock'] {
-    _arguments = ArrayList@167[empty]
-    _memberScope = LazyJavaClassMemberScope@95
-    _nullable = 'false': Boolean@130
-    _typeConstructor = LazyJavaClassTypeConstructor@99['WriteLock']
+    arguments = ArrayList@167[empty]
     classifier = JavaClassImpl@168['WriteLock']
+    memberScope = LazyJavaClassMemberScope@95
+    nullable = 'false': Boolean@131
+    typeConstructor = LazyJavaClassTypeConstructor@104['WriteLock']
 }
 
 LazyJavaClassifierType@169['WriteLock'] {
-    _arguments = ArrayList@170[empty]
-    _nullable = 'true': Boolean@137
-    _typeConstructor = LazyJavaClassTypeConstructor@99['WriteLock']
+    arguments = ArrayList@170[empty]
     classifier = JavaClassImpl@168['WriteLock']
+    nullable = 'true': Boolean@137
+    typeConstructor = LazyJavaClassTypeConstructor@104['WriteLock']
 }
 
 LazyJavaPackageFragmentProvider@171 {
-    _packageFragments('<root>': FqName@172) = LazyJavaPackageFragment@173['<root>']
-    _packageFragments('ReentrantReadWriteLock': FqName@174) = null
-    _packageFragments('T': FqName@175) = null
-    _packageFragments('inline': FqName@176) = null
-    _packageFragments('java': FqName@177) = LazyJavaPackageFragment@178['java']
-    _packageFragments('java.io': FqName@179) = LazyJavaPackageFragment@180['io']
-    _packageFragments('java.lang': FqName@181) = LazyJavaPackageFragment@182['lang']
-    _packageFragments('java.lang.ReentrantReadWriteLock': FqName@183) = null
-    _packageFragments('java.lang.T': FqName@184) = null
-    _packageFragments('java.lang.inline': FqName@185) = null
-    _packageFragments('java.util': FqName@186) = LazyJavaPackageFragment@187['util']
-    _packageFragments('java.util.concurrent': FqName@188) = LazyJavaPackageFragment@189['concurrent']
-    _packageFragments('java.util.concurrent.locks': FqName@190) = LazyJavaPackageFragment@191['locks']
-    _packageFragments('java.util.concurrent.locks.ReentrantReadWriteLock': FqName@192) = null
-    _packageFragments('kotlin': FqName@193) = null
-    _packageFragments('kotlin.ReentrantReadWriteLock': FqName@194) = null
-    _packageFragments('kotlin.T': FqName@195) = null
-    _packageFragments('kotlin.inline': FqName@196) = null
-    _packageFragments('kotlin.io': FqName@197) = null
-    _packageFragments('kotlin.jvm': FqName@198) = null
-    _packageFragments('kt1189': FqName@199) = null
-    _packageFragments('kt1189.ReentrantReadWriteLock': FqName@200) = null
-    _packageFragments('kt1189.T': FqName@201) = null
-    _packageFragments('kt1189.inline': FqName@202) = null
+    packageFragments('<root>': FqName@172) = LazyJavaPackageFragment@173['<root>']
+    packageFragments('ReentrantReadWriteLock': FqName@174) = null
+    packageFragments('T': FqName@175) = null
+    packageFragments('inline': FqName@176) = null
+    packageFragments('java': FqName@177) = LazyJavaPackageFragment@178['java']
+    packageFragments('java.io': FqName@179) = LazyJavaPackageFragment@180['io']
+    packageFragments('java.lang': FqName@181) = LazyJavaPackageFragment@182['lang']
+    packageFragments('java.lang.ReentrantReadWriteLock': FqName@183) = null
+    packageFragments('java.lang.T': FqName@184) = null
+    packageFragments('java.lang.inline': FqName@185) = null
+    packageFragments('java.util': FqName@186) = LazyJavaPackageFragment@187['util']
+    packageFragments('java.util.concurrent': FqName@188) = LazyJavaPackageFragment@189['concurrent']
+    packageFragments('java.util.concurrent.locks': FqName@190) = LazyJavaPackageFragment@191['locks']
+    packageFragments('java.util.concurrent.locks.ReentrantReadWriteLock': FqName@192) = null
+    packageFragments('kotlin': FqName@193) = null
+    packageFragments('kotlin.ReentrantReadWriteLock': FqName@194) = null
+    packageFragments('kotlin.T': FqName@195) = null
+    packageFragments('kotlin.inline': FqName@196) = null
+    packageFragments('kotlin.io': FqName@197) = null
+    packageFragments('kotlin.jvm': FqName@198) = null
+    packageFragments('kt1189': FqName@199) = null
+    packageFragments('kt1189.ReentrantReadWriteLock': FqName@200) = null
+    packageFragments('kt1189.T': FqName@201) = null
+    packageFragments('kt1189.inline': FqName@202) = null
     topLevelClasses(JavaClassImpl@134['Lock']) = LazyJavaClassDescriptor@5['Lock']
     topLevelClasses(JavaClassImpl@159['ReadWriteLock']) = LazyJavaClassDescriptor@33['ReadWriteLock']
     topLevelClasses(JavaClassImpl@203['ReentrantReadWriteLock']) = LazyJavaClassDescriptor@65['ReentrantReadWriteLock']
-    topLevelClasses(JavaClassImpl@163['Serializable']) = LazyJavaClassDescriptor@86['Serializable']
+    topLevelClasses(JavaClassImpl@165['Serializable']) = LazyJavaClassDescriptor@86['Serializable']
 }
 
 LazyJavaPackageFragment@189['concurrent'] {
-    _functions('locks': Name@204) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@205
-    classes('locks': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@205
-    deserializedPackageScope = Empty@207 // through LazyPackageFragmentScopeForJavaPackage@205
+    classes('locks': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@205
+    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@205
+    functions('locks': Name@207) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@205
     memberIndex = computeMemberIndex$1@208 // through LazyPackageFragmentScopeForJavaPackage@205
 }
 
 LazyJavaPackageFragment@178['java'] {
-    _functions('lang': Name@209) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@210
-    _functions('util': Name@211) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@210
-    classes('lang': Name@212) = null // through LazyPackageFragmentScopeForJavaPackage@210
-    classes('util': Name@213) = null // through LazyPackageFragmentScopeForJavaPackage@210
-    deserializedPackageScope = Empty@207 // through LazyPackageFragmentScopeForJavaPackage@210
+    classes('lang': Name@209) = null // through LazyPackageFragmentScopeForJavaPackage@210
+    classes('util': Name@211) = null // through LazyPackageFragmentScopeForJavaPackage@210
+    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@210
+    functions('lang': Name@212) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@210
+    functions('util': Name@213) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@210
     memberIndex = computeMemberIndex$1@214 // through LazyPackageFragmentScopeForJavaPackage@210
 }
 
 LazyJavaPackageFragment@182['lang'] {
-    _functions('action': Name@34) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    _functions('compareTo': Name@36) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    _functions('equals': Name@37) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    _functions('getReadHoldCount': Name@53) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    _functions('getWriteHoldCount': Name@54) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    _functions('hasNext': Name@42) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    _functions('invoke': Name@43) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    _functions('iterator': Name@44) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    _functions('lock': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    _functions('next': Name@45) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    _functions('rangeTo': Name@46) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    _functions('readLock': Name@56) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    _functions('unlock': Name@15) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    _functions('writeLock': Name@60) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('action': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('compareTo': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('equals': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('getReadHoldCount': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('getWriteHoldCount': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('hasNext': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('invoke': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('iterator': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('lock': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('next': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('rangeTo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('readLock': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('unlock': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('writeLock': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    deserializedPackageScope = Empty@207 // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('action': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('compareTo': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('equals': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('getReadHoldCount': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('getWriteHoldCount': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('hasNext': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('invoke': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('iterator': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('lock': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('next': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('rangeTo': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('readLock': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('unlock': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('writeLock': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('action': Name@35) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('compareTo': Name@37) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('equals': Name@38) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('getReadHoldCount': Name@55) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('getWriteHoldCount': Name@56) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('hasNext': Name@43) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('invoke': Name@44) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('iterator': Name@45) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('lock': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('next': Name@46) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('rangeTo': Name@47) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('readLock': Name@58) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('unlock': Name@17) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('writeLock': Name@62) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
     memberIndex = computeMemberIndex$1@216 // through LazyPackageFragmentScopeForJavaPackage@215
 }
 
 LazyJavaPackageFragment@191['locks'] {
-    _functions('ReentrantReadWriteLock': Name@217) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('ReentrantReadWriteLock': Name@219) = LazyJavaClassDescriptor@65['ReentrantReadWriteLock'] // through LazyPackageFragmentScopeForJavaPackage@218
-    deserializedPackageScope = Empty@207 // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('ReentrantReadWriteLock': Name@217) = LazyJavaClassDescriptor@65['ReentrantReadWriteLock'] // through LazyPackageFragmentScopeForJavaPackage@218
+    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@218
+    functions('ReentrantReadWriteLock': Name@219) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@218
     memberIndex = computeMemberIndex$1@220 // through LazyPackageFragmentScopeForJavaPackage@218
 }
 
 LazyJavaPackageFragment@187['util'] {
-    _functions('concurrent': Name@221) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@222
-    classes('concurrent': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@222
-    deserializedPackageScope = Empty@207 // through LazyPackageFragmentScopeForJavaPackage@222
+    classes('concurrent': Name@221) = null // through LazyPackageFragmentScopeForJavaPackage@222
+    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@222
+    functions('concurrent': Name@223) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@222
     memberIndex = computeMemberIndex$1@224 // through LazyPackageFragmentScopeForJavaPackage@222
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.lazy.log

@@ -1,237 +1,237 @@
 LazyJavaClassDescriptor@0['Appendable'] {
-    _functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    _properties('println': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    _typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
-    memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@3
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
+    memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
+    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
+    typeConstructor = LazyJavaClassTypeConstructor@6['Appendable']
 }
 
 LazyJavaClassDescriptor@7['AutoCloseable'] {
-    _functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
-    _properties('println': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
-    _typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@8
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
+    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@8
+    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
+    typeConstructor = LazyJavaClassTypeConstructor@10['AutoCloseable']
 }
 
 LazyJavaClassDescriptor@11['Closeable'] {
-    _functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    _properties('println': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    _typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@12
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
+    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@12
+    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
+    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
 }
 
 LazyJavaClassDescriptor@15['FilterOutputStream'] {
-    _functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@16
-    _properties('println': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@16
-    _typeConstructor = LazyJavaClassTypeConstructor@17['FilterOutputStream']
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@16
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@16
+    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@16
+    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@16
+    typeConstructor = LazyJavaClassTypeConstructor@18['FilterOutputStream']
 }
 
 LazyJavaClassDescriptor@19['OutputStream'] {
-    _functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@20
-    _properties('println': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@20
-    _typeConstructor = LazyJavaClassTypeConstructor@21['OutputStream']
-    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@20
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@20
+    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@20
+    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@20
+    typeConstructor = LazyJavaClassTypeConstructor@22['OutputStream']
 }
 
 LazyJavaClassDescriptor@23['PrintStream'] {
-    _functions('println': Name@4) = ArrayList@24[10] { JavaMethodDescriptor@25['println'], JavaMethodDescriptor@26['println'], JavaMethodDescriptor@27['println'], ... } // through LazyJavaClassMemberScope@28
-    _properties('println': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@28
-    _typeConstructor = LazyJavaClassTypeConstructor@29['PrintStream']
-    defaultType = JetTypeImpl@30['PrintStream']
-    enumEntryIndex = LinkedHashMap@31 // through LazyJavaClassMemberScope@28
-    memberIndex = computeMemberIndex$1@32 // through LazyJavaClassMemberScope@28
-    nestedClassIndex = LinkedHashMap@33 // through LazyJavaClassMemberScope@28
-    nestedClasses('println': Name@4) = null // through LazyJavaClassMemberScope@28
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@34['<this>']
+    defaultType = JetTypeImpl@24['PrintStream']
+    enumEntryIndex = LinkedHashMap@25 // through LazyJavaClassMemberScope@26
+    functions('println': Name@5) = ArrayList@27[10] { JavaMethodDescriptor@28['println'], JavaMethodDescriptor@29['println'], JavaMethodDescriptor@30['println'], ... } // through LazyJavaClassMemberScope@26
+    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@26
+    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@26
+    nestedClasses('println': Name@5) = null // through LazyJavaClassMemberScope@26
+    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@34['PrintStream']
 }
 
 LazyJavaClassDescriptor@35['System'] {
-    _properties('out': Name@36) = ArrayList@37[1] { JavaPropertyDescriptor@38['out'] } // through LazyJavaStaticClassScope@39
-    _properties('out': Name@36) = EmptyList@2[empty] // through LazyJavaClassMemberScope@40
-    _typeConstructor = LazyJavaClassTypeConstructor@41['System']
-    enumEntryIndex = LinkedHashMap@42 // through LazyJavaClassMemberScope@40
-    memberIndex = computeMemberIndex$1@43 // through LazyJavaClassMemberScope@40
-    memberIndex = computeMemberIndex$1@44 // through LazyJavaStaticClassScope@39
-    nestedClassIndex = LinkedHashMap@45 // through LazyJavaClassMemberScope@40
-    nestedClasses('out': Name@36) = null // through LazyJavaClassMemberScope@40
+    enumEntryIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@37
+    memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@37
+    memberIndex = computeMemberIndex$1@39 // through LazyJavaStaticClassScope@40
+    nestedClassIndex = LinkedHashMap@41 // through LazyJavaClassMemberScope@37
+    nestedClasses('out': Name@42) = null // through LazyJavaClassMemberScope@37
+    properties('out': Name@42) = ArrayList@43[1] { JavaPropertyDescriptor@44['out'] } // through LazyJavaStaticClassScope@40
+    properties('out': Name@42) = EmptyList@2[empty] // through LazyJavaClassMemberScope@37
+    typeConstructor = LazyJavaClassTypeConstructor@45['System']
 }
 
-LazyJavaClassTypeConstructor@5['Appendable'] {
-    _parameters = ArrayList@46[empty]
-    _supertypes = ArrayList@47[1] { JetTypeImpl@48['Any'] }
+LazyJavaClassTypeConstructor@6['Appendable'] {
+    parameters = ArrayList@46[empty]
+    supertypes = ArrayList@47[1] { JetTypeImpl@48['Any'] }
 }
 
-LazyJavaClassTypeConstructor@9['AutoCloseable'] {
-    _parameters = ArrayList@49[empty]
-    _supertypes = ArrayList@50[1] { JetTypeImpl@48['Any'] }
+LazyJavaClassTypeConstructor@10['AutoCloseable'] {
+    parameters = ArrayList@49[empty]
+    supertypes = ArrayList@50[1] { JetTypeImpl@48['Any'] }
 }
 
-LazyJavaClassTypeConstructor@13['Closeable'] {
-    _parameters = ArrayList@51[empty]
-    _supertypes = ArrayList@52[1] { LazyJavaClassifierType@53['AutoCloseable'] }
+LazyJavaClassTypeConstructor@14['Closeable'] {
+    parameters = ArrayList@51[empty]
+    supertypes = ArrayList@52[1] { LazyJavaClassifierType@53['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@17['FilterOutputStream'] {
-    _parameters = ArrayList@54[empty]
-    _supertypes = ArrayList@55[1] { LazyJavaClassifierType@56['OutputStream'] }
+LazyJavaClassTypeConstructor@18['FilterOutputStream'] {
+    parameters = ArrayList@54[empty]
+    supertypes = ArrayList@55[1] { LazyJavaClassifierType@56['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@21['OutputStream'] {
-    _parameters = ArrayList@57[empty]
-    _supertypes = ArrayList@58[1] { LazyJavaClassifierType@59['Closeable'] }
+LazyJavaClassTypeConstructor@22['OutputStream'] {
+    parameters = ArrayList@57[empty]
+    supertypes = ArrayList@58[1] { LazyJavaClassifierType@59['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@29['PrintStream'] {
-    _parameters = ArrayList@60[empty]
-    _supertypes = ArrayList@61[3] { LazyJavaClassifierType@62['FilterOutputStream'], LazyJavaClassifierType@63['Appendable'], LazyJavaClassifierType@64['Closeable'] }
+LazyJavaClassTypeConstructor@34['PrintStream'] {
+    parameters = ArrayList@60[empty]
+    supertypes = ArrayList@61[3] { LazyJavaClassifierType@62['FilterOutputStream'], LazyJavaClassifierType@63['Appendable'], LazyJavaClassifierType@64['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@41['System'] {
-    _supertypes = ArrayList@65[1] { JetTypeImpl@48['Any'] }
+LazyJavaClassTypeConstructor@45['System'] {
+    supertypes = ArrayList@65[1] { JetTypeImpl@48['Any'] }
 }
 
 LazyJavaClassifierType@63['Appendable'] {
-    _arguments = ArrayList@66[empty]
-    _memberScope = LazyJavaClassMemberScope@3
-    _typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
+    arguments = ArrayList@66[empty]
     classifier = JavaClassImpl@67['Appendable']
+    memberScope = LazyJavaClassMemberScope@3
+    typeConstructor = LazyJavaClassTypeConstructor@6['Appendable']
 }
 
 LazyJavaClassifierType@53['AutoCloseable'] {
-    _arguments = ArrayList@68[empty]
-    _memberScope = LazyJavaClassMemberScope@8
-    _typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
+    arguments = ArrayList@68[empty]
     classifier = JavaClassImpl@69['AutoCloseable']
-}
-
-LazyJavaClassifierType@64['Closeable'] {
-    _arguments = ArrayList@70[empty]
-    _memberScope = LazyJavaClassMemberScope@12
-    _typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
-    classifier = JavaClassImpl@71['Closeable']
+    memberScope = LazyJavaClassMemberScope@8
+    typeConstructor = LazyJavaClassTypeConstructor@10['AutoCloseable']
 }
 
 LazyJavaClassifierType@59['Closeable'] {
-    _arguments = ArrayList@72[empty]
-    _memberScope = LazyJavaClassMemberScope@12
-    _typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
+    arguments = ArrayList@70[empty]
+    classifier = JavaClassImpl@71['Closeable']
+    memberScope = LazyJavaClassMemberScope@12
+    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+}
+
+LazyJavaClassifierType@64['Closeable'] {
+    arguments = ArrayList@72[empty]
     classifier = JavaClassImpl@73['Closeable']
+    memberScope = LazyJavaClassMemberScope@12
+    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
 }
 
 LazyJavaClassifierType@62['FilterOutputStream'] {
-    _arguments = ArrayList@74[empty]
-    _memberScope = LazyJavaClassMemberScope@16
-    _typeConstructor = LazyJavaClassTypeConstructor@17['FilterOutputStream']
+    arguments = ArrayList@74[empty]
     classifier = JavaClassImpl@75['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@16
+    typeConstructor = LazyJavaClassTypeConstructor@18['FilterOutputStream']
 }
 
 LazyJavaClassifierType@76['Flushable'] {
-    _typeConstructor = TypeConstructorImpl$1@77
     classifier = null
+    typeConstructor = TypeConstructorImpl$1@77
 }
 
 LazyJavaClassifierType@78['Object'] {
-    _arguments = ArrayList@79[empty]
-    _nullable = 'false': Boolean@80
-    _typeConstructor = DeserializedClassTypeConstructor@81
-    classifier = JavaClassImpl@82['Object']
+    arguments = ArrayList@79[empty]
+    classifier = JavaClassImpl@80['Object']
+    nullable = 'false': Boolean@81
+    typeConstructor = DeserializedClassTypeConstructor@82
 }
 
 LazyJavaClassifierType@83['Object'] {
-    _arguments = ArrayList@84[empty]
-    _nullable = 'true': Boolean@85
-    _typeConstructor = DeserializedClassTypeConstructor@81
-    classifier = JavaClassImpl@82['Object']
+    arguments = ArrayList@84[empty]
+    classifier = JavaClassImpl@80['Object']
+    nullable = 'true': Boolean@85
+    typeConstructor = DeserializedClassTypeConstructor@82
 }
 
 LazyJavaClassifierType@86['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@81
     classifier = JavaClassImpl@87['Object']
+    typeConstructor = DeserializedClassTypeConstructor@82
 }
 
 LazyJavaClassifierType@88['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@81
     classifier = JavaClassImpl@89['Object']
+    typeConstructor = DeserializedClassTypeConstructor@82
 }
 
 LazyJavaClassifierType@90['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@81
     classifier = JavaClassImpl@91['Object']
+    typeConstructor = DeserializedClassTypeConstructor@82
 }
 
 LazyJavaClassifierType@92['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@81
     classifier = JavaClassImpl@93['Object']
+    typeConstructor = DeserializedClassTypeConstructor@82
 }
 
 LazyJavaClassifierType@56['OutputStream'] {
-    _arguments = ArrayList@94[empty]
-    _memberScope = LazyJavaClassMemberScope@20
-    _typeConstructor = LazyJavaClassTypeConstructor@21['OutputStream']
+    arguments = ArrayList@94[empty]
     classifier = JavaClassImpl@95['OutputStream']
+    memberScope = LazyJavaClassMemberScope@20
+    typeConstructor = LazyJavaClassTypeConstructor@22['OutputStream']
 }
 
 LazyJavaClassifierType@96['PrintStream'] {
-    _arguments = ArrayList@97[empty]
-    _memberScope = LazyJavaClassMemberScope@28
-    _nullable = 'false': Boolean@80
-    _typeConstructor = LazyJavaClassTypeConstructor@29['PrintStream']
+    arguments = ArrayList@97[empty]
     classifier = JavaClassImpl@98['PrintStream']
+    memberScope = LazyJavaClassMemberScope@26
+    nullable = 'false': Boolean@81
+    typeConstructor = LazyJavaClassTypeConstructor@34['PrintStream']
 }
 
 LazyJavaClassifierType@99['PrintStream'] {
-    _arguments = ArrayList@100[empty]
-    _nullable = 'true': Boolean@85
-    _typeConstructor = LazyJavaClassTypeConstructor@29['PrintStream']
+    arguments = ArrayList@100[empty]
     classifier = JavaClassImpl@98['PrintStream']
+    nullable = 'true': Boolean@85
+    typeConstructor = LazyJavaClassTypeConstructor@34['PrintStream']
 }
 
 LazyJavaClassifierType@101['String'] {
-    _arguments = ArrayList@102[empty]
-    _nullable = 'false': Boolean@80
-    _typeConstructor = DeserializedClassTypeConstructor@103
-    classifier = JavaClassImpl@104['String']
+    arguments = ArrayList@102[empty]
+    classifier = JavaClassImpl@103['String']
+    nullable = 'false': Boolean@81
+    typeConstructor = DeserializedClassTypeConstructor@104
 }
 
 LazyJavaClassifierType@105['String'] {
-    _arguments = ArrayList@106[empty]
-    _nullable = 'true': Boolean@85
-    _typeConstructor = DeserializedClassTypeConstructor@103
-    classifier = JavaClassImpl@104['String']
+    arguments = ArrayList@106[empty]
+    classifier = JavaClassImpl@103['String']
+    nullable = 'true': Boolean@85
+    typeConstructor = DeserializedClassTypeConstructor@104
 }
 
 LazyJavaPackageFragmentProvider@107 {
-    _packageFragments('<root>': FqName@108) = LazyJavaPackageFragment@109['<root>']
-    _packageFragments('Iterable': FqName@110) = null
-    _packageFragments('R': FqName@111) = null
-    _packageFragments('System': FqName@112) = null
-    _packageFragments('T': FqName@113) = null
-    _packageFragments('Unit': FqName@114) = null
-    _packageFragments('java': FqName@115) = LazyJavaPackageFragment@116['java']
-    _packageFragments('java.io': FqName@117) = LazyJavaPackageFragment@118['io']
-    _packageFragments('java.lang': FqName@119) = LazyJavaPackageFragment@120['lang']
-    _packageFragments('java.lang.Iterable': FqName@121) = null
-    _packageFragments('java.lang.R': FqName@122) = null
-    _packageFragments('java.lang.System': FqName@123) = null
-    _packageFragments('java.lang.T': FqName@124) = null
-    _packageFragments('java.lang.Unit': FqName@125) = null
-    _packageFragments('kotlin': FqName@126) = null
-    _packageFragments('kotlin.Iterable': FqName@127) = null
-    _packageFragments('kotlin.R': FqName@128) = null
-    _packageFragments('kotlin.System': FqName@129) = null
-    _packageFragments('kotlin.T': FqName@130) = null
-    _packageFragments('kotlin.Unit': FqName@131) = null
-    _packageFragments('kotlin.io': FqName@132) = null
-    _packageFragments('kotlin.jvm': FqName@133) = null
-    _packageFragments('kt1219': FqName@134) = null
-    _packageFragments('kt1219.Iterable': FqName@135) = null
-    _packageFragments('kt1219.R': FqName@136) = null
-    _packageFragments('kt1219.System': FqName@137) = null
-    _packageFragments('kt1219.T': FqName@138) = null
-    _packageFragments('kt1219.Unit': FqName@139) = null
+    packageFragments('<root>': FqName@108) = LazyJavaPackageFragment@109['<root>']
+    packageFragments('Iterable': FqName@110) = null
+    packageFragments('R': FqName@111) = null
+    packageFragments('System': FqName@112) = null
+    packageFragments('T': FqName@113) = null
+    packageFragments('Unit': FqName@114) = null
+    packageFragments('java': FqName@115) = LazyJavaPackageFragment@116['java']
+    packageFragments('java.io': FqName@117) = LazyJavaPackageFragment@118['io']
+    packageFragments('java.lang': FqName@119) = LazyJavaPackageFragment@120['lang']
+    packageFragments('java.lang.Iterable': FqName@121) = null
+    packageFragments('java.lang.R': FqName@122) = null
+    packageFragments('java.lang.System': FqName@123) = null
+    packageFragments('java.lang.T': FqName@124) = null
+    packageFragments('java.lang.Unit': FqName@125) = null
+    packageFragments('kotlin': FqName@126) = null
+    packageFragments('kotlin.Iterable': FqName@127) = null
+    packageFragments('kotlin.R': FqName@128) = null
+    packageFragments('kotlin.System': FqName@129) = null
+    packageFragments('kotlin.T': FqName@130) = null
+    packageFragments('kotlin.Unit': FqName@131) = null
+    packageFragments('kotlin.io': FqName@132) = null
+    packageFragments('kotlin.jvm': FqName@133) = null
+    packageFragments('kt1219': FqName@134) = null
+    packageFragments('kt1219.Iterable': FqName@135) = null
+    packageFragments('kt1219.R': FqName@136) = null
+    packageFragments('kt1219.System': FqName@137) = null
+    packageFragments('kt1219.T': FqName@138) = null
+    packageFragments('kt1219.Unit': FqName@139) = null
     topLevelClasses(JavaClassImpl@67['Appendable']) = LazyJavaClassDescriptor@0['Appendable']
     topLevelClasses(JavaClassImpl@69['AutoCloseable']) = LazyJavaClassDescriptor@7['AutoCloseable']
-    topLevelClasses(JavaClassImpl@71['Closeable']) = LazyJavaClassDescriptor@11['Closeable']
+    topLevelClasses(JavaClassImpl@73['Closeable']) = LazyJavaClassDescriptor@11['Closeable']
     topLevelClasses(JavaClassImpl@75['FilterOutputStream']) = LazyJavaClassDescriptor@15['FilterOutputStream']
     topLevelClasses(JavaClassImpl@95['OutputStream']) = LazyJavaClassDescriptor@19['OutputStream']
     topLevelClasses(JavaClassImpl@98['PrintStream']) = LazyJavaClassDescriptor@23['PrintStream']
@@ -239,32 +239,32 @@ LazyJavaPackageFragmentProvider@107 {
 }
 
 LazyJavaPackageFragment@116['java'] {
-    _functions('lang': Name@141) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('lang': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    deserializedPackageScope = Empty@144 // through LazyPackageFragmentScopeForJavaPackage@142
+    classes('lang': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@142
+    deserializedPackageScope = Empty@143 // through LazyPackageFragmentScopeForJavaPackage@142
+    functions('lang': Name@144) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@142
     memberIndex = computeMemberIndex$1@145 // through LazyPackageFragmentScopeForJavaPackage@142
 }
 
 LazyJavaPackageFragment@120['lang'] {
-    _functions('bar': Name@146) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    _functions('foreach': Name@148) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    _functions('hasNext': Name@149) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    _functions('invoke': Name@150) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    _functions('iterator': Name@151) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    _functions('next': Name@152) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    _functions('op': Name@153) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    _functions('operation': Name@154) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    _functions('println': Name@4) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('System': Name@155) = LazyJavaClassDescriptor@35['System'] // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('bar': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('foreach': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('hasNext': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('invoke': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('iterator': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('next': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('op': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('operation': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('println': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    deserializedPackageScope = Empty@144 // through LazyPackageFragmentScopeForJavaPackage@147
+    classes('System': Name@146) = LazyJavaClassDescriptor@35['System'] // through LazyPackageFragmentScopeForJavaPackage@147
+    classes('bar': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@147
+    classes('foreach': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@147
+    classes('hasNext': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@147
+    classes('invoke': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@147
+    classes('iterator': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@147
+    classes('next': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@147
+    classes('op': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@147
+    classes('operation': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@147
+    classes('println': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@147
+    deserializedPackageScope = Empty@143 // through LazyPackageFragmentScopeForJavaPackage@147
+    functions('bar': Name@148) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
+    functions('foreach': Name@149) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
+    functions('hasNext': Name@150) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
+    functions('invoke': Name@151) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
+    functions('iterator': Name@152) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
+    functions('next': Name@153) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
+    functions('op': Name@154) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
+    functions('operation': Name@155) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
+    functions('println': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
     memberIndex = computeMemberIndex$1@156 // through LazyPackageFragmentScopeForJavaPackage@147
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1571.lazy.log

@@ -6,57 +6,57 @@ DescriptorResolver@0 {
 }
 
 LazyJavaPackageFragmentProvider@2 {
-    _packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    _packageFragments('A': FqName@5) = null
-    _packageFragments('Int': FqName@6) = null
-    _packageFragments('String': FqName@7) = null
-    _packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    _packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    _packageFragments('java.lang.A': FqName@12) = null
-    _packageFragments('java.lang.Int': FqName@13) = null
-    _packageFragments('java.lang.String': FqName@14) = null
-    _packageFragments('kotlin': FqName@15) = null
-    _packageFragments('kotlin.A': FqName@16) = null
-    _packageFragments('kotlin.Int': FqName@17) = null
-    _packageFragments('kotlin.String': FqName@18) = null
-    _packageFragments('kotlin.io': FqName@19) = null
-    _packageFragments('kotlin.jvm': FqName@20) = null
-    _packageFragments('kt1571': FqName@21) = null
-    _packageFragments('kt1571.A': FqName@22) = null
-    _packageFragments('kt1571.Int': FqName@23) = null
-    _packageFragments('kt1571.String': FqName@24) = null
-    _packageFragments('kt1571.a': FqName@25) = null
-    _packageFragments('kt1571.c0': FqName@26) = null
-    _packageFragments('kt1571.c1': FqName@27) = null
-    _packageFragments('kt1571.c2': FqName@28) = null
+    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
+    packageFragments('A': FqName@5) = null
+    packageFragments('Int': FqName@6) = null
+    packageFragments('String': FqName@7) = null
+    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
+    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
+    packageFragments('java.lang.A': FqName@12) = null
+    packageFragments('java.lang.Int': FqName@13) = null
+    packageFragments('java.lang.String': FqName@14) = null
+    packageFragments('kotlin': FqName@15) = null
+    packageFragments('kotlin.A': FqName@16) = null
+    packageFragments('kotlin.Int': FqName@17) = null
+    packageFragments('kotlin.String': FqName@18) = null
+    packageFragments('kotlin.io': FqName@19) = null
+    packageFragments('kotlin.jvm': FqName@20) = null
+    packageFragments('kt1571': FqName@21) = null
+    packageFragments('kt1571.A': FqName@22) = null
+    packageFragments('kt1571.Int': FqName@23) = null
+    packageFragments('kt1571.String': FqName@24) = null
+    packageFragments('kt1571.a': FqName@25) = null
+    packageFragments('kt1571.c0': FqName@26) = null
+    packageFragments('kt1571.c1': FqName@27) = null
+    packageFragments('kt1571.c2': FqName@28) = null
 }
 
 LazyJavaPackageFragment@9['java'] {
-    _functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    _functions('A': Name@35) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('div': Name@37) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('divAssign': Name@38) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('equals': Name@39) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('inc': Name@40) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('times': Name@41) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    _functions('timesAssign': Name@42) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     classes('A': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('a': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('c0': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('c1': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('c2': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('div': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('divAssign': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('equals': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('inc': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('times': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('timesAssign': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('a': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('c0': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('c1': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('c2': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('div': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('divAssign': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('equals': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('inc': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('times': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('timesAssign': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('A': Name@35) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('div': Name@41) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('divAssign': Name@42) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('equals': Name@43) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('inc': Name@44) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('times': Name@45) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('timesAssign': Name@46) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@36
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1977.lazy.log

@@ -1,164 +1,164 @@
 LazyJavaClassDescriptor@0['Exception'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
 }
 
 LazyJavaClassDescriptor@2['IllegalArgumentException'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@3['IllegalArgumentException']
+    typeConstructor = LazyJavaClassTypeConstructor@3['IllegalArgumentException']
 }
 
 LazyJavaClassDescriptor@4['Integer'] {
-    _functions('parseInt': Name@5) = ArrayList@6[2] { JavaMethodDescriptor@7['parseInt'], JavaMethodDescriptor@8['parseInt'] } // through LazyJavaStaticClassScope@9
-    _functions('parseInt': Name@5) = EmptyList@10[empty] // through LazyJavaClassMemberScope@11
-    _properties('parseInt': Name@5) = EmptyList@10[empty] // through LazyJavaClassMemberScope@11
-    _properties('parseInt': Name@5) = EmptyList@10[empty] // through LazyJavaStaticClassScope@9
-    _typeConstructor = LazyJavaClassTypeConstructor@12['Integer']
-    enumEntryIndex = LinkedHashMap@13 // through LazyJavaClassMemberScope@11
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@11
-    memberIndex = computeMemberIndex$1@15 // through LazyJavaStaticClassScope@9
-    nestedClassIndex = LinkedHashMap@16 // through LazyJavaClassMemberScope@11
-    nestedClasses('parseInt': Name@5) = null // through LazyJavaClassMemberScope@11
+    enumEntryIndex = LinkedHashMap@5 // through LazyJavaClassMemberScope@6
+    functions('parseInt': Name@7) = ArrayList@8[2] { JavaMethodDescriptor@9['parseInt'], JavaMethodDescriptor@10['parseInt'] } // through LazyJavaStaticClassScope@11
+    functions('parseInt': Name@7) = EmptyList@12[empty] // through LazyJavaClassMemberScope@6
+    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@6
+    memberIndex = computeMemberIndex$1@14 // through LazyJavaStaticClassScope@11
+    nestedClassIndex = LinkedHashMap@15 // through LazyJavaClassMemberScope@6
+    nestedClasses('parseInt': Name@7) = null // through LazyJavaClassMemberScope@6
+    properties('parseInt': Name@7) = EmptyList@12[empty] // through LazyJavaClassMemberScope@6
+    properties('parseInt': Name@7) = EmptyList@12[empty] // through LazyJavaStaticClassScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@16['Integer']
 }
 
 LazyJavaClassDescriptor@17['NumberFormatException'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@18['NumberFormatException']
+    typeConstructor = LazyJavaClassTypeConstructor@18['NumberFormatException']
 }
 
 LazyJavaClassDescriptor@19['RuntimeException'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@20['RuntimeException']
+    typeConstructor = LazyJavaClassTypeConstructor@20['RuntimeException']
 }
 
 LazyJavaClassTypeConstructor@1['Exception'] {
-    _parameters = ArrayList@21[empty]
-    _supertypes = ArrayList@22[1] { LazyJavaClassifierType@23['Throwable'] }
+    parameters = ArrayList@21[empty]
+    supertypes = ArrayList@22[1] { LazyJavaClassifierType@23['Throwable'] }
 }
 
 LazyJavaClassTypeConstructor@3['IllegalArgumentException'] {
-    _parameters = ArrayList@24[empty]
-    _supertypes = ArrayList@25[1] { LazyJavaClassifierType@26['RuntimeException'] }
+    parameters = ArrayList@24[empty]
+    supertypes = ArrayList@25[1] { LazyJavaClassifierType@26['RuntimeException'] }
 }
 
-LazyJavaClassTypeConstructor@12['Integer'] {
-    _supertypes = ArrayList@27[2] { LazyJavaClassifierType@28['Number'], LazyJavaClassifierType@29['Comparable<Integer>'] }
+LazyJavaClassTypeConstructor@16['Integer'] {
+    supertypes = ArrayList@27[2] { LazyJavaClassifierType@28['Number'], LazyJavaClassifierType@29['Comparable<Integer>'] }
 }
 
 LazyJavaClassTypeConstructor@18['NumberFormatException'] {
-    _parameters = ArrayList@30[empty]
-    _supertypes = ArrayList@31[1] { LazyJavaClassifierType@32['IllegalArgumentException'] }
+    parameters = ArrayList@30[empty]
+    supertypes = ArrayList@31[1] { LazyJavaClassifierType@32['IllegalArgumentException'] }
 }
 
 LazyJavaClassTypeConstructor@20['RuntimeException'] {
-    _parameters = ArrayList@33[empty]
-    _supertypes = ArrayList@34[1] { LazyJavaClassifierType@35['Exception'] }
+    parameters = ArrayList@33[empty]
+    supertypes = ArrayList@34[1] { LazyJavaClassifierType@35['Exception'] }
 }
 
 LazyJavaClassifierType@29['Comparable<Integer>'] {
-    _arguments = ArrayList@36[1] { TypeProjectionImpl@37 }
-    _memberScope = SubstitutingScope@38
-    _typeConstructor = DeserializedClassTypeConstructor@39
-    classifier = JavaClassImpl@40['Comparable']
+    arguments = ArrayList@36[1] { TypeProjectionImpl@37 }
+    classifier = JavaClassImpl@38['Comparable']
+    memberScope = SubstitutingScope@39
+    typeConstructor = DeserializedClassTypeConstructor@40
 }
 
 LazyJavaClassifierType@35['Exception'] {
-    _arguments = ArrayList@41[empty]
-    _typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
+    arguments = ArrayList@41[empty]
     classifier = JavaClassImpl@42['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
 }
 
 LazyJavaClassifierType@32['IllegalArgumentException'] {
-    _arguments = ArrayList@43[empty]
-    _typeConstructor = LazyJavaClassTypeConstructor@3['IllegalArgumentException']
+    arguments = ArrayList@43[empty]
     classifier = JavaClassImpl@44['IllegalArgumentException']
+    typeConstructor = LazyJavaClassTypeConstructor@3['IllegalArgumentException']
 }
 
 LazyJavaClassifierType@45['Integer'] {
-    _arguments = ArrayList@46[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = DeserializedClassTypeConstructor@48
-    classifier = JavaClassImpl@49['Integer']
+    arguments = ArrayList@46[empty]
+    classifier = JavaClassImpl@47['Integer']
+    nullable = 'false': Boolean@48
+    typeConstructor = DeserializedClassTypeConstructor@49
 }
 
 LazyJavaClassifierType@50['Integer'] {
-    _arguments = ArrayList@51[empty]
-    _nullable = 'true': Boolean@52
-    _typeConstructor = DeserializedClassTypeConstructor@48
-    classifier = JavaClassImpl@49['Integer']
+    arguments = ArrayList@51[empty]
+    classifier = JavaClassImpl@47['Integer']
+    nullable = 'true': Boolean@52
+    typeConstructor = DeserializedClassTypeConstructor@49
 }
 
 LazyJavaClassifierType@28['Number'] {
-    _arguments = ArrayList@53[empty]
-    _memberScope = DeserializedClassMemberScope@54
-    _typeConstructor = DeserializedClassTypeConstructor@55
-    classifier = JavaClassImpl@56['Number']
+    arguments = ArrayList@53[empty]
+    classifier = JavaClassImpl@54['Number']
+    memberScope = DeserializedClassMemberScope@55
+    typeConstructor = DeserializedClassTypeConstructor@56
 }
 
 LazyJavaClassifierType@26['RuntimeException'] {
-    _arguments = ArrayList@57[empty]
-    _typeConstructor = LazyJavaClassTypeConstructor@20['RuntimeException']
+    arguments = ArrayList@57[empty]
     classifier = JavaClassImpl@58['RuntimeException']
+    typeConstructor = LazyJavaClassTypeConstructor@20['RuntimeException']
 }
 
 LazyJavaClassifierType@59['String'] {
-    _arguments = ArrayList@60[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = DeserializedClassTypeConstructor@61
-    classifier = JavaClassImpl@62['String']
+    arguments = ArrayList@60[empty]
+    classifier = JavaClassImpl@61['String']
+    nullable = 'false': Boolean@48
+    typeConstructor = DeserializedClassTypeConstructor@62
 }
 
 LazyJavaClassifierType@63['String'] {
-    _arguments = ArrayList@64[empty]
-    _nullable = 'false': Boolean@47
-    _typeConstructor = DeserializedClassTypeConstructor@61
+    arguments = ArrayList@64[empty]
     classifier = JavaClassImpl@65['String']
+    nullable = 'false': Boolean@48
+    typeConstructor = DeserializedClassTypeConstructor@62
 }
 
 LazyJavaClassifierType@66['String'] {
-    _arguments = ArrayList@67[empty]
-    _nullable = 'true': Boolean@52
-    _typeConstructor = DeserializedClassTypeConstructor@61
-    classifier = JavaClassImpl@62['String']
+    arguments = ArrayList@67[empty]
+    classifier = JavaClassImpl@61['String']
+    nullable = 'true': Boolean@52
+    typeConstructor = DeserializedClassTypeConstructor@62
 }
 
 LazyJavaClassifierType@68['String'] {
-    _arguments = ArrayList@69[empty]
-    _nullable = 'true': Boolean@52
-    _typeConstructor = DeserializedClassTypeConstructor@61
+    arguments = ArrayList@69[empty]
     classifier = JavaClassImpl@65['String']
+    nullable = 'true': Boolean@52
+    typeConstructor = DeserializedClassTypeConstructor@62
 }
 
 LazyJavaClassifierType@23['Throwable'] {
-    _arguments = ArrayList@70[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@71
-    classifier = JavaClassImpl@72['Throwable']
+    arguments = ArrayList@70[empty]
+    classifier = JavaClassImpl@71['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@72
 }
 
 LazyJavaPackageFragmentProvider@73 {
-    _packageFragments('<root>': FqName@74) = LazyJavaPackageFragment@75['<root>']
-    _packageFragments('Exception': FqName@76) = null
-    _packageFragments('Int': FqName@77) = null
-    _packageFragments('Integer': FqName@78) = null
-    _packageFragments('NumberFormatException': FqName@79) = null
-    _packageFragments('String': FqName@80) = null
-    _packageFragments('java': FqName@81) = LazyJavaPackageFragment@82['java']
-    _packageFragments('java.lang': FqName@83) = LazyJavaPackageFragment@84['lang']
-    _packageFragments('java.lang.Exception': FqName@85) = null
-    _packageFragments('java.lang.Int': FqName@86) = null
-    _packageFragments('java.lang.Integer': FqName@87) = null
-    _packageFragments('java.lang.NumberFormatException': FqName@88) = null
-    _packageFragments('java.lang.String': FqName@89) = null
-    _packageFragments('kotlin': FqName@90) = null
-    _packageFragments('kotlin.Exception': FqName@91) = null
-    _packageFragments('kotlin.Int': FqName@92) = null
-    _packageFragments('kotlin.Integer': FqName@93) = null
-    _packageFragments('kotlin.NumberFormatException': FqName@94) = null
-    _packageFragments('kotlin.String': FqName@95) = null
-    _packageFragments('kotlin.io': FqName@96) = null
-    _packageFragments('kotlin.jvm': FqName@97) = null
-    _packageFragments('kt1977': FqName@98) = null
-    _packageFragments('kt1977.Exception': FqName@99) = null
-    _packageFragments('kt1977.Int': FqName@100) = null
-    _packageFragments('kt1977.Integer': FqName@101) = null
-    _packageFragments('kt1977.NumberFormatException': FqName@102) = null
-    _packageFragments('kt1977.String': FqName@103) = null
+    packageFragments('<root>': FqName@74) = LazyJavaPackageFragment@75['<root>']
+    packageFragments('Exception': FqName@76) = null
+    packageFragments('Int': FqName@77) = null
+    packageFragments('Integer': FqName@78) = null
+    packageFragments('NumberFormatException': FqName@79) = null
+    packageFragments('String': FqName@80) = null
+    packageFragments('java': FqName@81) = LazyJavaPackageFragment@82['java']
+    packageFragments('java.lang': FqName@83) = LazyJavaPackageFragment@84['lang']
+    packageFragments('java.lang.Exception': FqName@85) = null
+    packageFragments('java.lang.Int': FqName@86) = null
+    packageFragments('java.lang.Integer': FqName@87) = null
+    packageFragments('java.lang.NumberFormatException': FqName@88) = null
+    packageFragments('java.lang.String': FqName@89) = null
+    packageFragments('kotlin': FqName@90) = null
+    packageFragments('kotlin.Exception': FqName@91) = null
+    packageFragments('kotlin.Int': FqName@92) = null
+    packageFragments('kotlin.Integer': FqName@93) = null
+    packageFragments('kotlin.NumberFormatException': FqName@94) = null
+    packageFragments('kotlin.String': FqName@95) = null
+    packageFragments('kotlin.io': FqName@96) = null
+    packageFragments('kotlin.jvm': FqName@97) = null
+    packageFragments('kt1977': FqName@98) = null
+    packageFragments('kt1977.Exception': FqName@99) = null
+    packageFragments('kt1977.Int': FqName@100) = null
+    packageFragments('kt1977.Integer': FqName@101) = null
+    packageFragments('kt1977.NumberFormatException': FqName@102) = null
+    packageFragments('kt1977.String': FqName@103) = null
     topLevelClasses(JavaClassImpl@42['Exception']) = LazyJavaClassDescriptor@0['Exception']
     topLevelClasses(JavaClassImpl@44['IllegalArgumentException']) = LazyJavaClassDescriptor@2['IllegalArgumentException']
     topLevelClasses(JavaClassImpl@104['Integer']) = LazyJavaClassDescriptor@4['Integer']
@@ -167,18 +167,18 @@ LazyJavaPackageFragmentProvider@73 {
 }
 
 LazyJavaPackageFragment@82['java'] {
-    _functions('lang': Name@106) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('lang': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('lang': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    deserializedPackageScope = Empty@108 // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('lang': Name@109) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@107
     memberIndex = computeMemberIndex$1@110 // through LazyPackageFragmentScopeForJavaPackage@107
 }
 
 LazyJavaPackageFragment@84['lang'] {
-    _functions('bar': Name@111) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Exception': Name@113) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Integer': Name@114) = LazyJavaClassDescriptor@4['Integer'] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('NumberFormatException': Name@115) = LazyJavaClassDescriptor@17['NumberFormatException'] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('bar': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('Exception': Name@111) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('Integer': Name@113) = LazyJavaClassDescriptor@4['Integer'] // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('NumberFormatException': Name@114) = LazyJavaClassDescriptor@17['NumberFormatException'] // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('bar': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    deserializedPackageScope = Empty@108 // through LazyPackageFragmentScopeForJavaPackage@112
+    functions('bar': Name@115) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@112
     memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@112
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2166_kt2103.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2226.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2330.lazy.log

@@ -8,39 +8,39 @@ DescriptorResolver@2 {
 }
 
 LazyJavaPackageFragmentProvider@4 {
-    _packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    _packageFragments('Int': FqName@7) = null
-    _packageFragments('a': FqName@8) = null
-    _packageFragments('a.Int': FqName@9) = null
-    _packageFragments('a.P': FqName@10) = null
-    _packageFragments('a.R': FqName@11) = null
-    _packageFragments('a.p': FqName@12) = null
-    _packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    _packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    _packageFragments('java.lang.Int': FqName@17) = null
-    _packageFragments('java.lang.p': FqName@18) = null
-    _packageFragments('kotlin': FqName@19) = null
-    _packageFragments('kotlin.Int': FqName@20) = null
-    _packageFragments('kotlin.io': FqName@21) = null
-    _packageFragments('kotlin.jvm': FqName@22) = null
-    _packageFragments('kotlin.p': FqName@23) = null
-    _packageFragments('p': FqName@24) = null
+    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
+    packageFragments('Int': FqName@7) = null
+    packageFragments('a': FqName@8) = null
+    packageFragments('a.Int': FqName@9) = null
+    packageFragments('a.P': FqName@10) = null
+    packageFragments('a.R': FqName@11) = null
+    packageFragments('a.p': FqName@12) = null
+    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
+    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
+    packageFragments('java.lang.Int': FqName@17) = null
+    packageFragments('java.lang.p': FqName@18) = null
+    packageFragments('kotlin': FqName@19) = null
+    packageFragments('kotlin.Int': FqName@20) = null
+    packageFragments('kotlin.io': FqName@21) = null
+    packageFragments('kotlin.jvm': FqName@22) = null
+    packageFragments('kotlin.p': FqName@23) = null
+    packageFragments('p': FqName@24) = null
 }
 
 LazyJavaPackageFragment@14['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@16['lang'] {
-    _functions('P': Name@31) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    _functions('p': Name@33) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     classes('P': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('other': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('p': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('x': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('other': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('p': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('x': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('P': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('p': Name@36) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@32
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2334.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.lazy.log

@@ -3,158 +3,158 @@ 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@23['String']
+    arguments = ArrayList@25[empty]
+    classifier = JavaClassImpl@20['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
-    _arguments = ArrayList@28[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@16
-    classifier = JavaClassImpl@17['String']
+    arguments = ArrayList@28[empty]
+    classifier = JavaClassImpl@15['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
-    _arguments = ArrayList@30[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@16
-    classifier = JavaClassImpl@20['String']
+    arguments = ArrayList@30[empty]
+    classifier = JavaClassImpl@23['String']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@31['Throwable'] {
-    _arguments = ArrayList@32[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@34['Throwable']
+    arguments = ArrayList@32[empty]
+    classifier = JavaClassImpl@33['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@35['Throwable'] {
-    _arguments = ArrayList@36[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@36[empty]
     classifier = JavaClassImpl@37['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@38['Throwable'] {
-    _arguments = ArrayList@39[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@39[empty]
     classifier = JavaClassImpl@40['Throwable']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@41['Throwable'] {
-    _arguments = ArrayList@42[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@37['Throwable']
+    arguments = ArrayList@42[empty]
+    classifier = JavaClassImpl@33['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
-    _arguments = ArrayList@44[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@40['Throwable']
+    arguments = ArrayList@44[empty]
+    classifier = JavaClassImpl@37['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
-    _arguments = ArrayList@46[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@34['Throwable']
+    arguments = ArrayList@46[empty]
+    classifier = JavaClassImpl@40['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@12['Throwable'] {
-    _arguments = ArrayList@47[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@47[empty]
     classifier = JavaClassImpl@48['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaPackageFragmentProvider@49 {
-    _packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    _packageFragments('Any': FqName@52) = null
-    _packageFragments('Array': FqName@53) = null
-    _packageFragments('Int': FqName@54) = null
-    _packageFragments('String': FqName@55) = null
-    _packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    _packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    _packageFragments('java.lang.Any': FqName@60) = null
-    _packageFragments('java.lang.Array': FqName@61) = null
-    _packageFragments('java.lang.Int': FqName@62) = null
-    _packageFragments('java.lang.String': FqName@63) = null
-    _packageFragments('kotlin': FqName@64) = null
-    _packageFragments('kotlin.Any': FqName@65) = null
-    _packageFragments('kotlin.Array': FqName@66) = null
-    _packageFragments('kotlin.Int': FqName@67) = null
-    _packageFragments('kotlin.String': FqName@68) = null
-    _packageFragments('kotlin.io': FqName@69) = null
-    _packageFragments('kotlin.jvm': FqName@70) = null
+    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
+    packageFragments('Any': FqName@52) = null
+    packageFragments('Array': FqName@53) = null
+    packageFragments('Int': FqName@54) = null
+    packageFragments('String': FqName@55) = null
+    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
+    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
+    packageFragments('java.lang.Any': FqName@60) = null
+    packageFragments('java.lang.Array': FqName@61) = null
+    packageFragments('java.lang.Int': FqName@62) = null
+    packageFragments('java.lang.String': FqName@63) = null
+    packageFragments('kotlin': FqName@64) = null
+    packageFragments('kotlin.Any': FqName@65) = null
+    packageFragments('kotlin.Array': FqName@66) = null
+    packageFragments('kotlin.Int': FqName@67) = null
+    packageFragments('kotlin.String': FqName@68) = null
+    packageFragments('kotlin.io': FqName@69) = null
+    packageFragments('kotlin.jvm': FqName@70) = null
     topLevelClasses(JavaClassImpl@71['Exception']) = LazyJavaClassDescriptor@2['Exception']
 }
 
 LazyJavaPackageFragment@51['<root>'] {
-    _functions('Exception': Name@72) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    _functions('doSmth': Name@75) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    _functions('plus': Name@76) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('Any': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('Array': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('Exception': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('String': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('doSmth': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('plus': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('Any': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('Array': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('Exception': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('Int': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('String': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('doSmth': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('plus': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('Exception': Name@75) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('doSmth': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('plus': Name@79) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
 LazyJavaPackageFragment@57['java'] {
-    _functions('lang': Name@83) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('lang': Name@85) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
     memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
 }
 
 LazyJavaPackageFragment@59['lang'] {
-    _functions('Exception': Name@72) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    _functions('doSmth': Name@75) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    _functions('plus': Name@76) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('Exception': Name@72) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('doSmth': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('plus': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('Exception': Name@75) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('doSmth': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('plus': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('Exception': Name@75) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('doSmth': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('plus': Name@79) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2845.lazy.log

@@ -1,198 +1,198 @@
 LazyJavaClassDescriptor@0['AbstractCollection'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
 }
 
 LazyJavaClassDescriptor@2['AbstractList'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
 }
 
 LazyJavaClassDescriptor@4['ArrayList'] {
-    _constructors = ArrayList@5[3] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'] } // through LazyJavaClassMemberScope@9
-    _functionTypeForSamInterface = null
-    _typeConstructor = LazyJavaClassTypeConstructor@10['ArrayList']
-    defaultType = JetTypeImpl@11['ArrayList<1>']
+    constructors = ArrayList@5[3] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'] } // through LazyJavaClassMemberScope@9
+    defaultType = JetTypeImpl@10['ArrayList<1>']
+    functionTypeForSamInterface = null
+    typeConstructor = LazyJavaClassTypeConstructor@11['ArrayList']
 }
 
 LazyJavaClassDescriptor@12['RandomAccess'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@13['RandomAccess']
+    typeConstructor = LazyJavaClassTypeConstructor@13['RandomAccess']
 }
 
 LazyJavaClassDescriptor@14['Serializable'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
 }
 
 LazyJavaClassTypeConstructor@1['AbstractCollection'] {
-    _supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Collection<E>'] }
+    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Collection<E>'] }
 }
 
 LazyJavaClassTypeConstructor@3['AbstractList'] {
-    _parameters = ArrayList@18[1] { LazyJavaTypeParameterDescriptor@19['E'] }
-    _supertypes = ArrayList@20[2] { LazyJavaClassifierType@21['AbstractCollection<E>'], LazyJavaClassifierType@22['List<E>'] }
+    parameters = ArrayList@18[1] { LazyJavaTypeParameterDescriptor@19['E'] }
+    supertypes = ArrayList@20[2] { LazyJavaClassifierType@21['AbstractCollection<E>'], LazyJavaClassifierType@22['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@10['ArrayList'] {
-    _parameters = ArrayList@23[1] { LazyJavaTypeParameterDescriptor@24['E'] }
-    _supertypes = ArrayList@25[5] { LazyJavaClassifierType@26['AbstractList<E>'], LazyJavaClassifierType@27['List<E>'], LazyJavaClassifierType@28['RandomAccess'], ... }
+LazyJavaClassTypeConstructor@11['ArrayList'] {
+    parameters = ArrayList@23[1] { LazyJavaTypeParameterDescriptor@24['E'] }
+    supertypes = ArrayList@25[5] { LazyJavaClassifierType@26['AbstractList<E>'], LazyJavaClassifierType@27['List<E>'], LazyJavaClassifierType@28['RandomAccess'], ... }
 }
 
 LazyJavaClassTypeConstructor@13['RandomAccess'] {
-    _supertypes = ArrayList@29[1] { JetTypeImpl@30['Any'] }
+    supertypes = ArrayList@29[1] { JetTypeImpl@30['Any'] }
 }
 
 LazyJavaClassTypeConstructor@15['Serializable'] {
-    _supertypes = ArrayList@31[1] { JetTypeImpl@30['Any'] }
+    supertypes = ArrayList@31[1] { JetTypeImpl@30['Any'] }
 }
 
 LazyJavaClassifierType@21['AbstractCollection<E>'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
     classifier = JavaClassImpl@32['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
 }
 
 LazyJavaClassifierType@26['AbstractList<E>'] {
-    _arguments = ArrayList@33[1] { TypeProjectionImpl@34 }
-    _typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
+    arguments = ArrayList@33[1] { TypeProjectionImpl@34 }
     classifier = JavaClassImpl@35['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
 }
 
 LazyJavaClassifierType@36['Cloneable'] {
-    _typeConstructor = DeserializedClassTypeConstructor@37
-    classifier = JavaClassImpl@38['Cloneable']
+    classifier = JavaClassImpl@37['Cloneable']
+    typeConstructor = DeserializedClassTypeConstructor@38
 }
 
 LazyJavaClassifierType@39['Collection<? extends E>'] {
-    _arguments = ArrayList@40[1] { TypeProjectionImpl@41 }
-    _memberScope = SubstitutingScope@42
-    _nullable = 'false': Boolean@43
-    _typeConstructor = DeserializedClassTypeConstructor@44
-    classifier = JavaClassImpl@45['Collection']
+    arguments = ArrayList@40[1] { TypeProjectionImpl@41 }
+    classifier = JavaClassImpl@42['Collection']
+    memberScope = SubstitutingScope@43
+    nullable = 'false': Boolean@44
+    typeConstructor = DeserializedClassTypeConstructor@45
 }
 
 LazyJavaClassifierType@46['Collection<? extends E>'] {
-    _arguments = ArrayList@47[1] { TypeProjectionImpl@48 }
-    _memberScope = SubstitutingScope@49
-    _nullable = 'true': Boolean@50
-    _typeConstructor = DeserializedClassTypeConstructor@51
-    classifier = JavaClassImpl@45['Collection']
+    arguments = ArrayList@47[1] { TypeProjectionImpl@48 }
+    classifier = JavaClassImpl@42['Collection']
+    memberScope = SubstitutingScope@49
+    nullable = 'true': Boolean@50
+    typeConstructor = DeserializedClassTypeConstructor@51
 }
 
 LazyJavaClassifierType@17['Collection<E>'] {
-    _typeConstructor = DeserializedClassTypeConstructor@44
     classifier = JavaClassImpl@52['Collection']
+    typeConstructor = DeserializedClassTypeConstructor@45
 }
 
 LazyJavaClassifierType@53['E'] {
-    _arguments = ArrayList@54[empty]
-    _nullable = 'false': Boolean@43
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
-    classifier = JavaTypeParameterImpl@56['E']
+    arguments = ArrayList@54[empty]
+    classifier = JavaTypeParameterImpl@55['E']
+    nullable = 'false': Boolean@44
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@57['E'] {
-    _arguments = ArrayList@58[empty]
-    _nullable = 'false': Boolean@43
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
-    classifier = JavaTypeParameterImpl@60['E']
+    arguments = ArrayList@58[empty]
+    classifier = JavaTypeParameterImpl@59['E']
+    nullable = 'false': Boolean@44
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
-LazyJavaClassifierType@61['E'] {
-    _arguments = ArrayList@62[empty]
-    _nullable = 'false': Boolean@43
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
-    classifier = JavaTypeParameterImpl@63['E']
+LazyJavaClassifierType@60['E'] {
+    arguments = ArrayList@61[empty]
+    classifier = JavaTypeParameterImpl@62['E']
+    nullable = 'false': Boolean@44
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
-LazyJavaClassifierType@64['E'] {
-    _arguments = ArrayList@65[empty]
-    _nullable = 'false': Boolean@43
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
-    classifier = JavaTypeParameterImpl@66['E']
+LazyJavaClassifierType@63['E'] {
+    arguments = ArrayList@64[empty]
+    classifier = JavaTypeParameterImpl@65['E']
+    nullable = 'false': Boolean@44
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@67['E'] {
-    _arguments = ArrayList@68[empty]
-    _nullable = 'true': Boolean@50
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
-    classifier = JavaTypeParameterImpl@66['E']
+    arguments = ArrayList@68[empty]
+    classifier = JavaTypeParameterImpl@59['E']
+    nullable = 'true': Boolean@50
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@69['E'] {
-    _arguments = ArrayList@70[empty]
-    _nullable = 'true': Boolean@50
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
-    classifier = JavaTypeParameterImpl@63['E']
+    arguments = ArrayList@70[empty]
+    classifier = JavaTypeParameterImpl@62['E']
+    nullable = 'true': Boolean@50
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@71['E'] {
-    _arguments = ArrayList@72[empty]
-    _nullable = 'true': Boolean@50
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
-    classifier = JavaTypeParameterImpl@60['E']
+    arguments = ArrayList@72[empty]
+    classifier = JavaTypeParameterImpl@55['E']
+    nullable = 'true': Boolean@50
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@73['E'] {
-    _arguments = ArrayList@74[empty]
-    _nullable = 'true': Boolean@50
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
-    classifier = JavaTypeParameterImpl@56['E']
+    arguments = ArrayList@74[empty]
+    classifier = JavaTypeParameterImpl@65['E']
+    nullable = 'true': Boolean@50
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@22['List<E>'] {
-    _arguments = ArrayList@75[1] { TypeProjectionImpl@76 }
-    _memberScope = SubstitutingScope@77
-    _nullable = 'false': Boolean@43
-    _typeConstructor = DeserializedClassTypeConstructor@78
-    classifier = JavaClassImpl@79['List']
+    arguments = ArrayList@75[1] { TypeProjectionImpl@76 }
+    classifier = JavaClassImpl@77['List']
+    memberScope = SubstitutingScope@78
+    nullable = 'false': Boolean@44
+    typeConstructor = DeserializedClassTypeConstructor@79
 }
 
 LazyJavaClassifierType@27['List<E>'] {
-    _typeConstructor = DeserializedClassTypeConstructor@78
     classifier = JavaClassImpl@80['List']
+    typeConstructor = DeserializedClassTypeConstructor@79
 }
 
 LazyJavaClassifierType@81['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@82
-    classifier = JavaClassImpl@83['Object']
+    classifier = JavaClassImpl@82['Object']
+    typeConstructor = DeserializedClassTypeConstructor@83
 }
 
 LazyJavaClassifierType@84['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@82
     classifier = JavaClassImpl@85['Object']
+    typeConstructor = DeserializedClassTypeConstructor@83
 }
 
 LazyJavaClassifierType@86['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@82
     classifier = JavaClassImpl@87['Object']
+    typeConstructor = DeserializedClassTypeConstructor@83
 }
 
 LazyJavaClassifierType@28['RandomAccess'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@13['RandomAccess']
     classifier = JavaClassImpl@88['RandomAccess']
+    typeConstructor = LazyJavaClassTypeConstructor@13['RandomAccess']
 }
 
 LazyJavaClassifierType@89['Serializable'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
     classifier = JavaClassImpl@90['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
 }
 
 LazyJavaPackageFragmentProvider@91 {
-    _packageFragments('<root>': FqName@92) = LazyJavaPackageFragment@93['<root>']
-    _packageFragments('Int': FqName@94) = null
-    _packageFragments('MutableList': FqName@95) = null
-    _packageFragments('h': FqName@96) = null
-    _packageFragments('h.Int': FqName@97) = null
-    _packageFragments('h.MutableList': FqName@98) = null
-    _packageFragments('java': FqName@99) = LazyJavaPackageFragment@100['java']
-    _packageFragments('java.io': FqName@101) = LazyJavaPackageFragment@102['io']
-    _packageFragments('java.lang': FqName@103) = LazyJavaPackageFragment@104['lang']
-    _packageFragments('java.lang.Int': FqName@105) = null
-    _packageFragments('java.lang.MutableList': FqName@106) = null
-    _packageFragments('java.util': FqName@107) = LazyJavaPackageFragment@108['util']
-    _packageFragments('java.util.ArrayList': FqName@109) = null
-    _packageFragments('kotlin': FqName@110) = null
-    _packageFragments('kotlin.Int': FqName@111) = null
-    _packageFragments('kotlin.MutableList': FqName@112) = null
-    _packageFragments('kotlin.io': FqName@113) = null
-    _packageFragments('kotlin.jvm': FqName@114) = null
+    packageFragments('<root>': FqName@92) = LazyJavaPackageFragment@93['<root>']
+    packageFragments('Int': FqName@94) = null
+    packageFragments('MutableList': FqName@95) = null
+    packageFragments('h': FqName@96) = null
+    packageFragments('h.Int': FqName@97) = null
+    packageFragments('h.MutableList': FqName@98) = null
+    packageFragments('java': FqName@99) = LazyJavaPackageFragment@100['java']
+    packageFragments('java.io': FqName@101) = LazyJavaPackageFragment@102['io']
+    packageFragments('java.lang': FqName@103) = LazyJavaPackageFragment@104['lang']
+    packageFragments('java.lang.Int': FqName@105) = null
+    packageFragments('java.lang.MutableList': FqName@106) = null
+    packageFragments('java.util': FqName@107) = LazyJavaPackageFragment@108['util']
+    packageFragments('java.util.ArrayList': FqName@109) = null
+    packageFragments('kotlin': FqName@110) = null
+    packageFragments('kotlin.Int': FqName@111) = null
+    packageFragments('kotlin.MutableList': FqName@112) = null
+    packageFragments('kotlin.io': FqName@113) = null
+    packageFragments('kotlin.jvm': FqName@114) = null
     topLevelClasses(JavaClassImpl@32['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
     topLevelClasses(JavaClassImpl@35['AbstractList']) = LazyJavaClassDescriptor@2['AbstractList']
     topLevelClasses(JavaClassImpl@115['ArrayList']) = LazyJavaClassDescriptor@4['ArrayList']
@@ -201,46 +201,46 @@ LazyJavaPackageFragmentProvider@91 {
 }
 
 LazyJavaPackageFragment@100['java'] {
-    _functions('lang': Name@116) = EmptyList@117[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    _functions('util': Name@119) = EmptyList@117[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('lang': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('util': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@122 // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('lang': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('util': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    deserializedPackageScope = Empty@119 // through LazyPackageFragmentScopeForJavaPackage@117
+    functions('lang': Name@120) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@117
+    functions('util': Name@122) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@117
+    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@117
 }
 
 LazyJavaPackageFragment@104['lang'] {
-    _functions('ArrayList': Name@124) = EmptyList@117[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    _functions('add': Name@126) = EmptyList@117[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    _functions('equals': Name@127) = EmptyList@117[empty] // through LazyPackageFragmentScopeForJavaPackage@125
     classes('ArrayList': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@125
     classes('add': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@125
     classes('equals': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    deserializedPackageScope = Empty@122 // through LazyPackageFragmentScopeForJavaPackage@125
+    deserializedPackageScope = Empty@119 // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('ArrayList': Name@124) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('add': Name@126) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('equals': Name@127) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@125
     memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@125
 }
 
 LazyJavaPackageFragment@108['util'] {
-    _functions('ArrayList': Name@129) = EmptyList@117[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('ArrayList': Name@131) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@130
-    deserializedPackageScope = Empty@122 // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('ArrayList': Name@129) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@130
+    deserializedPackageScope = Empty@119 // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('ArrayList': Name@131) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@130
     memberIndex = computeMemberIndex$1@132 // through LazyPackageFragmentScopeForJavaPackage@130
 }
 
 LazyJavaTypeParameterDescriptor@24['E'] {
     defaultType = JetTypeImpl@133['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
     upperBounds = LinkedHashSet@134[1] { NullableType@135 }
 }
 
 LazyJavaTypeParameterDescriptor@19['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaTypeParameterResolver@136 {
-    resolve(JavaTypeParameterImpl@137['E']) = LazyJavaTypeParameterDescriptor@24['E']
+    resolve(JavaTypeParameterImpl@137['E']) = LazyJavaTypeParameterDescriptor@19['E']
 }
 
 LazyJavaTypeParameterResolver@138 {
-    resolve(JavaTypeParameterImpl@139['E']) = LazyJavaTypeParameterDescriptor@19['E']
+    resolve(JavaTypeParameterImpl@139['E']) = LazyJavaTypeParameterDescriptor@24['E']
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.lazy.log

@@ -13,39 +13,39 @@ DescriptorResolver@2 {
 }
 
 LazyJavaPackageFragmentProvider@9 {
-    _packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
-    _packageFragments('Int': FqName@12) = null
-    _packageFragments('b': FqName@13) = null
-    _packageFragments('b.A': FqName@14) = null
-    _packageFragments('b.Int': FqName@15) = null
-    _packageFragments('b.P': FqName@16) = null
-    _packageFragments('b.f': FqName@17) = null
-    _packageFragments('b.g': FqName@18) = null
-    _packageFragments('b.o': FqName@19) = null
-    _packageFragments('b.p': FqName@20) = null
-    _packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
-    _packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
-    _packageFragments('java.lang.Int': FqName@25) = null
-    _packageFragments('kotlin': FqName@26) = null
-    _packageFragments('kotlin.Int': FqName@27) = null
-    _packageFragments('kotlin.io': FqName@28) = null
-    _packageFragments('kotlin.jvm': FqName@29) = null
+    packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
+    packageFragments('Int': FqName@12) = null
+    packageFragments('b': FqName@13) = null
+    packageFragments('b.A': FqName@14) = null
+    packageFragments('b.Int': FqName@15) = null
+    packageFragments('b.P': FqName@16) = null
+    packageFragments('b.f': FqName@17) = null
+    packageFragments('b.g': FqName@18) = null
+    packageFragments('b.o': FqName@19) = null
+    packageFragments('b.p': FqName@20) = null
+    packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
+    packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
+    packageFragments('java.lang.Int': FqName@25) = null
+    packageFragments('kotlin': FqName@26) = null
+    packageFragments('kotlin.Int': FqName@27) = null
+    packageFragments('kotlin.io': FqName@28) = null
+    packageFragments('kotlin.jvm': FqName@29) = null
 }
 
 LazyJavaPackageFragment@22['java'] {
-    _functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@24['lang'] {
-    _functions('P': Name@36) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    _functions('doSmth': Name@38) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     classes('P': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('a': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('doSmth': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('a': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('doSmth': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@37
     classes('p': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('P': Name@36) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('doSmth': Name@39) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@37
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2972.lazy.log

@@ -1,178 +1,178 @@
 LazyAnnotationDescriptor@0 {
-    _resolutionResults = OverloadResolutionResultsImpl@1
-    _type = JetTypeImpl@2['inline']
-    _valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['inline']
+    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
 }
 
 LazyJavaClassDescriptor@4['AutoCloseable'] {
-    _functions('block': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _functions('clone': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _functions('close': Name@9) = ArrayList@10[1] { JavaMethodDescriptor@11['close'] } // through LazyJavaClassMemberScope@7
-    _functions('equals': Name@12) = ArrayList@13[1] { DeserializedSimpleFunctionDescriptor@14['equals'] } // through LazyJavaClassMemberScope@7
-    _functions('finalize': Name@15) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _functions('getClass': Name@16) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _functions('hashCode': Name@17) = ArrayList@18[1] { DeserializedSimpleFunctionDescriptor@19['hashCode'] } // through LazyJavaClassMemberScope@7
-    _functions('invoke': Name@20) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _functions('not': Name@21) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _functions('notify': Name@22) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _functions('notifyAll': Name@23) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _functions('toString': Name@24) = ArrayList@25[1] { DeserializedSimpleFunctionDescriptor@26['toString'] } // through LazyJavaClassMemberScope@7
-    _functions('wait': Name@27) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _properties('block': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _properties('close': Name@28) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _properties('closed': Name@29) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _properties('e': Name@30) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _properties('not': Name@21) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _typeConstructor = LazyJavaClassTypeConstructor@31['AutoCloseable']
-    defaultType = JetTypeImpl@32['AutoCloseable']
-    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@34['<this>']
+    defaultType = JetTypeImpl@5['AutoCloseable']
+    functions('block': Name@6) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    functions('clone': Name@9) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    functions('close': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['close'] } // through LazyJavaClassMemberScope@8
+    functions('equals': Name@13) = ArrayList@14[1] { DeserializedSimpleFunctionDescriptor@15['equals'] } // through LazyJavaClassMemberScope@8
+    functions('finalize': Name@16) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    functions('getClass': Name@17) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    functions('hashCode': Name@18) = ArrayList@19[1] { DeserializedSimpleFunctionDescriptor@20['hashCode'] } // through LazyJavaClassMemberScope@8
+    functions('invoke': Name@21) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    functions('not': Name@22) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    functions('notify': Name@23) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    functions('notifyAll': Name@24) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    functions('toString': Name@25) = ArrayList@26[1] { DeserializedSimpleFunctionDescriptor@27['toString'] } // through LazyJavaClassMemberScope@8
+    functions('wait': Name@28) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    memberIndex = computeMemberIndex$1@29 // through LazyJavaClassMemberScope@8
+    properties('block': Name@6) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    properties('close': Name@30) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    properties('closed': Name@31) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    properties('e': Name@32) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    properties('not': Name@22) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@34['AutoCloseable']
 }
 
 LazyJavaClassDescriptor@35['Closeable'] {
-    _allDescriptors = ArrayList@36[4] { DeserializedSimpleFunctionDescriptor@37['hashCode'], JavaMethodDescriptor@38['close'], DeserializedSimpleFunctionDescriptor@39['toString'], ... } // through LazyJavaClassMemberScope@40
-    _annotations = LazyJavaAnnotations@41
-    _functionTypeForSamInterface = JetTypeImpl@42['Function0<1>']
-    _functions('block': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@40
-    _functions('clone': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@40
-    _functions('close': Name@43) = ArrayList@44[1] { JavaMethodDescriptor@38['close'] } // through LazyJavaClassMemberScope@40
-    _functions('equals': Name@12) = ArrayList@45[1] { DeserializedSimpleFunctionDescriptor@46['equals'] } // through LazyJavaClassMemberScope@40
-    _functions('finalize': Name@15) = EmptyList@6[empty] // through LazyJavaClassMemberScope@40
-    _functions('getClass': Name@16) = EmptyList@6[empty] // through LazyJavaClassMemberScope@40
-    _functions('hashCode': Name@17) = ArrayList@47[1] { DeserializedSimpleFunctionDescriptor@37['hashCode'] } // through LazyJavaClassMemberScope@40
-    _functions('invoke': Name@20) = EmptyList@6[empty] // through LazyJavaClassMemberScope@40
-    _functions('not': Name@21) = EmptyList@6[empty] // through LazyJavaClassMemberScope@40
-    _functions('notify': Name@22) = EmptyList@6[empty] // through LazyJavaClassMemberScope@40
-    _functions('notifyAll': Name@23) = EmptyList@6[empty] // through LazyJavaClassMemberScope@40
-    _functions('toString': Name@24) = ArrayList@48[1] { DeserializedSimpleFunctionDescriptor@39['toString'] } // through LazyJavaClassMemberScope@40
-    _functions('wait': Name@27) = EmptyList@6[empty] // through LazyJavaClassMemberScope@40
-    _properties('block': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@40
-    _properties('close': Name@28) = EmptyList@6[empty] // through LazyJavaClassMemberScope@40
-    _properties('closed': Name@29) = EmptyList@6[empty] // through LazyJavaClassMemberScope@40
-    _properties('e': Name@30) = EmptyList@6[empty] // through LazyJavaClassMemberScope@40
-    _properties('not': Name@21) = EmptyList@6[empty] // through LazyJavaClassMemberScope@40
-    _typeConstructor = LazyJavaClassTypeConstructor@49['Closeable']
-    defaultType = JetTypeImpl@50['Closeable']
-    enumEntryIndex = LinkedHashMap@51 // through LazyJavaClassMemberScope@40
-    memberIndex = computeMemberIndex$1@52 // through LazyJavaClassMemberScope@40
-    nestedClassIndex = LinkedHashMap@53 // through LazyJavaClassMemberScope@40
-    nestedClasses('block': Name@5) = null // through LazyJavaClassMemberScope@40
-    nestedClasses('close': Name@28) = null // through LazyJavaClassMemberScope@40
-    nestedClasses('closed': Name@29) = null // through LazyJavaClassMemberScope@40
-    nestedClasses('e': Name@30) = null // through LazyJavaClassMemberScope@40
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@54['<this>']
+    allDescriptors = ArrayList@36[4] { DeserializedSimpleFunctionDescriptor@37['hashCode'], JavaMethodDescriptor@38['close'], DeserializedSimpleFunctionDescriptor@39['toString'], ... } // through LazyJavaClassMemberScope@40
+    annotations = LazyJavaAnnotations@41
+    defaultType = JetTypeImpl@42['Closeable']
+    enumEntryIndex = LinkedHashMap@43 // through LazyJavaClassMemberScope@40
+    functionTypeForSamInterface = JetTypeImpl@44['Function0<1>']
+    functions('block': Name@6) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
+    functions('clone': Name@9) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
+    functions('close': Name@45) = ArrayList@46[1] { JavaMethodDescriptor@38['close'] } // through LazyJavaClassMemberScope@40
+    functions('equals': Name@13) = ArrayList@47[1] { DeserializedSimpleFunctionDescriptor@48['equals'] } // through LazyJavaClassMemberScope@40
+    functions('finalize': Name@16) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
+    functions('getClass': Name@17) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
+    functions('hashCode': Name@18) = ArrayList@49[1] { DeserializedSimpleFunctionDescriptor@37['hashCode'] } // through LazyJavaClassMemberScope@40
+    functions('invoke': Name@21) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
+    functions('not': Name@22) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
+    functions('notify': Name@23) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
+    functions('notifyAll': Name@24) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
+    functions('toString': Name@25) = ArrayList@50[1] { DeserializedSimpleFunctionDescriptor@39['toString'] } // through LazyJavaClassMemberScope@40
+    functions('wait': Name@28) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
+    memberIndex = computeMemberIndex$1@51 // through LazyJavaClassMemberScope@40
+    nestedClassIndex = LinkedHashMap@52 // through LazyJavaClassMemberScope@40
+    nestedClasses('block': Name@6) = null // through LazyJavaClassMemberScope@40
+    nestedClasses('close': Name@30) = null // through LazyJavaClassMemberScope@40
+    nestedClasses('closed': Name@31) = null // through LazyJavaClassMemberScope@40
+    nestedClasses('e': Name@32) = null // through LazyJavaClassMemberScope@40
+    properties('block': Name@6) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
+    properties('close': Name@30) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
+    properties('closed': Name@31) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
+    properties('e': Name@32) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
+    properties('not': Name@22) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@53['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@54['Closeable']
 }
 
 LazyJavaClassDescriptor@55['Exception'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@56['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@56['Exception']
 }
 
-LazyJavaClassTypeConstructor@31['AutoCloseable'] {
-    _parameters = ArrayList@57[empty]
-    _supertypes = ArrayList@58[1] { JetTypeImpl@59['Any'] }
+LazyJavaClassTypeConstructor@34['AutoCloseable'] {
+    parameters = ArrayList@57[empty]
+    supertypes = ArrayList@58[1] { JetTypeImpl@59['Any'] }
 }
 
-LazyJavaClassTypeConstructor@49['Closeable'] {
-    _parameters = ArrayList@60[empty]
-    _supertypes = ArrayList@61[1] { LazyJavaClassifierType@62['AutoCloseable'] }
+LazyJavaClassTypeConstructor@54['Closeable'] {
+    parameters = ArrayList@60[empty]
+    supertypes = ArrayList@61[1] { LazyJavaClassifierType@62['AutoCloseable'] }
 }
 
 LazyJavaClassTypeConstructor@56['Exception'] {
-    _parameters = ArrayList@63[empty]
-    _supertypes = ArrayList@64[1] { LazyJavaClassifierType@65['Throwable'] }
+    parameters = ArrayList@63[empty]
+    supertypes = ArrayList@64[1] { LazyJavaClassifierType@65['Throwable'] }
 }
 
 LazyJavaClassifierType@62['AutoCloseable'] {
-    _arguments = ArrayList@66[empty]
-    _memberScope = LazyJavaClassMemberScope@7
-    _typeConstructor = LazyJavaClassTypeConstructor@31['AutoCloseable']
+    arguments = ArrayList@66[empty]
     classifier = JavaClassImpl@67['AutoCloseable']
+    memberScope = LazyJavaClassMemberScope@8
+    typeConstructor = LazyJavaClassTypeConstructor@34['AutoCloseable']
 }
 
 LazyJavaClassifierType@68['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@69
-    classifier = JavaClassImpl@70['Object']
+    classifier = JavaClassImpl@69['Object']
+    typeConstructor = DeserializedClassTypeConstructor@70
 }
 
 LazyJavaClassifierType@65['Throwable'] {
-    _arguments = ArrayList@71[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@72
-    classifier = JavaClassImpl@73['Throwable']
+    arguments = ArrayList@71[empty]
+    classifier = JavaClassImpl@72['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@73
 }
 
 LazyJavaPackageFragmentProvider@74 {
-    _packageFragments('<root>': FqName@75) = LazyJavaPackageFragment@76['<root>']
-    _packageFragments('Closeable': FqName@77) = null
-    _packageFragments('Exception': FqName@78) = null
-    _packageFragments('R': FqName@79) = null
-    _packageFragments('T': FqName@80) = null
-    _packageFragments('inline': FqName@81) = null
-    _packageFragments('java': FqName@82) = LazyJavaPackageFragment@83['java']
-    _packageFragments('java.io': FqName@84) = LazyJavaPackageFragment@85['io']
-    _packageFragments('java.io.Closeable': FqName@86) = null
-    _packageFragments('java.lang': FqName@87) = LazyJavaPackageFragment@88['lang']
-    _packageFragments('java.lang.Closeable': FqName@89) = null
-    _packageFragments('java.lang.Exception': FqName@90) = null
-    _packageFragments('java.lang.R': FqName@91) = null
-    _packageFragments('java.lang.T': FqName@92) = null
-    _packageFragments('java.lang.inline': FqName@93) = null
-    _packageFragments('kotlin': FqName@94) = null
-    _packageFragments('kotlin.Closeable': FqName@95) = null
-    _packageFragments('kotlin.Exception': FqName@96) = null
-    _packageFragments('kotlin.R': FqName@97) = null
-    _packageFragments('kotlin.T': FqName@98) = null
-    _packageFragments('kotlin.inline': FqName@99) = null
-    _packageFragments('kotlin.io': FqName@100) = null
-    _packageFragments('kotlin.jvm': FqName@101) = null
+    packageFragments('<root>': FqName@75) = LazyJavaPackageFragment@76['<root>']
+    packageFragments('Closeable': FqName@77) = null
+    packageFragments('Exception': FqName@78) = null
+    packageFragments('R': FqName@79) = null
+    packageFragments('T': FqName@80) = null
+    packageFragments('inline': FqName@81) = null
+    packageFragments('java': FqName@82) = LazyJavaPackageFragment@83['java']
+    packageFragments('java.io': FqName@84) = LazyJavaPackageFragment@85['io']
+    packageFragments('java.io.Closeable': FqName@86) = null
+    packageFragments('java.lang': FqName@87) = LazyJavaPackageFragment@88['lang']
+    packageFragments('java.lang.Closeable': FqName@89) = null
+    packageFragments('java.lang.Exception': FqName@90) = null
+    packageFragments('java.lang.R': FqName@91) = null
+    packageFragments('java.lang.T': FqName@92) = null
+    packageFragments('java.lang.inline': FqName@93) = null
+    packageFragments('kotlin': FqName@94) = null
+    packageFragments('kotlin.Closeable': FqName@95) = null
+    packageFragments('kotlin.Exception': FqName@96) = null
+    packageFragments('kotlin.R': FqName@97) = null
+    packageFragments('kotlin.T': FqName@98) = null
+    packageFragments('kotlin.inline': FqName@99) = null
+    packageFragments('kotlin.io': FqName@100) = null
+    packageFragments('kotlin.jvm': FqName@101) = null
     topLevelClasses(JavaClassImpl@67['AutoCloseable']) = LazyJavaClassDescriptor@4['AutoCloseable']
     topLevelClasses(JavaClassImpl@102['Closeable']) = LazyJavaClassDescriptor@35['Closeable']
     topLevelClasses(JavaClassImpl@103['Exception']) = LazyJavaClassDescriptor@55['Exception']
 }
 
 LazyJavaPackageFragment@76['<root>'] {
-    _functions('block': Name@5) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    _functions('close': Name@28) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    _functions('invoke': Name@20) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    _functions('java': Name@105) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    _functions('not': Name@21) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('Closeable': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('Exception': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('block': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('close': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('inline': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('java': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('not': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = Empty@110 // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('Closeable': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('Exception': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('block': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('close': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('inline': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('java': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('not': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('block': Name@6) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('close': Name@30) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('invoke': Name@21) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('java': Name@110) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('not': Name@22) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@105
 }
 
 LazyJavaPackageFragment@85['io'] {
-    _functions('Closeable': Name@112) = ArrayList@113[1] { SamConstructorDescriptor@114['Closeable'] } // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('Closeable': Name@116) = LazyJavaClassDescriptor@35['Closeable'] // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@110 // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('Closeable': Name@112) = LazyJavaClassDescriptor@35['Closeable'] // through LazyPackageFragmentScopeForJavaPackage@113
+    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('Closeable': Name@114) = ArrayList@115[1] { SamConstructorDescriptor@116['Closeable'] } // through LazyPackageFragmentScopeForJavaPackage@113
+    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@113
 }
 
 LazyJavaPackageFragment@83['java'] {
-    _functions('io': Name@118) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    _functions('lang': Name@120) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('io': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('lang': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    deserializedPackageScope = Empty@110 // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('io': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('lang': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('io': Name@121) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('lang': Name@122) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@119
     memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@119
 }
 
 LazyJavaPackageFragment@88['lang'] {
-    _functions('block': Name@5) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    _functions('close': Name@28) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    _functions('invoke': Name@20) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    _functions('not': Name@21) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('Exception': Name@107) = LazyJavaClassDescriptor@55['Exception'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('block': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('close': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('not': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    deserializedPackageScope = Empty@110 // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('Exception': Name@106) = LazyJavaClassDescriptor@55['Exception'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('block': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('close': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('not': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('block': Name@6) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('close': Name@30) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('invoke': Name@21) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('not': Name@22) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@124
     memberIndex = computeMemberIndex$1@125 // through LazyPackageFragmentScopeForJavaPackage@124
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3444.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3501.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt4405.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt510.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt607.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt609.lazy.log

@@ -1,30 +1,30 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('A': FqName@3) = null
-    _packageFragments('Int': 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.A': FqName@10) = null
-    _packageFragments('java.lang.Int': FqName@11) = null
-    _packageFragments('java.lang.String': FqName@12) = null
-    _packageFragments('kotlin': FqName@13) = null
-    _packageFragments('kotlin.A': FqName@14) = null
-    _packageFragments('kotlin.Int': FqName@15) = null
-    _packageFragments('kotlin.String': FqName@16) = null
-    _packageFragments('kotlin.io': FqName@17) = null
-    _packageFragments('kotlin.jvm': FqName@18) = null
-    _packageFragments('kt609': FqName@19) = null
-    _packageFragments('kt609.A': FqName@20) = null
-    _packageFragments('kt609.B': FqName@21) = null
-    _packageFragments('kt609.C': FqName@22) = null
-    _packageFragments('kt609.Int': FqName@23) = null
-    _packageFragments('kt609.String': FqName@24) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('A': FqName@3) = null
+    packageFragments('Int': 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.A': FqName@10) = null
+    packageFragments('java.lang.Int': FqName@11) = null
+    packageFragments('java.lang.String': FqName@12) = null
+    packageFragments('kotlin': FqName@13) = null
+    packageFragments('kotlin.A': FqName@14) = null
+    packageFragments('kotlin.Int': FqName@15) = null
+    packageFragments('kotlin.String': FqName@16) = null
+    packageFragments('kotlin.io': FqName@17) = null
+    packageFragments('kotlin.jvm': FqName@18) = null
+    packageFragments('kt609': FqName@19) = null
+    packageFragments('kt609.A': FqName@20) = null
+    packageFragments('kt609.B': FqName@21) = null
+    packageFragments('kt609.C': FqName@22) = null
+    packageFragments('kt609.Int': FqName@23) = null
+    packageFragments('kt609.String': FqName@24) = null
 }
 
 LazyJavaPackageFragment@7['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/controlFlowAnalysis/kt610.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt776.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt843.lazy.log

@@ -1,24 +1,24 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('Array': 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.Array': FqName@9) = null
-    _packageFragments('java.lang.String': FqName@10) = null
-    _packageFragments('kotlin': FqName@11) = null
-    _packageFragments('kotlin.Array': FqName@12) = null
-    _packageFragments('kotlin.String': FqName@13) = null
-    _packageFragments('kotlin.io': FqName@14) = null
-    _packageFragments('kotlin.jvm': FqName@15) = null
-    _packageFragments('kt843': FqName@16) = null
-    _packageFragments('kt843.Array': FqName@17) = null
-    _packageFragments('kt843.String': FqName@18) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('Array': 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.Array': FqName@9) = null
+    packageFragments('java.lang.String': FqName@10) = null
+    packageFragments('kotlin': FqName@11) = null
+    packageFragments('kotlin.Array': FqName@12) = null
+    packageFragments('kotlin.String': FqName@13) = null
+    packageFragments('kotlin.io': FqName@14) = null
+    packageFragments('kotlin.jvm': FqName@15) = null
+    packageFragments('kt843': FqName@16) = null
+    packageFragments('kt843.Array': FqName@17) = null
+    packageFragments('kt843.String': FqName@18) = null
 }
 
 LazyJavaPackageFragment@6['java'] {
-    _functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt897.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/localClasses.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesOrderInPackage.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/referenceToPropertyInitializer.lazy.log

@@ -15,51 +15,51 @@ DescriptorResolver@6 {
 }
 
 LazyJavaPackageFragmentProvider@7 {
-    _packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    _packageFragments('A': FqName@10) = null
-    _packageFragments('Int': FqName@11) = null
-    _packageFragments('Unit': FqName@12) = null
-    _packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    _packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    _packageFragments('java.lang.A': FqName@17) = null
-    _packageFragments('java.lang.Int': FqName@18) = null
-    _packageFragments('java.lang.Unit': FqName@19) = null
-    _packageFragments('kotlin': FqName@20) = null
-    _packageFragments('kotlin.A': FqName@21) = null
-    _packageFragments('kotlin.Int': FqName@22) = null
-    _packageFragments('kotlin.Unit': FqName@23) = null
-    _packageFragments('kotlin.io': FqName@24) = null
-    _packageFragments('kotlin.jvm': FqName@25) = null
-    _packageFragments('o': FqName@26) = null
-    _packageFragments('o.A': FqName@27) = null
-    _packageFragments('o.Int': FqName@28) = null
-    _packageFragments('o.TestFunctionLiteral': FqName@29) = null
-    _packageFragments('o.TestObjectLiteral': FqName@30) = null
-    _packageFragments('o.TestOther': FqName@31) = null
-    _packageFragments('o.Unit': FqName@32) = null
+    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
+    packageFragments('A': FqName@10) = null
+    packageFragments('Int': FqName@11) = null
+    packageFragments('Unit': FqName@12) = null
+    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
+    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
+    packageFragments('java.lang.A': FqName@17) = null
+    packageFragments('java.lang.Int': FqName@18) = null
+    packageFragments('java.lang.Unit': FqName@19) = null
+    packageFragments('kotlin': FqName@20) = null
+    packageFragments('kotlin.A': FqName@21) = null
+    packageFragments('kotlin.Int': FqName@22) = null
+    packageFragments('kotlin.Unit': FqName@23) = null
+    packageFragments('kotlin.io': FqName@24) = null
+    packageFragments('kotlin.jvm': FqName@25) = null
+    packageFragments('o': FqName@26) = null
+    packageFragments('o.A': FqName@27) = null
+    packageFragments('o.Int': FqName@28) = null
+    packageFragments('o.TestFunctionLiteral': FqName@29) = null
+    packageFragments('o.TestObjectLiteral': FqName@30) = null
+    packageFragments('o.TestOther': FqName@31) = null
+    packageFragments('o.Unit': FqName@32) = null
 }
 
 LazyJavaPackageFragment@14['java'] {
-    _functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@16['lang'] {
-    _functions('foo': Name@39) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    _functions('invoke': Name@41) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    _functions('minus': Name@42) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    _functions('plus': Name@43) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    _functions('sum': Name@44) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
     classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
     classes('invoke': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
     classes('minus': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('obj': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('obj1': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('plus': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('sum': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('obj': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('obj1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('plus': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('sum': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@40
     classes('x': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('foo': Name@39) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('invoke': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('minus': Name@42) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('plus': Name@45) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('sum': Name@46) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
     memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@40
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/repeatUnitializedErrorOnlyForLocalVars.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/scopeOfAnonymousInitializer.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedInLocalDeclarations.lazy.log

@@ -3,64 +3,64 @@ DescriptorResolver@0 {
 }
 
 LazyJavaClassDescriptor@2['Exception'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@3['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@3['Exception']
 }
 
 LazyJavaClassTypeConstructor@3['Exception'] {
-    _parameters = ArrayList@4[empty]
-    _supertypes = ArrayList@5[1] { LazyJavaClassifierType@6['Throwable'] }
+    parameters = ArrayList@4[empty]
+    supertypes = ArrayList@5[1] { LazyJavaClassifierType@6['Throwable'] }
 }
 
 LazyJavaClassifierType@6['Throwable'] {
-    _arguments = ArrayList@7[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@8
-    classifier = JavaClassImpl@9['Throwable']
+    arguments = ArrayList@7[empty]
+    classifier = JavaClassImpl@8['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@9
 }
 
 LazyJavaPackageFragmentProvider@10 {
-    _packageFragments('<root>': FqName@11) = LazyJavaPackageFragment@12['<root>']
-    _packageFragments('Any': FqName@13) = null
-    _packageFragments('Exception': FqName@14) = null
-    _packageFragments('Int': FqName@15) = null
-    _packageFragments('String': FqName@16) = null
-    _packageFragments('java': FqName@17) = LazyJavaPackageFragment@18['java']
-    _packageFragments('java.lang': FqName@19) = LazyJavaPackageFragment@20['lang']
-    _packageFragments('java.lang.Any': FqName@21) = null
-    _packageFragments('java.lang.Exception': FqName@22) = null
-    _packageFragments('java.lang.Int': FqName@23) = null
-    _packageFragments('java.lang.String': FqName@24) = null
-    _packageFragments('kotlin': FqName@25) = null
-    _packageFragments('kotlin.Any': FqName@26) = null
-    _packageFragments('kotlin.Exception': FqName@27) = null
-    _packageFragments('kotlin.Int': FqName@28) = null
-    _packageFragments('kotlin.String': FqName@29) = null
-    _packageFragments('kotlin.io': FqName@30) = null
-    _packageFragments('kotlin.jvm': FqName@31) = null
+    packageFragments('<root>': FqName@11) = LazyJavaPackageFragment@12['<root>']
+    packageFragments('Any': FqName@13) = null
+    packageFragments('Exception': FqName@14) = null
+    packageFragments('Int': FqName@15) = null
+    packageFragments('String': FqName@16) = null
+    packageFragments('java': FqName@17) = LazyJavaPackageFragment@18['java']
+    packageFragments('java.lang': FqName@19) = LazyJavaPackageFragment@20['lang']
+    packageFragments('java.lang.Any': FqName@21) = null
+    packageFragments('java.lang.Exception': FqName@22) = null
+    packageFragments('java.lang.Int': FqName@23) = null
+    packageFragments('java.lang.String': FqName@24) = null
+    packageFragments('kotlin': FqName@25) = null
+    packageFragments('kotlin.Any': FqName@26) = null
+    packageFragments('kotlin.Exception': FqName@27) = null
+    packageFragments('kotlin.Int': FqName@28) = null
+    packageFragments('kotlin.String': FqName@29) = null
+    packageFragments('kotlin.io': FqName@30) = null
+    packageFragments('kotlin.jvm': FqName@31) = null
     topLevelClasses(JavaClassImpl@32['Exception']) = LazyJavaClassDescriptor@2['Exception']
 }
 
 LazyJavaPackageFragment@12['<root>'] {
-    _functions('doSmth': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('Any': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('Exception': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('Int': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('String': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('doSmth': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('Any': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('Exception': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('String': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('doSmth': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('doSmth': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@18['java'] {
-    _functions('lang': Name@42) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('lang': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('lang': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
     memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
 }
 
 LazyJavaPackageFragment@20['lang'] {
-    _functions('doSmth': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('Exception': Name@37) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('doSmth': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('Exception': Name@35) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('doSmth': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('doSmth': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
     memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/unmappedArgs.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.lazy.log

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