Update lazy logs after field rename

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
 }