Update lazy logs after field rename

compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.lazy.log

@@ -1,340 +1,340 @@
 LazyJavaClassDescriptor@0['AbstractCollection'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
 }
 
 LazyJavaClassDescriptor@2['AbstractList'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
 }
 
 LazyJavaClassDescriptor@4['ArrayList'] {
-    _constructors = ArrayList@5[3] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'] } // through LazyJavaClassMemberScope@9
-    _functionTypeForSamInterface = null
-    _typeConstructor = LazyJavaClassTypeConstructor@10['ArrayList']
-    defaultType = JetTypeImpl@11['ArrayList<1>']
+    constructors = ArrayList@5[3] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'] } // through LazyJavaClassMemberScope@9
+    defaultType = JetTypeImpl@10['ArrayList<1>']
+    functionTypeForSamInterface = null
+    typeConstructor = LazyJavaClassTypeConstructor@11['ArrayList']
 }
 
 LazyJavaClassDescriptor@12['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']
 }
 
 LazyJavaClassDescriptor@20['RandomAccess'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@21['RandomAccess']
+    typeConstructor = LazyJavaClassTypeConstructor@21['RandomAccess']
 }
 
 LazyJavaClassDescriptor@22['Serializable'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@23['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@23['Serializable']
 }
 
 LazyJavaClassTypeConstructor@1['AbstractCollection'] {
-    _parameters = ArrayList@24[1] { LazyJavaTypeParameterDescriptor@25['E'] }
-    _supertypes = ArrayList@26[1] { LazyJavaClassifierType@27['Collection<E>'] }
+    parameters = ArrayList@24[1] { LazyJavaTypeParameterDescriptor@25['E'] }
+    supertypes = ArrayList@26[1] { LazyJavaClassifierType@27['Collection<E>'] }
 }
 
 LazyJavaClassTypeConstructor@3['AbstractList'] {
-    _parameters = ArrayList@28[1] { LazyJavaTypeParameterDescriptor@29['E'] }
-    _supertypes = ArrayList@30[2] { LazyJavaClassifierType@31['AbstractCollection<E>'], LazyJavaClassifierType@32['List<E>'] }
+    parameters = ArrayList@28[1] { LazyJavaTypeParameterDescriptor@29['E'] }
+    supertypes = ArrayList@30[2] { LazyJavaClassifierType@31['AbstractCollection<E>'], LazyJavaClassifierType@32['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@10['ArrayList'] {
-    _parameters = ArrayList@33[1] { LazyJavaTypeParameterDescriptor@34['E'] }
-    _supertypes = ArrayList@35[5] { LazyJavaClassifierType@36['AbstractList<E>'], LazyJavaClassifierType@37['List<E>'], LazyJavaClassifierType@38['RandomAccess'], ... }
+LazyJavaClassTypeConstructor@11['ArrayList'] {
+    parameters = ArrayList@33[1] { LazyJavaTypeParameterDescriptor@34['E'] }
+    supertypes = ArrayList@35[5] { LazyJavaClassifierType@36['AbstractList<E>'], LazyJavaClassifierType@37['List<E>'], LazyJavaClassifierType@38['RandomAccess'], ... }
 }
 
-LazyJavaClassTypeConstructor@18['Exception'] {
-    _parameters = ArrayList@39[empty]
-    _supertypes = ArrayList@40[1] { LazyJavaClassifierType@41['Throwable'] }
+LazyJavaClassTypeConstructor@19['Exception'] {
+    parameters = ArrayList@39[empty]
+    supertypes = ArrayList@40[1] { LazyJavaClassifierType@41['Throwable'] }
 }
 
 LazyJavaClassTypeConstructor@21['RandomAccess'] {
-    _supertypes = ArrayList@42[1] { JetTypeImpl@43['Any'] }
+    supertypes = ArrayList@42[1] { JetTypeImpl@43['Any'] }
 }
 
 LazyJavaClassTypeConstructor@23['Serializable'] {
-    _supertypes = ArrayList@44[1] { JetTypeImpl@43['Any'] }
+    supertypes = ArrayList@44[1] { JetTypeImpl@43['Any'] }
 }
 
 LazyJavaClassifierType@31['AbstractCollection<E>'] {
-    _arguments = ArrayList@45[1] { TypeProjectionImpl@46 }
-    _typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
+    arguments = ArrayList@45[1] { TypeProjectionImpl@46 }
     classifier = JavaClassImpl@47['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
 }
 
 LazyJavaClassifierType@36['AbstractList<E>'] {
-    _arguments = ArrayList@48[1] { TypeProjectionImpl@49 }
-    _typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
+    arguments = ArrayList@48[1] { TypeProjectionImpl@49 }
     classifier = JavaClassImpl@50['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
 }
 
 LazyJavaClassifierType@51['Cloneable'] {
-    _typeConstructor = DeserializedClassTypeConstructor@52
-    classifier = JavaClassImpl@53['Cloneable']
+    classifier = JavaClassImpl@52['Cloneable']
+    typeConstructor = DeserializedClassTypeConstructor@53
 }
 
 LazyJavaClassifierType@54['Collection<? extends E>'] {
-    _arguments = ArrayList@55[1] { TypeProjectionImpl@56 }
-    _memberScope = SubstitutingScope@57
-    _nullable = 'false': Boolean@58
-    _typeConstructor = DeserializedClassTypeConstructor@59
-    classifier = JavaClassImpl@60['Collection']
+    arguments = ArrayList@55[1] { TypeProjectionImpl@56 }
+    classifier = JavaClassImpl@57['Collection']
+    memberScope = SubstitutingScope@58
+    nullable = 'false': Boolean@59
+    typeConstructor = DeserializedClassTypeConstructor@60
 }
 
 LazyJavaClassifierType@61['Collection<? extends E>'] {
-    _arguments = ArrayList@62[1] { TypeProjectionImpl@63 }
-    _memberScope = SubstitutingScope@64
-    _nullable = 'true': Boolean@65
-    _typeConstructor = DeserializedClassTypeConstructor@66
-    classifier = JavaClassImpl@60['Collection']
+    arguments = ArrayList@62[1] { TypeProjectionImpl@63 }
+    classifier = JavaClassImpl@57['Collection']
+    memberScope = SubstitutingScope@64
+    nullable = 'true': Boolean@65
+    typeConstructor = DeserializedClassTypeConstructor@66
 }
 
 LazyJavaClassifierType@27['Collection<E>'] {
-    _arguments = ArrayList@67[1] { TypeProjectionImpl@68 }
-    _memberScope = SubstitutingScope@69
-    _nullable = 'false': Boolean@58
-    _typeConstructor = DeserializedClassTypeConstructor@59
-    classifier = JavaClassImpl@70['Collection']
+    arguments = ArrayList@67[1] { TypeProjectionImpl@68 }
+    classifier = JavaClassImpl@69['Collection']
+    memberScope = SubstitutingScope@70
+    nullable = 'false': Boolean@59
+    typeConstructor = DeserializedClassTypeConstructor@60
 }
 
 LazyJavaClassifierType@71['E'] {
-    _arguments = ArrayList@72[empty]
-    _nullable = 'false': Boolean@58
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
-    classifier = JavaTypeParameterImpl@74['E']
+    arguments = ArrayList@72[empty]
+    classifier = JavaTypeParameterImpl@73['E']
+    nullable = 'false': Boolean@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@75['E'] {
-    _arguments = ArrayList@76[empty]
-    _nullable = 'false': Boolean@58
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
-    classifier = JavaTypeParameterImpl@78['E']
+    arguments = ArrayList@76[empty]
+    classifier = JavaTypeParameterImpl@77['E']
+    nullable = 'false': Boolean@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
 LazyJavaClassifierType@79['E'] {
-    _arguments = ArrayList@80[empty]
-    _nullable = 'false': Boolean@58
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+    arguments = ArrayList@80[empty]
     classifier = JavaTypeParameterImpl@81['E']
+    nullable = 'false': Boolean@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
 LazyJavaClassifierType@82['E'] {
-    _arguments = ArrayList@83[empty]
-    _nullable = 'false': Boolean@58
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+    arguments = ArrayList@83[empty]
     classifier = JavaTypeParameterImpl@84['E']
+    nullable = 'false': Boolean@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@85
 }
 
-LazyJavaClassifierType@85['E'] {
-    _arguments = ArrayList@86[empty]
-    _nullable = 'false': Boolean@58
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+LazyJavaClassifierType@86['E'] {
+    arguments = ArrayList@87[empty]
     classifier = JavaTypeParameterImpl@88['E']
+    nullable = 'false': Boolean@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
 LazyJavaClassifierType@89['E'] {
-    _arguments = ArrayList@90[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
-    classifier = JavaTypeParameterImpl@78['E']
+    arguments = ArrayList@90[empty]
+    classifier = JavaTypeParameterImpl@84['E']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@85
 }
 
 LazyJavaClassifierType@91['E'] {
-    _arguments = ArrayList@92[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
-    classifier = JavaTypeParameterImpl@74['E']
+    arguments = ArrayList@92[empty]
+    classifier = JavaTypeParameterImpl@88['E']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
 LazyJavaClassifierType@93['E'] {
-    _arguments = ArrayList@94[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+    arguments = ArrayList@94[empty]
     classifier = JavaTypeParameterImpl@81['E']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
 LazyJavaClassifierType@95['E'] {
-    _arguments = ArrayList@96[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
-    classifier = JavaTypeParameterImpl@84['E']
+    arguments = ArrayList@96[empty]
+    classifier = JavaTypeParameterImpl@77['E']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
 LazyJavaClassifierType@97['E'] {
-    _arguments = ArrayList@98[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
-    classifier = JavaTypeParameterImpl@88['E']
+    arguments = ArrayList@98[empty]
+    classifier = JavaTypeParameterImpl@73['E']
+    nullable = 'true': Boolean@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@37['List<E>'] {
-    _typeConstructor = DeserializedClassTypeConstructor@99
-    classifier = JavaClassImpl@100['List']
+    classifier = JavaClassImpl@99['List']
+    typeConstructor = DeserializedClassTypeConstructor@100
 }
 
 LazyJavaClassifierType@32['List<E>'] {
-    _typeConstructor = DeserializedClassTypeConstructor@99
     classifier = JavaClassImpl@101['List']
+    typeConstructor = DeserializedClassTypeConstructor@100
 }
 
 LazyJavaClassifierType@102['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@103
-    classifier = JavaClassImpl@104['Object']
+    classifier = JavaClassImpl@103['Object']
+    typeConstructor = DeserializedClassTypeConstructor@104
 }
 
 LazyJavaClassifierType@105['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@103
     classifier = JavaClassImpl@106['Object']
+    typeConstructor = DeserializedClassTypeConstructor@104
 }
 
 LazyJavaClassifierType@107['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@103
     classifier = JavaClassImpl@108['Object']
+    typeConstructor = DeserializedClassTypeConstructor@104
 }
 
 LazyJavaClassifierType@38['RandomAccess'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@21['RandomAccess']
     classifier = JavaClassImpl@109['RandomAccess']
+    typeConstructor = LazyJavaClassTypeConstructor@21['RandomAccess']
 }
 
 LazyJavaClassifierType@110['Serializable'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@23['Serializable']
     classifier = JavaClassImpl@111['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@23['Serializable']
 }
 
 LazyJavaClassifierType@112['String'] {
-    _arguments = ArrayList@113[empty]
-    _nullable = 'false': Boolean@58
-    _typeConstructor = DeserializedClassTypeConstructor@114
-    classifier = JavaClassImpl@115['String']
+    arguments = ArrayList@113[empty]
+    classifier = JavaClassImpl@114['String']
+    nullable = 'false': Boolean@59
+    typeConstructor = DeserializedClassTypeConstructor@115
 }
 
 LazyJavaClassifierType@116['String'] {
-    _arguments = ArrayList@117[empty]
-    _nullable = 'false': Boolean@58
-    _typeConstructor = DeserializedClassTypeConstructor@114
+    arguments = ArrayList@117[empty]
     classifier = JavaClassImpl@118['String']
+    nullable = 'false': Boolean@59
+    typeConstructor = DeserializedClassTypeConstructor@115
 }
 
 LazyJavaClassifierType@119['String'] {
-    _arguments = ArrayList@120[empty]
-    _nullable = 'false': Boolean@58
-    _typeConstructor = DeserializedClassTypeConstructor@114
+    arguments = ArrayList@120[empty]
     classifier = JavaClassImpl@121['String']
+    nullable = 'false': Boolean@59
+    typeConstructor = DeserializedClassTypeConstructor@115
 }
 
 LazyJavaClassifierType@122['String'] {
-    _arguments = ArrayList@123[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = DeserializedClassTypeConstructor@114
-    classifier = JavaClassImpl@115['String']
+    arguments = ArrayList@123[empty]
+    classifier = JavaClassImpl@121['String']
+    nullable = 'true': Boolean@65
+    typeConstructor = DeserializedClassTypeConstructor@115
 }
 
 LazyJavaClassifierType@124['String'] {
-    _arguments = ArrayList@125[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = DeserializedClassTypeConstructor@114
+    arguments = ArrayList@125[empty]
     classifier = JavaClassImpl@118['String']
+    nullable = 'true': Boolean@65
+    typeConstructor = DeserializedClassTypeConstructor@115
 }
 
 LazyJavaClassifierType@126['String'] {
-    _arguments = ArrayList@127[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = DeserializedClassTypeConstructor@114
-    classifier = JavaClassImpl@121['String']
+    arguments = ArrayList@127[empty]
+    classifier = JavaClassImpl@114['String']
+    nullable = 'true': Boolean@65
+    typeConstructor = DeserializedClassTypeConstructor@115
 }
 
 LazyJavaClassifierType@128['Throwable'] {
-    _arguments = ArrayList@129[empty]
-    _nullable = 'false': Boolean@58
-    _typeConstructor = DeserializedClassTypeConstructor@130
-    classifier = JavaClassImpl@131['Throwable']
+    arguments = ArrayList@129[empty]
+    classifier = JavaClassImpl@130['Throwable']
+    nullable = 'false': Boolean@59
+    typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@132['Throwable'] {
-    _arguments = ArrayList@133[empty]
-    _nullable = 'false': Boolean@58
-    _typeConstructor = DeserializedClassTypeConstructor@130
+    arguments = ArrayList@133[empty]
     classifier = JavaClassImpl@134['Throwable']
+    nullable = 'false': Boolean@59
+    typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@135['Throwable'] {
-    _arguments = ArrayList@136[empty]
-    _nullable = 'false': Boolean@58
-    _typeConstructor = DeserializedClassTypeConstructor@130
+    arguments = ArrayList@136[empty]
     classifier = JavaClassImpl@137['Throwable']
+    nullable = 'false': Boolean@59
+    typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@138['Throwable'] {
-    _arguments = ArrayList@139[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = DeserializedClassTypeConstructor@130
-    classifier = JavaClassImpl@137['Throwable']
+    arguments = ArrayList@139[empty]
+    classifier = JavaClassImpl@130['Throwable']
+    nullable = 'true': Boolean@65
+    typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@140['Throwable'] {
-    _arguments = ArrayList@141[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = DeserializedClassTypeConstructor@130
+    arguments = ArrayList@141[empty]
     classifier = JavaClassImpl@134['Throwable']
+    nullable = 'true': Boolean@65
+    typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@142['Throwable'] {
-    _arguments = ArrayList@143[empty]
-    _nullable = 'true': Boolean@65
-    _typeConstructor = DeserializedClassTypeConstructor@130
-    classifier = JavaClassImpl@131['Throwable']
+    arguments = ArrayList@143[empty]
+    classifier = JavaClassImpl@137['Throwable']
+    nullable = 'true': Boolean@65
+    typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@41['Throwable'] {
-    _arguments = ArrayList@144[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@130
+    arguments = ArrayList@144[empty]
     classifier = JavaClassImpl@145['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaPackageFragmentProvider@146 {
-    _packageFragments('<root>': FqName@147) = LazyJavaPackageFragment@148['<root>']
-    _packageFragments('Array': FqName@149) = null
-    _packageFragments('ArrayList': FqName@150) = null
-    _packageFragments('C': FqName@151) = null
-    _packageFragments('Int': FqName@152) = null
-    _packageFragments('IntArray': FqName@153) = null
-    _packageFragments('MutableCollection': FqName@154) = null
-    _packageFragments('R': FqName@155) = null
-    _packageFragments('T': FqName@156) = null
-    _packageFragments('c': FqName@157) = null
-    _packageFragments('c.Array': FqName@158) = null
-    _packageFragments('c.ArrayList': FqName@159) = null
-    _packageFragments('c.C': FqName@160) = null
-    _packageFragments('c.Int': FqName@161) = null
-    _packageFragments('c.IntArray': FqName@162) = null
-    _packageFragments('c.MutableCollection': FqName@163) = null
-    _packageFragments('c.R': FqName@164) = null
-    _packageFragments('c.T': FqName@165) = null
-    _packageFragments('java': FqName@166) = LazyJavaPackageFragment@167['java']
-    _packageFragments('java.io': FqName@168) = LazyJavaPackageFragment@169['io']
-    _packageFragments('java.lang': FqName@170) = LazyJavaPackageFragment@171['lang']
-    _packageFragments('java.lang.Array': FqName@172) = null
-    _packageFragments('java.lang.ArrayList': FqName@173) = null
-    _packageFragments('java.lang.C': FqName@174) = null
-    _packageFragments('java.lang.Int': FqName@175) = null
-    _packageFragments('java.lang.IntArray': FqName@176) = null
-    _packageFragments('java.lang.MutableCollection': FqName@177) = null
-    _packageFragments('java.lang.R': FqName@178) = null
-    _packageFragments('java.lang.T': FqName@179) = null
-    _packageFragments('java.util': FqName@180) = LazyJavaPackageFragment@181['util']
-    _packageFragments('java.util.ArrayList': FqName@182) = null
-    _packageFragments('kotlin': FqName@183) = null
-    _packageFragments('kotlin.Array': FqName@184) = null
-    _packageFragments('kotlin.ArrayList': FqName@185) = null
-    _packageFragments('kotlin.C': FqName@186) = null
-    _packageFragments('kotlin.Int': FqName@187) = null
-    _packageFragments('kotlin.IntArray': FqName@188) = null
-    _packageFragments('kotlin.MutableCollection': FqName@189) = null
-    _packageFragments('kotlin.R': FqName@190) = null
-    _packageFragments('kotlin.T': FqName@191) = null
-    _packageFragments('kotlin.io': FqName@192) = null
-    _packageFragments('kotlin.jvm': FqName@193) = null
+    packageFragments('<root>': FqName@147) = LazyJavaPackageFragment@148['<root>']
+    packageFragments('Array': FqName@149) = null
+    packageFragments('ArrayList': FqName@150) = null
+    packageFragments('C': FqName@151) = null
+    packageFragments('Int': FqName@152) = null
+    packageFragments('IntArray': FqName@153) = null
+    packageFragments('MutableCollection': FqName@154) = null
+    packageFragments('R': FqName@155) = null
+    packageFragments('T': FqName@156) = null
+    packageFragments('c': FqName@157) = null
+    packageFragments('c.Array': FqName@158) = null
+    packageFragments('c.ArrayList': FqName@159) = null
+    packageFragments('c.C': FqName@160) = null
+    packageFragments('c.Int': FqName@161) = null
+    packageFragments('c.IntArray': FqName@162) = null
+    packageFragments('c.MutableCollection': FqName@163) = null
+    packageFragments('c.R': FqName@164) = null
+    packageFragments('c.T': FqName@165) = null
+    packageFragments('java': FqName@166) = LazyJavaPackageFragment@167['java']
+    packageFragments('java.io': FqName@168) = LazyJavaPackageFragment@169['io']
+    packageFragments('java.lang': FqName@170) = LazyJavaPackageFragment@171['lang']
+    packageFragments('java.lang.Array': FqName@172) = null
+    packageFragments('java.lang.ArrayList': FqName@173) = null
+    packageFragments('java.lang.C': FqName@174) = null
+    packageFragments('java.lang.Int': FqName@175) = null
+    packageFragments('java.lang.IntArray': FqName@176) = null
+    packageFragments('java.lang.MutableCollection': FqName@177) = null
+    packageFragments('java.lang.R': FqName@178) = null
+    packageFragments('java.lang.T': FqName@179) = null
+    packageFragments('java.util': FqName@180) = LazyJavaPackageFragment@181['util']
+    packageFragments('java.util.ArrayList': FqName@182) = null
+    packageFragments('kotlin': FqName@183) = null
+    packageFragments('kotlin.Array': FqName@184) = null
+    packageFragments('kotlin.ArrayList': FqName@185) = null
+    packageFragments('kotlin.C': FqName@186) = null
+    packageFragments('kotlin.Int': FqName@187) = null
+    packageFragments('kotlin.IntArray': FqName@188) = null
+    packageFragments('kotlin.MutableCollection': FqName@189) = null
+    packageFragments('kotlin.R': FqName@190) = null
+    packageFragments('kotlin.T': FqName@191) = null
+    packageFragments('kotlin.io': FqName@192) = null
+    packageFragments('kotlin.jvm': FqName@193) = null
     topLevelClasses(JavaClassImpl@47['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
     topLevelClasses(JavaClassImpl@50['AbstractList']) = LazyJavaClassDescriptor@2['AbstractList']
     topLevelClasses(JavaClassImpl@194['ArrayList']) = LazyJavaClassDescriptor@4['ArrayList']
@@ -344,57 +344,57 @@ LazyJavaPackageFragmentProvider@146 {
 }
 
 LazyJavaPackageFragment@167['java'] {
-    _functions('lang': Name@196) = EmptyList@197[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    _functions('util': Name@199) = EmptyList@197[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    classes('lang': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@198
-    classes('util': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@198
-    deserializedPackageScope = Empty@202 // through LazyPackageFragmentScopeForJavaPackage@198
-    memberIndex = computeMemberIndex$1@203 // through LazyPackageFragmentScopeForJavaPackage@198
+    classes('lang': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('util': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    deserializedPackageScope = Empty@199 // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('lang': Name@200) = EmptyList@201[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('util': Name@202) = EmptyList@201[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    memberIndex = computeMemberIndex$1@203 // through LazyPackageFragmentScopeForJavaPackage@197
 }
 
 LazyJavaPackageFragment@171['lang'] {
-    _functions('ArrayList': Name@204) = EmptyList@197[empty] // through LazyPackageFragmentScopeForJavaPackage@205
-    _functions('Exception': Name@206) = EmptyList@197[empty] // through LazyPackageFragmentScopeForJavaPackage@205
-    _functions('IntArray': Name@207) = EmptyList@197[empty] // through LazyPackageFragmentScopeForJavaPackage@205
-    _functions('mapTo': Name@208) = EmptyList@197[empty] // through LazyPackageFragmentScopeForJavaPackage@205
     classes('ArrayList': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@205
     classes('Exception': Name@206) = LazyJavaClassDescriptor@12['Exception'] // through LazyPackageFragmentScopeForJavaPackage@205
     classes('IntArray': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@205
     classes('mapTo': Name@208) = null // through LazyPackageFragmentScopeForJavaPackage@205
     classes('size': Name@209) = null // through LazyPackageFragmentScopeForJavaPackage@205
-    deserializedPackageScope = Empty@202 // through LazyPackageFragmentScopeForJavaPackage@205
+    deserializedPackageScope = Empty@199 // through LazyPackageFragmentScopeForJavaPackage@205
+    functions('ArrayList': Name@204) = EmptyList@201[empty] // through LazyPackageFragmentScopeForJavaPackage@205
+    functions('Exception': Name@206) = EmptyList@201[empty] // through LazyPackageFragmentScopeForJavaPackage@205
+    functions('IntArray': Name@207) = EmptyList@201[empty] // through LazyPackageFragmentScopeForJavaPackage@205
+    functions('mapTo': Name@208) = EmptyList@201[empty] // through LazyPackageFragmentScopeForJavaPackage@205
     memberIndex = computeMemberIndex$1@210 // through LazyPackageFragmentScopeForJavaPackage@205
 }
 
 LazyJavaPackageFragment@181['util'] {
-    _functions('ArrayList': Name@211) = EmptyList@197[empty] // through LazyPackageFragmentScopeForJavaPackage@212
-    classes('ArrayList': Name@213) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@212
-    deserializedPackageScope = Empty@202 // through LazyPackageFragmentScopeForJavaPackage@212
+    classes('ArrayList': Name@211) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@212
+    deserializedPackageScope = Empty@199 // through LazyPackageFragmentScopeForJavaPackage@212
+    functions('ArrayList': Name@213) = EmptyList@201[empty] // through LazyPackageFragmentScopeForJavaPackage@212
     memberIndex = computeMemberIndex$1@214 // through LazyPackageFragmentScopeForJavaPackage@212
 }
 
 LazyJavaTypeParameterDescriptor@34['E'] {
     defaultType = JetTypeImpl@215['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
     upperBounds = LinkedHashSet@216[1] { NullableType@217 }
 }
 
 LazyJavaTypeParameterDescriptor@25['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@85
 }
 
 LazyJavaTypeParameterDescriptor@29['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaTypeParameterResolver@218 {
-    resolve(JavaTypeParameterImpl@88['E']) = LazyJavaTypeParameterDescriptor@29['E']
+    resolve(JavaTypeParameterImpl@219['E']) = LazyJavaTypeParameterDescriptor@25['E']
 }
 
-LazyJavaTypeParameterResolver@219 {
-    resolve(JavaTypeParameterImpl@220['E']) = LazyJavaTypeParameterDescriptor@34['E']
+LazyJavaTypeParameterResolver@220 {
+    resolve(JavaTypeParameterImpl@221['E']) = LazyJavaTypeParameterDescriptor@34['E']
 }
 
-LazyJavaTypeParameterResolver@221 {
-    resolve(JavaTypeParameterImpl@222['E']) = LazyJavaTypeParameterDescriptor@25['E']
+LazyJavaTypeParameterResolver@222 {
+    resolve(JavaTypeParameterImpl@73['E']) = LazyJavaTypeParameterDescriptor@29['E']
 }

compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.lazy.log

@@ -6,172 +6,172 @@ 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@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
-    classifier = JavaClassImpl@37['Throwable']
+    arguments = ArrayList@42[empty]
+    classifier = JavaClassImpl@33['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
-    _arguments = ArrayList@44[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@40['Throwable']
+    arguments = ArrayList@44[empty]
+    classifier = JavaClassImpl@37['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
-    _arguments = ArrayList@46[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@33
-    classifier = JavaClassImpl@34['Throwable']
+    arguments = ArrayList@46[empty]
+    classifier = JavaClassImpl@40['Throwable']
+    nullable = 'true': Boolean@26
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@12['Throwable'] {
-    _arguments = ArrayList@47[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@33
+    arguments = ArrayList@47[empty]
     classifier = JavaClassImpl@48['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaPackageFragmentProvider@49 {
-    _packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    _packageFragments('A': FqName@52) = null
-    _packageFragments('Int': FqName@53) = null
-    _packageFragments('T': FqName@54) = null
-    _packageFragments('Unit': FqName@55) = null
-    _packageFragments('_': 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.Int': FqName@62) = null
-    _packageFragments('java.lang.T': FqName@63) = null
-    _packageFragments('java.lang.Unit': FqName@64) = null
-    _packageFragments('java.lang._': FqName@65) = null
-    _packageFragments('kotlin': FqName@66) = null
-    _packageFragments('kotlin.A': FqName@67) = null
-    _packageFragments('kotlin.Int': FqName@68) = null
-    _packageFragments('kotlin.T': FqName@69) = null
-    _packageFragments('kotlin.Unit': FqName@70) = null
-    _packageFragments('kotlin._': FqName@71) = null
-    _packageFragments('kotlin.io': FqName@72) = null
-    _packageFragments('kotlin.jvm': FqName@73) = null
-    _packageFragments('tests': FqName@74) = null
-    _packageFragments('tests._checkType': FqName@75) = null
-    _packageFragments('tests._checkType.A': FqName@76) = null
-    _packageFragments('tests._checkType.Int': FqName@77) = null
-    _packageFragments('tests._checkType.T': FqName@78) = null
-    _packageFragments('tests._checkType.Unit': FqName@79) = null
-    _packageFragments('tests._checkType._': FqName@80) = null
+    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
+    packageFragments('A': FqName@52) = null
+    packageFragments('Int': FqName@53) = null
+    packageFragments('T': FqName@54) = null
+    packageFragments('Unit': FqName@55) = null
+    packageFragments('_': 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.Int': FqName@62) = null
+    packageFragments('java.lang.T': FqName@63) = null
+    packageFragments('java.lang.Unit': FqName@64) = null
+    packageFragments('java.lang._': FqName@65) = null
+    packageFragments('kotlin': FqName@66) = null
+    packageFragments('kotlin.A': FqName@67) = null
+    packageFragments('kotlin.Int': FqName@68) = null
+    packageFragments('kotlin.T': FqName@69) = null
+    packageFragments('kotlin.Unit': FqName@70) = null
+    packageFragments('kotlin._': FqName@71) = null
+    packageFragments('kotlin.io': FqName@72) = null
+    packageFragments('kotlin.jvm': FqName@73) = null
+    packageFragments('tests': FqName@74) = null
+    packageFragments('tests._checkType': FqName@75) = null
+    packageFragments('tests._checkType.A': FqName@76) = null
+    packageFragments('tests._checkType.Int': FqName@77) = null
+    packageFragments('tests._checkType.T': FqName@78) = null
+    packageFragments('tests._checkType.Unit': FqName@79) = null
+    packageFragments('tests._checkType._': FqName@80) = null
     topLevelClasses(JavaClassImpl@81['Exception']) = LazyJavaClassDescriptor@2['Exception']
 }
 
 LazyJavaPackageFragment@51['<root>'] {
-    _functions('Exception': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    _functions('checkType': Name@85) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    _functions('doA': Name@86) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    _functions('foo': Name@87) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    _functions('tests': Name@88) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('Exception': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('Int': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('_': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('checkType': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('doA': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('tests': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@92 // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('Exception': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('Int': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('_': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('checkType': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('doA': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('tests': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('Exception': Name@82) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('checkType': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('doA': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('tests': Name@92) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
 LazyJavaPackageFragment@58['java'] {
-    _functions('lang': Name@94) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('lang': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@92 // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('lang': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('lang': Name@96) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@95
     memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@95
 }
 
 LazyJavaPackageFragment@60['lang'] {
-    _functions('Exception': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    _functions('checkType': Name@85) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    _functions('doA': Name@86) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    _functions('foo': Name@87) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@98
     classes('Exception': Name@82) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('checkType': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('doA': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = Empty@92 // through LazyPackageFragmentScopeForJavaPackage@98
+    classes('checkType': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@98
+    classes('doA': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@98
+    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@98
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@98
+    functions('Exception': Name@82) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@98
+    functions('checkType': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@98
+    functions('doA': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@98
+    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@98
     memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@98
 }

compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.lazy.log

@@ -4,193 +4,193 @@ 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
+    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
+    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@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@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@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('A': FqName@52) = null
-    _packageFragments('Any': FqName@53) = null
-    _packageFragments('In': FqName@54) = null
-    _packageFragments('Int': FqName@55) = null
-    _packageFragments('Out': FqName@56) = null
-    _packageFragments('T': FqName@57) = null
-    _packageFragments('Unit': FqName@58) = null
-    _packageFragments('_': FqName@59) = null
-    _packageFragments('java': FqName@60) = LazyJavaPackageFragment@61['java']
-    _packageFragments('java.lang': FqName@62) = LazyJavaPackageFragment@63['lang']
-    _packageFragments('java.lang.A': FqName@64) = null
-    _packageFragments('java.lang.Any': FqName@65) = null
-    _packageFragments('java.lang.In': FqName@66) = null
-    _packageFragments('java.lang.Int': FqName@67) = null
-    _packageFragments('java.lang.Out': FqName@68) = null
-    _packageFragments('java.lang.T': FqName@69) = null
-    _packageFragments('java.lang.Unit': FqName@70) = null
-    _packageFragments('java.lang._': FqName@71) = null
-    _packageFragments('kotlin': FqName@72) = null
-    _packageFragments('kotlin.A': FqName@73) = null
-    _packageFragments('kotlin.Any': FqName@74) = null
-    _packageFragments('kotlin.In': FqName@75) = null
-    _packageFragments('kotlin.Int': FqName@76) = null
-    _packageFragments('kotlin.Out': FqName@77) = null
-    _packageFragments('kotlin.T': FqName@78) = null
-    _packageFragments('kotlin.Unit': FqName@79) = null
-    _packageFragments('kotlin._': FqName@80) = null
-    _packageFragments('kotlin.io': FqName@81) = null
-    _packageFragments('kotlin.jvm': FqName@82) = null
-    _packageFragments('tests': FqName@83) = null
-    _packageFragments('tests._checkType': FqName@84) = null
-    _packageFragments('tests._checkType.A': FqName@85) = null
-    _packageFragments('tests._checkType.Any': FqName@86) = null
-    _packageFragments('tests._checkType.In': FqName@87) = null
-    _packageFragments('tests._checkType.Int': FqName@88) = null
-    _packageFragments('tests._checkType.Out': FqName@89) = null
-    _packageFragments('tests._checkType.T': FqName@90) = null
-    _packageFragments('tests._checkType.Unit': FqName@91) = null
-    _packageFragments('tests._checkType._': FqName@92) = null
+    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
+    packageFragments('A': FqName@52) = null
+    packageFragments('Any': FqName@53) = null
+    packageFragments('In': FqName@54) = null
+    packageFragments('Int': FqName@55) = null
+    packageFragments('Out': FqName@56) = null
+    packageFragments('T': FqName@57) = null
+    packageFragments('Unit': FqName@58) = null
+    packageFragments('_': FqName@59) = null
+    packageFragments('java': FqName@60) = LazyJavaPackageFragment@61['java']
+    packageFragments('java.lang': FqName@62) = LazyJavaPackageFragment@63['lang']
+    packageFragments('java.lang.A': FqName@64) = null
+    packageFragments('java.lang.Any': FqName@65) = null
+    packageFragments('java.lang.In': FqName@66) = null
+    packageFragments('java.lang.Int': FqName@67) = null
+    packageFragments('java.lang.Out': FqName@68) = null
+    packageFragments('java.lang.T': FqName@69) = null
+    packageFragments('java.lang.Unit': FqName@70) = null
+    packageFragments('java.lang._': FqName@71) = null
+    packageFragments('kotlin': FqName@72) = null
+    packageFragments('kotlin.A': FqName@73) = null
+    packageFragments('kotlin.Any': FqName@74) = null
+    packageFragments('kotlin.In': FqName@75) = null
+    packageFragments('kotlin.Int': FqName@76) = null
+    packageFragments('kotlin.Out': FqName@77) = null
+    packageFragments('kotlin.T': FqName@78) = null
+    packageFragments('kotlin.Unit': FqName@79) = null
+    packageFragments('kotlin._': FqName@80) = null
+    packageFragments('kotlin.io': FqName@81) = null
+    packageFragments('kotlin.jvm': FqName@82) = null
+    packageFragments('tests': FqName@83) = null
+    packageFragments('tests._checkType': FqName@84) = null
+    packageFragments('tests._checkType.A': FqName@85) = null
+    packageFragments('tests._checkType.Any': FqName@86) = null
+    packageFragments('tests._checkType.In': FqName@87) = null
+    packageFragments('tests._checkType.Int': FqName@88) = null
+    packageFragments('tests._checkType.Out': FqName@89) = null
+    packageFragments('tests._checkType.T': FqName@90) = null
+    packageFragments('tests._checkType.Unit': FqName@91) = null
+    packageFragments('tests._checkType._': FqName@92) = null
     topLevelClasses(JavaClassImpl@93['Exception']) = LazyJavaClassDescriptor@2['Exception']
 }
 
 LazyJavaPackageFragment@51['<root>'] {
-    _functions('Exception': Name@94) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    _functions('checkType': Name@97) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    _functions('doA': Name@98) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    _functions('doIn': Name@99) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    _functions('doOut': Name@100) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    _functions('doT': Name@101) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    _functions('tests': Name@102) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('Any': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('Exception': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('Int': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('_': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('checkType': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('doA': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('doIn': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('doOut': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('doT': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('tests': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@107 // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('Any': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('Exception': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('Int': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('_': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('checkType': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('doA': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('doIn': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('doOut': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('doT': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('tests': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('Exception': Name@96) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('checkType': Name@99) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('doA': Name@100) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('doIn': Name@101) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('doOut': Name@102) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('doT': Name@103) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('tests': Name@107) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@95
 }
 
 LazyJavaPackageFragment@61['java'] {
-    _functions('lang': Name@109) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('lang': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@107 // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('lang': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('lang': Name@111) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@110
     memberIndex = computeMemberIndex$1@112 // through LazyPackageFragmentScopeForJavaPackage@110
 }
 
 LazyJavaPackageFragment@63['lang'] {
-    _functions('Exception': Name@94) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    _functions('checkType': Name@97) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    _functions('doA': Name@98) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    _functions('doIn': Name@99) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    _functions('doOut': Name@100) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    _functions('doT': Name@101) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Exception': Name@94) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('checkType': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('doA': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('doIn': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('doOut': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('doT': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = Empty@107 // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('Exception': Name@96) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('checkType': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('doA': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('doIn': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('doOut': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('doT': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('Exception': Name@96) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('checkType': Name@99) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('doA': Name@100) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('doIn': Name@101) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('doOut': Name@102) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('doT': Name@103) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@113
     memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@113
 }

compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.lazy.log

@@ -6,176 +6,176 @@ 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@15['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@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@40['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('A': FqName@52) = null
-    _packageFragments('Int': FqName@53) = null
-    _packageFragments('Out': FqName@54) = null
-    _packageFragments('T': FqName@55) = null
-    _packageFragments('Unit': FqName@56) = null
-    _packageFragments('_': FqName@57) = null
-    _packageFragments('java': FqName@58) = LazyJavaPackageFragment@59['java']
-    _packageFragments('java.lang': FqName@60) = LazyJavaPackageFragment@61['lang']
-    _packageFragments('java.lang.A': FqName@62) = null
-    _packageFragments('java.lang.Int': FqName@63) = null
-    _packageFragments('java.lang.Out': FqName@64) = null
-    _packageFragments('java.lang.T': FqName@65) = null
-    _packageFragments('java.lang.Unit': FqName@66) = null
-    _packageFragments('java.lang._': FqName@67) = null
-    _packageFragments('kotlin': FqName@68) = null
-    _packageFragments('kotlin.A': FqName@69) = null
-    _packageFragments('kotlin.Int': FqName@70) = null
-    _packageFragments('kotlin.Out': FqName@71) = null
-    _packageFragments('kotlin.T': FqName@72) = null
-    _packageFragments('kotlin.Unit': FqName@73) = null
-    _packageFragments('kotlin._': FqName@74) = null
-    _packageFragments('kotlin.io': FqName@75) = null
-    _packageFragments('kotlin.jvm': FqName@76) = null
-    _packageFragments('tests': FqName@77) = null
-    _packageFragments('tests._checkType': FqName@78) = null
-    _packageFragments('tests._checkType.A': FqName@79) = null
-    _packageFragments('tests._checkType.Int': FqName@80) = null
-    _packageFragments('tests._checkType.Out': FqName@81) = null
-    _packageFragments('tests._checkType.T': FqName@82) = null
-    _packageFragments('tests._checkType.Unit': FqName@83) = null
-    _packageFragments('tests._checkType._': FqName@84) = null
+    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
+    packageFragments('A': FqName@52) = null
+    packageFragments('Int': FqName@53) = null
+    packageFragments('Out': FqName@54) = null
+    packageFragments('T': FqName@55) = null
+    packageFragments('Unit': FqName@56) = null
+    packageFragments('_': FqName@57) = null
+    packageFragments('java': FqName@58) = LazyJavaPackageFragment@59['java']
+    packageFragments('java.lang': FqName@60) = LazyJavaPackageFragment@61['lang']
+    packageFragments('java.lang.A': FqName@62) = null
+    packageFragments('java.lang.Int': FqName@63) = null
+    packageFragments('java.lang.Out': FqName@64) = null
+    packageFragments('java.lang.T': FqName@65) = null
+    packageFragments('java.lang.Unit': FqName@66) = null
+    packageFragments('java.lang._': FqName@67) = null
+    packageFragments('kotlin': FqName@68) = null
+    packageFragments('kotlin.A': FqName@69) = null
+    packageFragments('kotlin.Int': FqName@70) = null
+    packageFragments('kotlin.Out': FqName@71) = null
+    packageFragments('kotlin.T': FqName@72) = null
+    packageFragments('kotlin.Unit': FqName@73) = null
+    packageFragments('kotlin._': FqName@74) = null
+    packageFragments('kotlin.io': FqName@75) = null
+    packageFragments('kotlin.jvm': FqName@76) = null
+    packageFragments('tests': FqName@77) = null
+    packageFragments('tests._checkType': FqName@78) = null
+    packageFragments('tests._checkType.A': FqName@79) = null
+    packageFragments('tests._checkType.Int': FqName@80) = null
+    packageFragments('tests._checkType.Out': FqName@81) = null
+    packageFragments('tests._checkType.T': FqName@82) = null
+    packageFragments('tests._checkType.Unit': FqName@83) = null
+    packageFragments('tests._checkType._': FqName@84) = null
     topLevelClasses(JavaClassImpl@85['Exception']) = LazyJavaClassDescriptor@2['Exception']
 }
 
 LazyJavaPackageFragment@51['<root>'] {
-    _functions('Exception': Name@86) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    _functions('checkType': Name@89) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    _functions('doOut': Name@90) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    _functions('foo': Name@91) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    _functions('tests': Name@92) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('Exception': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('_': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('checkType': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('doOut': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('tests': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('Exception': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('Int': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('_': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('checkType': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('doOut': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('foo': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('tests': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('Exception': Name@86) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('checkType': Name@90) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('doOut': Name@91) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('foo': Name@92) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('tests': Name@96) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
 LazyJavaPackageFragment@59['java'] {
-    _functions('lang': Name@98) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('lang': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('lang': Name@100) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@99
     memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
 }
 
 LazyJavaPackageFragment@61['lang'] {
-    _functions('Exception': Name@86) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    _functions('checkType': Name@89) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    _functions('doOut': Name@90) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    _functions('foo': Name@91) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@102
     classes('Exception': Name@86) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@102
-    classes('checkType': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    classes('doOut': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@102
+    classes('checkType': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@102
+    classes('doOut': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@102
+    classes('foo': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@102
+    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@102
+    functions('Exception': Name@86) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@102
+    functions('checkType': Name@90) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@102
+    functions('doOut': Name@91) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@102
+    functions('foo': Name@92) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@102
     memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@102
 }

compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.lazy.log

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