Update lazy logs after field rename

2014-11-11 17:45:30 +03:00
parent eb96b97bc8
commit 4f0d83a7fe
1653 changed files with 102316 additions and 102316 deletions
@@ -1,308 +1,308 @@
 LazyJavaClassDescriptor@0['AbstractCollection'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
 }

 LazyJavaClassDescriptor@2['AbstractSet'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@3['AbstractSet']
+    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractSet']
 }

 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']
 }

 LazyJavaClassDescriptor@12['HashSet'] {
-    _constructors = ArrayList@13[5] { JavaConstructorDescriptor@14['<init>'], JavaConstructorDescriptor@15['<init>'], JavaConstructorDescriptor@16['<init>'], ... } // through LazyJavaClassMemberScope@17
-    _functionTypeForSamInterface = null
-    _typeConstructor = LazyJavaClassTypeConstructor@18['HashSet']
-    defaultType = JetTypeImpl@19['HashSet<1>']
+    constructors = ArrayList@13[5] { JavaConstructorDescriptor@14['<init>'], JavaConstructorDescriptor@15['<init>'], JavaConstructorDescriptor@16['<init>'], ... } // through LazyJavaClassMemberScope@17
+    defaultType = JetTypeImpl@18['HashSet<1>']
+    functionTypeForSamInterface = null
+    typeConstructor = LazyJavaClassTypeConstructor@19['HashSet']
 }

 LazyJavaClassDescriptor@20['Serializable'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@21['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@21['Serializable']
 }

 LazyJavaClassTypeConstructor@1['AbstractCollection'] {
-    _parameters = ArrayList@22[1] { LazyJavaTypeParameterDescriptor@23['E'] }
-    _supertypes = ArrayList@24[1] { LazyJavaClassifierType@25['Collection<E>'] }
+    parameters = ArrayList@22[1] { LazyJavaTypeParameterDescriptor@23['E'] }
+    supertypes = ArrayList@24[1] { LazyJavaClassifierType@25['Collection<E>'] }
 }

 LazyJavaClassTypeConstructor@3['AbstractSet'] {
-    _parameters = ArrayList@26[1] { LazyJavaTypeParameterDescriptor@27['E'] }
-    _supertypes = ArrayList@28[2] { LazyJavaClassifierType@29['AbstractCollection<E>'], LazyJavaClassifierType@30['Set<E>'] }
+    parameters = ArrayList@26[1] { LazyJavaTypeParameterDescriptor@27['E'] }
+    supertypes = ArrayList@28[2] { LazyJavaClassifierType@29['AbstractCollection<E>'], LazyJavaClassifierType@30['Set<E>'] }
 }

-LazyJavaClassTypeConstructor@10['Exception'] {
-    _parameters = ArrayList@31[empty]
-    _supertypes = ArrayList@32[1] { LazyJavaClassifierType@33['Throwable'] }
+LazyJavaClassTypeConstructor@11['Exception'] {
+    parameters = ArrayList@31[empty]
+    supertypes = ArrayList@32[1] { LazyJavaClassifierType@33['Throwable'] }
 }

-LazyJavaClassTypeConstructor@18['HashSet'] {
-    _parameters = ArrayList@34[1] { LazyJavaTypeParameterDescriptor@35['E'] }
-    _supertypes = ArrayList@36[4] { LazyJavaClassifierType@37['AbstractSet<E>'], LazyJavaClassifierType@38['Set<E>'], LazyJavaClassifierType@39['Cloneable'], ... }
+LazyJavaClassTypeConstructor@19['HashSet'] {
+    parameters = ArrayList@34[1] { LazyJavaTypeParameterDescriptor@35['E'] }
+    supertypes = ArrayList@36[4] { LazyJavaClassifierType@37['AbstractSet<E>'], LazyJavaClassifierType@38['Set<E>'], LazyJavaClassifierType@39['Cloneable'], ... }
 }

 LazyJavaClassTypeConstructor@21['Serializable'] {
-    _supertypes = ArrayList@40[1] { JetTypeImpl@41['Any'] }
+    supertypes = ArrayList@40[1] { JetTypeImpl@41['Any'] }
 }

 LazyJavaClassifierType@29['AbstractCollection<E>'] {
-    _arguments = ArrayList@42[1] { TypeProjectionImpl@43 }
-    _typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
+    arguments = ArrayList@42[1] { TypeProjectionImpl@43 }
    classifier = JavaClassImpl@44['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
 }

 LazyJavaClassifierType@37['AbstractSet<E>'] {
-    _arguments = ArrayList@45[1] { TypeProjectionImpl@46 }
-    _typeConstructor = LazyJavaClassTypeConstructor@3['AbstractSet']
+    arguments = ArrayList@45[1] { TypeProjectionImpl@46 }
    classifier = JavaClassImpl@47['AbstractSet']
+    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractSet']
 }

 LazyJavaClassifierType@39['Cloneable'] {
-    _typeConstructor = DeserializedClassTypeConstructor@48
-    classifier = JavaClassImpl@49['Cloneable']
+    classifier = JavaClassImpl@48['Cloneable']
+    typeConstructor = DeserializedClassTypeConstructor@49
 }

 LazyJavaClassifierType@50['Collection<? extends E>'] {
-    _arguments = ArrayList@51[1] { TypeProjectionImpl@52 }
-    _memberScope = SubstitutingScope@53
-    _nullable = 'false': Boolean@54
-    _typeConstructor = DeserializedClassTypeConstructor@55
-    classifier = JavaClassImpl@56['Collection']
+    arguments = ArrayList@51[1] { TypeProjectionImpl@52 }
+    classifier = JavaClassImpl@53['Collection']
+    memberScope = SubstitutingScope@54
+    nullable = 'false': Boolean@55
+    typeConstructor = DeserializedClassTypeConstructor@56
 }

 LazyJavaClassifierType@57['Collection<? extends E>'] {
-    _arguments = ArrayList@58[1] { TypeProjectionImpl@59 }
-    _memberScope = SubstitutingScope@60
-    _nullable = 'true': Boolean@61
-    _typeConstructor = DeserializedClassTypeConstructor@62
-    classifier = JavaClassImpl@56['Collection']
+    arguments = ArrayList@58[1] { TypeProjectionImpl@59 }
+    classifier = JavaClassImpl@53['Collection']
+    memberScope = SubstitutingScope@60
+    nullable = 'true': Boolean@61
+    typeConstructor = DeserializedClassTypeConstructor@62
 }

 LazyJavaClassifierType@25['Collection<E>'] {
-    _arguments = ArrayList@63[1] { TypeProjectionImpl@64 }
-    _typeConstructor = DeserializedClassTypeConstructor@55
+    arguments = ArrayList@63[1] { TypeProjectionImpl@64 }
    classifier = JavaClassImpl@65['Collection']
+    typeConstructor = DeserializedClassTypeConstructor@56
 }

 LazyJavaClassifierType@66['E'] {
-    _arguments = ArrayList@67[empty]
-    _nullable = 'false': Boolean@54
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@68
-    classifier = JavaTypeParameterImpl@69['E']
+    arguments = ArrayList@67[empty]
+    classifier = JavaTypeParameterImpl@68['E']
+    nullable = 'false': Boolean@55
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }

 LazyJavaClassifierType@70['E'] {
-    _arguments = ArrayList@71[empty]
-    _nullable = 'false': Boolean@54
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@68
+    arguments = ArrayList@71[empty]
    classifier = JavaTypeParameterImpl@72['E']
+    nullable = 'false': Boolean@55
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }

 LazyJavaClassifierType@73['E'] {
-    _arguments = ArrayList@74[empty]
-    _nullable = 'false': Boolean@54
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@75
-    classifier = JavaTypeParameterImpl@76['E']
+    arguments = ArrayList@74[empty]
+    classifier = JavaTypeParameterImpl@75['E']
+    nullable = 'false': Boolean@55
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }

-LazyJavaClassifierType@77['E'] {
-    _arguments = ArrayList@78[empty]
-    _nullable = 'false': Boolean@54
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
-    classifier = JavaTypeParameterImpl@80['E']
+LazyJavaClassifierType@76['E'] {
+    arguments = ArrayList@77[empty]
+    classifier = JavaTypeParameterImpl@78['E']
+    nullable = 'false': Boolean@55
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
 }

-LazyJavaClassifierType@81['E'] {
-    _arguments = ArrayList@82[empty]
-    _nullable = 'false': Boolean@54
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@68
-    classifier = JavaTypeParameterImpl@83['E']
+LazyJavaClassifierType@80['E'] {
+    arguments = ArrayList@81[empty]
+    classifier = JavaTypeParameterImpl@82['E']
+    nullable = 'false': Boolean@55
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }

 LazyJavaClassifierType@84['E'] {
-    _arguments = ArrayList@85[empty]
-    _nullable = 'true': Boolean@61
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@68
-    classifier = JavaTypeParameterImpl@69['E']
+    arguments = ArrayList@85[empty]
+    classifier = JavaTypeParameterImpl@72['E']
+    nullable = 'true': Boolean@61
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }

 LazyJavaClassifierType@86['E'] {
-    _arguments = ArrayList@87[empty]
-    _nullable = 'true': Boolean@61
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@68
-    classifier = JavaTypeParameterImpl@72['E']
+    arguments = ArrayList@87[empty]
+    classifier = JavaTypeParameterImpl@82['E']
+    nullable = 'true': Boolean@61
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }

 LazyJavaClassifierType@88['E'] {
-    _arguments = ArrayList@89[empty]
-    _nullable = 'true': Boolean@61
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@68
-    classifier = JavaTypeParameterImpl@83['E']
+    arguments = ArrayList@89[empty]
+    classifier = JavaTypeParameterImpl@75['E']
+    nullable = 'true': Boolean@61
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }

 LazyJavaClassifierType@90['E'] {
-    _arguments = ArrayList@91[empty]
-    _nullable = 'true': Boolean@61
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@75
-    classifier = JavaTypeParameterImpl@76['E']
+    arguments = ArrayList@91[empty]
+    classifier = JavaTypeParameterImpl@78['E']
+    nullable = 'true': Boolean@61
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
 }

 LazyJavaClassifierType@92['E'] {
-    _arguments = ArrayList@93[empty]
-    _nullable = 'true': Boolean@61
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
-    classifier = JavaTypeParameterImpl@80['E']
+    arguments = ArrayList@93[empty]
+    classifier = JavaTypeParameterImpl@68['E']
+    nullable = 'true': Boolean@61
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }

 LazyJavaClassifierType@94['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@95
-    classifier = JavaClassImpl@96['Object']
+    classifier = JavaClassImpl@95['Object']
+    typeConstructor = DeserializedClassTypeConstructor@96
 }

 LazyJavaClassifierType@97['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@95
    classifier = JavaClassImpl@98['Object']
+    typeConstructor = DeserializedClassTypeConstructor@96
 }

 LazyJavaClassifierType@99['Serializable'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@21['Serializable']
    classifier = JavaClassImpl@100['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@21['Serializable']
 }

 LazyJavaClassifierType@30['Set<E>'] {
-    _typeConstructor = DeserializedClassTypeConstructor@101
-    classifier = JavaClassImpl@102['Set']
+    classifier = JavaClassImpl@101['Set']
+    typeConstructor = DeserializedClassTypeConstructor@102
 }

 LazyJavaClassifierType@38['Set<E>'] {
-    _typeConstructor = DeserializedClassTypeConstructor@101
    classifier = JavaClassImpl@103['Set']
+    typeConstructor = DeserializedClassTypeConstructor@102
 }

 LazyJavaClassifierType@104['String'] {
-    _arguments = ArrayList@105[empty]
-    _nullable = 'false': Boolean@54
-    _typeConstructor = DeserializedClassTypeConstructor@106
-    classifier = JavaClassImpl@107['String']
+    arguments = ArrayList@105[empty]
+    classifier = JavaClassImpl@106['String']
+    nullable = 'false': Boolean@55
+    typeConstructor = DeserializedClassTypeConstructor@107
 }

 LazyJavaClassifierType@108['String'] {
-    _arguments = ArrayList@109[empty]
-    _nullable = 'false': Boolean@54
-    _typeConstructor = DeserializedClassTypeConstructor@106
+    arguments = ArrayList@109[empty]
    classifier = JavaClassImpl@110['String']
+    nullable = 'false': Boolean@55
+    typeConstructor = DeserializedClassTypeConstructor@107
 }

 LazyJavaClassifierType@111['String'] {
-    _arguments = ArrayList@112[empty]
-    _nullable = 'false': Boolean@54
-    _typeConstructor = DeserializedClassTypeConstructor@106
+    arguments = ArrayList@112[empty]
    classifier = JavaClassImpl@113['String']
+    nullable = 'false': Boolean@55
+    typeConstructor = DeserializedClassTypeConstructor@107
 }

 LazyJavaClassifierType@114['String'] {
-    _arguments = ArrayList@115[empty]
-    _nullable = 'true': Boolean@61
-    _typeConstructor = DeserializedClassTypeConstructor@106
-    classifier = JavaClassImpl@107['String']
+    arguments = ArrayList@115[empty]
+    classifier = JavaClassImpl@110['String']
+    nullable = 'true': Boolean@61
+    typeConstructor = DeserializedClassTypeConstructor@107
 }

 LazyJavaClassifierType@116['String'] {
-    _arguments = ArrayList@117[empty]
-    _nullable = 'true': Boolean@61
-    _typeConstructor = DeserializedClassTypeConstructor@106
-    classifier = JavaClassImpl@113['String']
+    arguments = ArrayList@117[empty]
+    classifier = JavaClassImpl@106['String']
+    nullable = 'true': Boolean@61
+    typeConstructor = DeserializedClassTypeConstructor@107
 }

 LazyJavaClassifierType@118['String'] {
-    _arguments = ArrayList@119[empty]
-    _nullable = 'true': Boolean@61
-    _typeConstructor = DeserializedClassTypeConstructor@106
-    classifier = JavaClassImpl@110['String']
+    arguments = ArrayList@119[empty]
+    classifier = JavaClassImpl@113['String']
+    nullable = 'true': Boolean@61
+    typeConstructor = DeserializedClassTypeConstructor@107
 }

 LazyJavaClassifierType@120['Throwable'] {
-    _arguments = ArrayList@121[empty]
-    _nullable = 'false': Boolean@54
-    _typeConstructor = DeserializedClassTypeConstructor@122
-    classifier = JavaClassImpl@123['Throwable']
+    arguments = ArrayList@121[empty]
+    classifier = JavaClassImpl@122['Throwable']
+    nullable = 'false': Boolean@55
+    typeConstructor = DeserializedClassTypeConstructor@123
 }

 LazyJavaClassifierType@124['Throwable'] {
-    _arguments = ArrayList@125[empty]
-    _nullable = 'false': Boolean@54
-    _typeConstructor = DeserializedClassTypeConstructor@122
+    arguments = ArrayList@125[empty]
    classifier = JavaClassImpl@126['Throwable']
+    nullable = 'false': Boolean@55
+    typeConstructor = DeserializedClassTypeConstructor@123
 }

 LazyJavaClassifierType@127['Throwable'] {
-    _arguments = ArrayList@128[empty]
-    _nullable = 'false': Boolean@54
-    _typeConstructor = DeserializedClassTypeConstructor@122
+    arguments = ArrayList@128[empty]
    classifier = JavaClassImpl@129['Throwable']
+    nullable = 'false': Boolean@55
+    typeConstructor = DeserializedClassTypeConstructor@123
 }

 LazyJavaClassifierType@130['Throwable'] {
-    _arguments = ArrayList@131[empty]
-    _nullable = 'true': Boolean@61
-    _typeConstructor = DeserializedClassTypeConstructor@122
-    classifier = JavaClassImpl@129['Throwable']
+    arguments = ArrayList@131[empty]
+    classifier = JavaClassImpl@122['Throwable']
+    nullable = 'true': Boolean@61
+    typeConstructor = DeserializedClassTypeConstructor@123
 }

 LazyJavaClassifierType@132['Throwable'] {
-    _arguments = ArrayList@133[empty]
-    _nullable = 'true': Boolean@61
-    _typeConstructor = DeserializedClassTypeConstructor@122
-    classifier = JavaClassImpl@126['Throwable']
+    arguments = ArrayList@133[empty]
+    classifier = JavaClassImpl@129['Throwable']
+    nullable = 'true': Boolean@61
+    typeConstructor = DeserializedClassTypeConstructor@123
 }

 LazyJavaClassifierType@134['Throwable'] {
-    _arguments = ArrayList@135[empty]
-    _nullable = 'true': Boolean@61
-    _typeConstructor = DeserializedClassTypeConstructor@122
-    classifier = JavaClassImpl@123['Throwable']
+    arguments = ArrayList@135[empty]
+    classifier = JavaClassImpl@126['Throwable']
+    nullable = 'true': Boolean@61
+    typeConstructor = DeserializedClassTypeConstructor@123
 }

 LazyJavaClassifierType@33['Throwable'] {
-    _arguments = ArrayList@136[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@122
+    arguments = ArrayList@136[empty]
    classifier = JavaClassImpl@137['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@123
 }

 LazyJavaPackageFragmentProvider@138 {
-    _packageFragments('<root>': FqName@139) = LazyJavaPackageFragment@140['<root>']
-    _packageFragments('C': FqName@141) = null
-    _packageFragments('Collection': FqName@142) = null
-    _packageFragments('Int': FqName@143) = null
-    _packageFragments('List': FqName@144) = null
-    _packageFragments('T': FqName@145) = null
-    _packageFragments('g': FqName@146) = null
-    _packageFragments('g.C': FqName@147) = null
-    _packageFragments('g.Collection': FqName@148) = null
-    _packageFragments('g.Int': FqName@149) = null
-    _packageFragments('g.List': FqName@150) = null
-    _packageFragments('g.T': FqName@151) = null
-    _packageFragments('java': FqName@152) = LazyJavaPackageFragment@153['java']
-    _packageFragments('java.io': FqName@154) = LazyJavaPackageFragment@155['io']
-    _packageFragments('java.lang': FqName@156) = LazyJavaPackageFragment@157['lang']
-    _packageFragments('java.lang.C': FqName@158) = null
-    _packageFragments('java.lang.Collection': FqName@159) = null
-    _packageFragments('java.lang.Int': FqName@160) = null
-    _packageFragments('java.lang.List': FqName@161) = null
-    _packageFragments('java.lang.T': FqName@162) = null
-    _packageFragments('java.util': FqName@163) = LazyJavaPackageFragment@164['util']
-    _packageFragments('java.util.HashSet': FqName@165) = null
-    _packageFragments('kotlin': FqName@166) = null
-    _packageFragments('kotlin.C': FqName@167) = null
-    _packageFragments('kotlin.Collection': FqName@168) = null
-    _packageFragments('kotlin.Int': FqName@169) = null
-    _packageFragments('kotlin.List': FqName@170) = null
-    _packageFragments('kotlin.T': FqName@171) = null
-    _packageFragments('kotlin.io': FqName@172) = null
-    _packageFragments('kotlin.jvm': FqName@173) = null
+    packageFragments('<root>': FqName@139) = LazyJavaPackageFragment@140['<root>']
+    packageFragments('C': FqName@141) = null
+    packageFragments('Collection': FqName@142) = null
+    packageFragments('Int': FqName@143) = null
+    packageFragments('List': FqName@144) = null
+    packageFragments('T': FqName@145) = null
+    packageFragments('g': FqName@146) = null
+    packageFragments('g.C': FqName@147) = null
+    packageFragments('g.Collection': FqName@148) = null
+    packageFragments('g.Int': FqName@149) = null
+    packageFragments('g.List': FqName@150) = null
+    packageFragments('g.T': FqName@151) = null
+    packageFragments('java': FqName@152) = LazyJavaPackageFragment@153['java']
+    packageFragments('java.io': FqName@154) = LazyJavaPackageFragment@155['io']
+    packageFragments('java.lang': FqName@156) = LazyJavaPackageFragment@157['lang']
+    packageFragments('java.lang.C': FqName@158) = null
+    packageFragments('java.lang.Collection': FqName@159) = null
+    packageFragments('java.lang.Int': FqName@160) = null
+    packageFragments('java.lang.List': FqName@161) = null
+    packageFragments('java.lang.T': FqName@162) = null
+    packageFragments('java.util': FqName@163) = LazyJavaPackageFragment@164['util']
+    packageFragments('java.util.HashSet': FqName@165) = null
+    packageFragments('kotlin': FqName@166) = null
+    packageFragments('kotlin.C': FqName@167) = null
+    packageFragments('kotlin.Collection': FqName@168) = null
+    packageFragments('kotlin.Int': FqName@169) = null
+    packageFragments('kotlin.List': FqName@170) = null
+    packageFragments('kotlin.T': FqName@171) = null
+    packageFragments('kotlin.io': FqName@172) = null
+    packageFragments('kotlin.jvm': FqName@173) = null
    topLevelClasses(JavaClassImpl@44['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
    topLevelClasses(JavaClassImpl@47['AbstractSet']) = LazyJavaClassDescriptor@2['AbstractSet']
    topLevelClasses(JavaClassImpl@174['Exception']) = LazyJavaClassDescriptor@4['Exception']
@@ -311,35 +311,35 @@ LazyJavaPackageFragmentProvider@138 {
 }

 LazyJavaPackageFragment@153['java'] {
-    _functions('lang': Name@176) = EmptyList@177[empty] // through LazyPackageFragmentScopeForJavaPackage@178
-    _functions('util': Name@179) = EmptyList@177[empty] // through LazyPackageFragmentScopeForJavaPackage@178
-    classes('lang': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@178
-    classes('util': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@178
-    deserializedPackageScope = Empty@182 // through LazyPackageFragmentScopeForJavaPackage@178
-    memberIndex = computeMemberIndex$1@183 // through LazyPackageFragmentScopeForJavaPackage@178
+    classes('lang': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@177
+    classes('util': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@177
+    deserializedPackageScope = Empty@179 // through LazyPackageFragmentScopeForJavaPackage@177
+    functions('lang': Name@180) = EmptyList@181[empty] // through LazyPackageFragmentScopeForJavaPackage@177
+    functions('util': Name@182) = EmptyList@181[empty] // through LazyPackageFragmentScopeForJavaPackage@177
+    memberIndex = computeMemberIndex$1@183 // through LazyPackageFragmentScopeForJavaPackage@177
 }

 LazyJavaPackageFragment@157['lang'] {
-    _functions('Exception': Name@184) = EmptyList@177[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    _functions('HashSet': Name@186) = EmptyList@177[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    _functions('convert': Name@187) = EmptyList@177[empty] // through LazyPackageFragmentScopeForJavaPackage@185
    classes('Exception': Name@184) = LazyJavaClassDescriptor@4['Exception'] // through LazyPackageFragmentScopeForJavaPackage@185
    classes('HashSet': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@185
    classes('convert': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    deserializedPackageScope = Empty@182 // through LazyPackageFragmentScopeForJavaPackage@185
+    deserializedPackageScope = Empty@179 // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('Exception': Name@184) = EmptyList@181[empty] // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('HashSet': Name@186) = EmptyList@181[empty] // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('convert': Name@187) = EmptyList@181[empty] // through LazyPackageFragmentScopeForJavaPackage@185
    memberIndex = computeMemberIndex$1@188 // through LazyPackageFragmentScopeForJavaPackage@185
 }

 LazyJavaPackageFragment@164['util'] {
-    _functions('HashSet': Name@189) = EmptyList@177[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('HashSet': Name@191) = LazyJavaClassDescriptor@12['HashSet'] // through LazyPackageFragmentScopeForJavaPackage@190
-    deserializedPackageScope = Empty@182 // through LazyPackageFragmentScopeForJavaPackage@190
+    classes('HashSet': Name@189) = LazyJavaClassDescriptor@12['HashSet'] // through LazyPackageFragmentScopeForJavaPackage@190
+    deserializedPackageScope = Empty@179 // through LazyPackageFragmentScopeForJavaPackage@190
+    functions('HashSet': Name@191) = EmptyList@181[empty] // through LazyPackageFragmentScopeForJavaPackage@190
    memberIndex = computeMemberIndex$1@192 // through LazyPackageFragmentScopeForJavaPackage@190
 }

 LazyJavaTypeParameterDescriptor@35['E'] {
    defaultType = JetTypeImpl@193['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@68
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
    upperBounds = LinkedHashSet@194[1] { NullableType@195 }
 }

@@ -348,17 +348,17 @@ LazyJavaTypeParameterDescriptor@27['E'] {
 }

 LazyJavaTypeParameterDescriptor@23['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@75
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }

 LazyJavaTypeParameterResolver@196 {
-    resolve(JavaTypeParameterImpl@76['E']) = LazyJavaTypeParameterDescriptor@23['E']
+    resolve(JavaTypeParameterImpl@197['E']) = LazyJavaTypeParameterDescriptor@35['E']
 }

-LazyJavaTypeParameterResolver@197 {
-    resolve(JavaTypeParameterImpl@198['E']) = LazyJavaTypeParameterDescriptor@35['E']
+LazyJavaTypeParameterResolver@198 {
+    resolve(JavaTypeParameterImpl@82['E']) = LazyJavaTypeParameterDescriptor@23['E']
 }

 LazyJavaTypeParameterResolver@199 {
-    resolve(JavaTypeParameterImpl@80['E']) = LazyJavaTypeParameterDescriptor@27['E']
+    resolve(JavaTypeParameterImpl@78['E']) = LazyJavaTypeParameterDescriptor@27['E']
 }
@@ -1,165 +1,156 @@
 LazyJavaClassDescriptor@0['Exception'] {
-    _constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    _functionTypeForSamInterface = null
-    _typeConstructor = LazyJavaClassTypeConstructor@6['Exception']
-    defaultType = JetTypeImpl@7['Exception']
+    constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
+    defaultType = JetTypeImpl@6['Exception']
+    functionTypeForSamInterface = null
+    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
 }

-LazyJavaClassTypeConstructor@6['Exception'] {
-    _parameters = ArrayList@8[empty]
-    _supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
+LazyJavaClassTypeConstructor@7['Exception'] {
+    parameters = ArrayList@8[empty]
+    supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
 }

 LazyJavaClassifierType@11['String'] {
-    _arguments = ArrayList@12[empty]
-    _nullable = 'false': Boolean@13
-    _typeConstructor = DeserializedClassTypeConstructor@14
-    classifier = JavaClassImpl@15['String']
+    arguments = ArrayList@12[empty]
+    classifier = JavaClassImpl@13['String']
+    nullable = 'false': Boolean@14
+    typeConstructor = DeserializedClassTypeConstructor@15
 }

 LazyJavaClassifierType@16['String'] {
-    _arguments = ArrayList@17[empty]
-    _nullable = 'false': Boolean@13
-    _typeConstructor = DeserializedClassTypeConstructor@14
+    arguments = ArrayList@17[empty]
    classifier = JavaClassImpl@18['String']
+    nullable = 'false': Boolean@14
+    typeConstructor = DeserializedClassTypeConstructor@15
 }

 LazyJavaClassifierType@19['String'] {
-    _arguments = ArrayList@20[empty]
-    _nullable = 'false': Boolean@13
-    _typeConstructor = DeserializedClassTypeConstructor@14
+    arguments = ArrayList@20[empty]
    classifier = JavaClassImpl@21['String']
+    nullable = 'false': Boolean@14
+    typeConstructor = DeserializedClassTypeConstructor@15
 }

 LazyJavaClassifierType@22['String'] {
-    _arguments = ArrayList@23[empty]
-    _nullable = 'true': Boolean@24
-    _typeConstructor = DeserializedClassTypeConstructor@14
-    classifier = JavaClassImpl@18['String']
+    arguments = ArrayList@23[empty]
+    classifier = JavaClassImpl@13['String']
+    nullable = 'true': Boolean@24
+    typeConstructor = DeserializedClassTypeConstructor@15
 }

 LazyJavaClassifierType@25['String'] {
-    _arguments = ArrayList@26[empty]
-    _nullable = 'true': Boolean@24
-    _typeConstructor = DeserializedClassTypeConstructor@14
-    classifier = JavaClassImpl@15['String']
+    arguments = ArrayList@26[empty]
+    classifier = JavaClassImpl@21['String']
+    nullable = 'true': Boolean@24
+    typeConstructor = DeserializedClassTypeConstructor@15
 }

 LazyJavaClassifierType@27['String'] {
-    _arguments = ArrayList@28[empty]
-    _nullable = 'true': Boolean@24
-    _typeConstructor = DeserializedClassTypeConstructor@14
-    classifier = JavaClassImpl@21['String']
+    arguments = ArrayList@28[empty]
+    classifier = JavaClassImpl@18['String']
+    nullable = 'true': Boolean@24
+    typeConstructor = DeserializedClassTypeConstructor@15
 }

 LazyJavaClassifierType@29['Throwable'] {
-    _arguments = ArrayList@30[empty]
-    _nullable = 'false': Boolean@13
-    _typeConstructor = DeserializedClassTypeConstructor@31
-    classifier = JavaClassImpl@32['Throwable']
+    arguments = ArrayList@30[empty]
+    classifier = JavaClassImpl@31['Throwable']
+    nullable = 'false': Boolean@14
+    typeConstructor = DeserializedClassTypeConstructor@32
 }

 LazyJavaClassifierType@33['Throwable'] {
-    _arguments = ArrayList@34[empty]
-    _nullable = 'false': Boolean@13
-    _typeConstructor = DeserializedClassTypeConstructor@31
+    arguments = ArrayList@34[empty]
    classifier = JavaClassImpl@35['Throwable']
+    nullable = 'false': Boolean@14
+    typeConstructor = DeserializedClassTypeConstructor@32
 }

 LazyJavaClassifierType@36['Throwable'] {
-    _arguments = ArrayList@37[empty]
-    _nullable = 'false': Boolean@13
-    _typeConstructor = DeserializedClassTypeConstructor@31
+    arguments = ArrayList@37[empty]
    classifier = JavaClassImpl@38['Throwable']
+    nullable = 'false': Boolean@14
+    typeConstructor = DeserializedClassTypeConstructor@32
 }

 LazyJavaClassifierType@39['Throwable'] {
-    _arguments = ArrayList@40[empty]
-    _nullable = 'true': Boolean@24
-    _typeConstructor = DeserializedClassTypeConstructor@31
-    classifier = JavaClassImpl@32['Throwable']
+    arguments = ArrayList@40[empty]
+    classifier = JavaClassImpl@35['Throwable']
+    nullable = 'true': Boolean@24
+    typeConstructor = DeserializedClassTypeConstructor@32
 }

 LazyJavaClassifierType@41['Throwable'] {
-    _arguments = ArrayList@42[empty]
-    _nullable = 'true': Boolean@24
-    _typeConstructor = DeserializedClassTypeConstructor@31
-    classifier = JavaClassImpl@38['Throwable']
+    arguments = ArrayList@42[empty]
+    classifier = JavaClassImpl@31['Throwable']
+    nullable = 'true': Boolean@24
+    typeConstructor = DeserializedClassTypeConstructor@32
 }

 LazyJavaClassifierType@43['Throwable'] {
-    _arguments = ArrayList@44[empty]
-    _nullable = 'true': Boolean@24
-    _typeConstructor = DeserializedClassTypeConstructor@31
-    classifier = JavaClassImpl@35['Throwable']
+    arguments = ArrayList@44[empty]
+    classifier = JavaClassImpl@38['Throwable']
+    nullable = 'true': Boolean@24
+    typeConstructor = DeserializedClassTypeConstructor@32
 }

 LazyJavaClassifierType@10['Throwable'] {
-    _arguments = ArrayList@45[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@31
+    arguments = ArrayList@45[empty]
    classifier = JavaClassImpl@46['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@32
 }

 LazyJavaPackageFragmentProvider@47 {
-    _packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    _packageFragments('A': FqName@50) = null
-    _packageFragments('Int': FqName@51) = null
-    _packageFragments('List': FqName@52) = null
-    _packageFragments('Map': FqName@53) = null
-    _packageFragments('MutableList': FqName@54) = null
-    _packageFragments('R': FqName@55) = null
-    _packageFragments('T': FqName@56) = null
-    _packageFragments('U': FqName@57) = null
-    _packageFragments('a': FqName@58) = null
-    _packageFragments('a.A': FqName@59) = null
-    _packageFragments('a.Int': FqName@60) = null
-    _packageFragments('a.List': FqName@61) = null
-    _packageFragments('a.Map': FqName@62) = null
-    _packageFragments('a.MutableList': FqName@63) = null
-    _packageFragments('a.R': FqName@64) = null
-    _packageFragments('a.T': FqName@65) = null
-    _packageFragments('a.U': FqName@66) = null
-    _packageFragments('java': FqName@67) = LazyJavaPackageFragment@68['java']
-    _packageFragments('java.lang': FqName@69) = LazyJavaPackageFragment@70['lang']
-    _packageFragments('java.lang.A': FqName@71) = null
-    _packageFragments('java.lang.Int': FqName@72) = null
-    _packageFragments('java.lang.List': FqName@73) = null
-    _packageFragments('java.lang.Map': FqName@74) = null
-    _packageFragments('java.lang.MutableList': FqName@75) = null
-    _packageFragments('java.lang.R': FqName@76) = null
-    _packageFragments('java.lang.T': FqName@77) = null
-    _packageFragments('java.lang.U': FqName@78) = null
-    _packageFragments('kotlin': FqName@79) = null
-    _packageFragments('kotlin.A': FqName@80) = null
-    _packageFragments('kotlin.Int': FqName@81) = null
-    _packageFragments('kotlin.List': FqName@82) = null
-    _packageFragments('kotlin.Map': FqName@83) = null
-    _packageFragments('kotlin.MutableList': FqName@84) = null
-    _packageFragments('kotlin.R': FqName@85) = null
-    _packageFragments('kotlin.T': FqName@86) = null
-    _packageFragments('kotlin.U': FqName@87) = null
-    _packageFragments('kotlin.io': FqName@88) = null
-    _packageFragments('kotlin.jvm': FqName@89) = null
+    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
+    packageFragments('A': FqName@50) = null
+    packageFragments('Int': FqName@51) = null
+    packageFragments('List': FqName@52) = null
+    packageFragments('Map': FqName@53) = null
+    packageFragments('MutableList': FqName@54) = null
+    packageFragments('R': FqName@55) = null
+    packageFragments('T': FqName@56) = null
+    packageFragments('U': FqName@57) = null
+    packageFragments('a': FqName@58) = null
+    packageFragments('a.A': FqName@59) = null
+    packageFragments('a.Int': FqName@60) = null
+    packageFragments('a.List': FqName@61) = null
+    packageFragments('a.Map': FqName@62) = null
+    packageFragments('a.MutableList': FqName@63) = null
+    packageFragments('a.R': FqName@64) = null
+    packageFragments('a.T': FqName@65) = null
+    packageFragments('a.U': FqName@66) = null
+    packageFragments('java': FqName@67) = LazyJavaPackageFragment@68['java']
+    packageFragments('java.lang': FqName@69) = LazyJavaPackageFragment@70['lang']
+    packageFragments('java.lang.A': FqName@71) = null
+    packageFragments('java.lang.Int': FqName@72) = null
+    packageFragments('java.lang.List': FqName@73) = null
+    packageFragments('java.lang.Map': FqName@74) = null
+    packageFragments('java.lang.MutableList': FqName@75) = null
+    packageFragments('java.lang.R': FqName@76) = null
+    packageFragments('java.lang.T': FqName@77) = null
+    packageFragments('java.lang.U': FqName@78) = null
+    packageFragments('kotlin': FqName@79) = null
+    packageFragments('kotlin.A': FqName@80) = null
+    packageFragments('kotlin.Int': FqName@81) = null
+    packageFragments('kotlin.List': FqName@82) = null
+    packageFragments('kotlin.Map': FqName@83) = null
+    packageFragments('kotlin.MutableList': FqName@84) = null
+    packageFragments('kotlin.R': FqName@85) = null
+    packageFragments('kotlin.T': FqName@86) = null
+    packageFragments('kotlin.U': FqName@87) = null
+    packageFragments('kotlin.io': FqName@88) = null
+    packageFragments('kotlin.jvm': FqName@89) = null
    topLevelClasses(JavaClassImpl@90['Exception']) = LazyJavaClassDescriptor@0['Exception']
 }

 LazyJavaPackageFragment@68['java'] {
-    _functions('lang': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('lang': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@93
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    deserializedPackageScope = Empty@93 // through LazyPackageFragmentScopeForJavaPackage@92
+    functions('lang': Name@94) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@92
+    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@92
 }

 LazyJavaPackageFragment@70['lang'] {
-    _functions('Exception': Name@97) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    _functions('emptyList': Name@99) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    _functions('emptyListOfA': Name@100) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    _functions('emptyStrangeMap': Name@101) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    _functions('emptyStrangeMap1': Name@102) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    _functions('emptyStrangeMap2': Name@103) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    _functions('emptyStrangeMap3': Name@104) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    _functions('emptyStrangeMap4': Name@105) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    _functions('foo': Name@106) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@98
    classes('Exception': Name@97) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@98
    classes('emptyList': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@98
    classes('emptyListOfA': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@98
@@ -169,6 +160,15 @@ LazyJavaPackageFragment@70['lang'] {
    classes('emptyStrangeMap3': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@98
    classes('emptyStrangeMap4': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@98
    classes('foo': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@98
+    deserializedPackageScope = Empty@93 // through LazyPackageFragmentScopeForJavaPackage@98
+    functions('Exception': Name@97) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@98
+    functions('emptyList': Name@99) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@98
+    functions('emptyListOfA': Name@100) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@98
+    functions('emptyStrangeMap': Name@101) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@98
+    functions('emptyStrangeMap1': Name@102) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@98
+    functions('emptyStrangeMap2': Name@103) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@98
+    functions('emptyStrangeMap3': Name@104) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@98
+    functions('emptyStrangeMap4': Name@105) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@98
+    functions('foo': Name@106) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@98
    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@98
 }
@@ -3,158 +3,158 @@ DescriptorResolver@0 {
 }

 LazyJavaClassDescriptor@2['Exception'] {
-    _constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    _functionTypeForSamInterface = null
-    _typeConstructor = LazyJavaClassTypeConstructor@8['Exception']
-    defaultType = JetTypeImpl@9['Exception']
+    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
+    defaultType = JetTypeImpl@8['Exception']
+    functionTypeForSamInterface = null
+    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
 }

-LazyJavaClassTypeConstructor@8['Exception'] {
-    _parameters = ArrayList@10[empty]
-    _supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
+LazyJavaClassTypeConstructor@9['Exception'] {
+    parameters = ArrayList@10[empty]
+    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
 }

 LazyJavaClassifierType@13['String'] {
-    _arguments = ArrayList@14[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@16
-    classifier = JavaClassImpl@17['String']
+    arguments = ArrayList@14[empty]
+    classifier = JavaClassImpl@15['String']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@17
 }

 LazyJavaClassifierType@18['String'] {
-    _arguments = ArrayList@19[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@16
+    arguments = ArrayList@19[empty]
    classifier = JavaClassImpl@20['String']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@17
 }

 LazyJavaClassifierType@21['String'] {
-    _arguments = ArrayList@22[empty]
-    _nullable = 'false': Boolean@15
-    _typeConstructor = DeserializedClassTypeConstructor@16
+    arguments = ArrayList@22[empty]
    classifier = JavaClassImpl@23['String']
+    nullable = 'false': Boolean@16
+    typeConstructor = DeserializedClassTypeConstructor@17
 }

 LazyJavaClassifierType@24['String'] {
-    _arguments = ArrayList@25[empty]
-    _nullable = 'true': Boolean@26
-    _typeConstructor = DeserializedClassTypeConstructor@16
+    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
+    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@40['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
+    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('Any': FqName@53) = null
-    _packageFragments('B': FqName@54) = null
-    _packageFragments('C': FqName@55) = null
-    _packageFragments('In': FqName@56) = null
-    _packageFragments('T': FqName@57) = null
-    _packageFragments('java': FqName@58) = LazyJavaPackageFragment@59['java']
-    _packageFragments('java.lang': FqName@60) = LazyJavaPackageFragment@61['lang']
-    _packageFragments('java.lang.A': FqName@62) = null
-    _packageFragments('java.lang.Any': FqName@63) = null
-    _packageFragments('java.lang.B': FqName@64) = null
-    _packageFragments('java.lang.C': FqName@65) = null
-    _packageFragments('java.lang.In': FqName@66) = null
-    _packageFragments('java.lang.T': FqName@67) = null
-    _packageFragments('kotlin': FqName@68) = null
-    _packageFragments('kotlin.A': FqName@69) = null
-    _packageFragments('kotlin.Any': FqName@70) = null
-    _packageFragments('kotlin.B': FqName@71) = null
-    _packageFragments('kotlin.C': FqName@72) = null
-    _packageFragments('kotlin.In': FqName@73) = null
-    _packageFragments('kotlin.T': FqName@74) = null
-    _packageFragments('kotlin.io': FqName@75) = null
-    _packageFragments('kotlin.jvm': FqName@76) = null
-    _packageFragments('s': FqName@77) = null
-    _packageFragments('s.A': FqName@78) = null
-    _packageFragments('s.Any': FqName@79) = null
-    _packageFragments('s.B': FqName@80) = null
-    _packageFragments('s.C': FqName@81) = null
-    _packageFragments('s.In': FqName@82) = null
-    _packageFragments('s.T': FqName@83) = null
+    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
+    packageFragments('A': FqName@52) = null
+    packageFragments('Any': FqName@53) = null
+    packageFragments('B': FqName@54) = null
+    packageFragments('C': FqName@55) = null
+    packageFragments('In': FqName@56) = null
+    packageFragments('T': FqName@57) = null
+    packageFragments('java': FqName@58) = LazyJavaPackageFragment@59['java']
+    packageFragments('java.lang': FqName@60) = LazyJavaPackageFragment@61['lang']
+    packageFragments('java.lang.A': FqName@62) = null
+    packageFragments('java.lang.Any': FqName@63) = null
+    packageFragments('java.lang.B': FqName@64) = null
+    packageFragments('java.lang.C': FqName@65) = null
+    packageFragments('java.lang.In': FqName@66) = null
+    packageFragments('java.lang.T': FqName@67) = null
+    packageFragments('kotlin': FqName@68) = null
+    packageFragments('kotlin.A': FqName@69) = null
+    packageFragments('kotlin.Any': FqName@70) = null
+    packageFragments('kotlin.B': FqName@71) = null
+    packageFragments('kotlin.C': FqName@72) = null
+    packageFragments('kotlin.In': FqName@73) = null
+    packageFragments('kotlin.T': FqName@74) = null
+    packageFragments('kotlin.io': FqName@75) = null
+    packageFragments('kotlin.jvm': FqName@76) = null
+    packageFragments('s': FqName@77) = null
+    packageFragments('s.A': FqName@78) = null
+    packageFragments('s.Any': FqName@79) = null
+    packageFragments('s.B': FqName@80) = null
+    packageFragments('s.C': FqName@81) = null
+    packageFragments('s.In': FqName@82) = null
+    packageFragments('s.T': FqName@83) = null
    topLevelClasses(JavaClassImpl@84['Exception']) = LazyJavaClassDescriptor@2['Exception']
 }

 LazyJavaPackageFragment@59['java'] {
-    _functions('lang': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('lang': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('lang': Name@88) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@86
 }

 LazyJavaPackageFragment@61['lang'] {
-    _functions('Exception': Name@91) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    _functions('bar': Name@93) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    _functions('foo': Name@94) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    _functions('use': Name@95) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@92
    classes('Exception': Name@91) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@92
    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@92
    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@92
    classes('use': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@92
+    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@92
+    functions('Exception': Name@91) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
+    functions('bar': Name@93) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
+    functions('foo': Name@94) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
+    functions('use': Name@95) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@92
 }
@@ -1,321 +1,314 @@
 LazyAnnotationDescriptor@0 {
-    _resolutionResults = OverloadResolutionResultsImpl@1
-    _type = JetTypeImpl@2['inline']
-    _valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
+    resolutionResults = OverloadResolutionResultsImpl@1
+    type = JetTypeImpl@2['inline']
+    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
 }

 LazyJavaClassDescriptor@4['AbstractMap'] {
-    _functions('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _properties('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    _typeConstructor = LazyJavaClassTypeConstructor@8['AbstractMap']
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@7
+    functions('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
+    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
+    properties('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
+    typeConstructor = LazyJavaClassTypeConstructor@9['AbstractMap']
 }

 LazyJavaClassDescriptor@10['HashMap'] {
-    _constructors = ArrayList@11[4] { JavaConstructorDescriptor@12['<init>'], JavaConstructorDescriptor@13['<init>'], JavaConstructorDescriptor@14['<init>'], ... } // through LazyJavaClassMemberScope@15
-    _functionTypeForSamInterface = null
-    _functions('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@15
-    _properties('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@15
-    _typeConstructor = LazyJavaClassTypeConstructor@16['HashMap']
-    defaultType = JetTypeImpl@17['HashMap<2>']
-    enumEntryIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@15
-    nestedClassIndex = LinkedHashMap@20 // through LazyJavaClassMemberScope@15
+    constructors = ArrayList@11[4] { JavaConstructorDescriptor@12['<init>'], JavaConstructorDescriptor@13['<init>'], JavaConstructorDescriptor@14['<init>'], ... } // through LazyJavaClassMemberScope@15
+    defaultType = JetTypeImpl@16['HashMap<2>']
+    enumEntryIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@15
+    functionTypeForSamInterface = null
+    functions('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@15
+    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@15
+    nestedClassIndex = LinkedHashMap@19 // through LazyJavaClassMemberScope@15
    nestedClasses('getOrElse1': Name@5) = null // through LazyJavaClassMemberScope@15
+    properties('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@15
+    typeConstructor = LazyJavaClassTypeConstructor@20['HashMap']
 }

 LazyJavaClassDescriptor@21['Serializable'] {
-    _functions('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@22
-    _properties('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@22
-    _typeConstructor = LazyJavaClassTypeConstructor@23['Serializable']
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@22
+    functions('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@22
+    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
+    properties('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@22
+    typeConstructor = LazyJavaClassTypeConstructor@24['Serializable']
 }

-LazyJavaClassTypeConstructor@8['AbstractMap'] {
-    _parameters = ArrayList@25[2] { LazyJavaTypeParameterDescriptor@26['K'], LazyJavaTypeParameterDescriptor@27['V'] }
-    _supertypes = ArrayList@28[1] { LazyJavaClassifierType@29['Map<K, V>'] }
+LazyJavaClassTypeConstructor@9['AbstractMap'] {
+    parameters = ArrayList@25[2] { LazyJavaTypeParameterDescriptor@26['K'], LazyJavaTypeParameterDescriptor@27['V'] }
+    supertypes = ArrayList@28[1] { LazyJavaClassifierType@29['Map<K, V>'] }
 }

-LazyJavaClassTypeConstructor@16['HashMap'] {
-    _parameters = ArrayList@30[2] { LazyJavaTypeParameterDescriptor@31['K'], LazyJavaTypeParameterDescriptor@32['V'] }
-    _supertypes = ArrayList@33[4] { LazyJavaClassifierType@34['AbstractMap<K, V>'], LazyJavaClassifierType@35['Map<K, V>'], LazyJavaClassifierType@36['Cloneable'], ... }
+LazyJavaClassTypeConstructor@20['HashMap'] {
+    parameters = ArrayList@30[2] { LazyJavaTypeParameterDescriptor@31['K'], LazyJavaTypeParameterDescriptor@32['V'] }
+    supertypes = ArrayList@33[4] { LazyJavaClassifierType@34['AbstractMap<K, V>'], LazyJavaClassifierType@35['Map<K, V>'], LazyJavaClassifierType@36['Cloneable'], ... }
 }

-LazyJavaClassTypeConstructor@23['Serializable'] {
-    _parameters = ArrayList@37[empty]
-    _supertypes = ArrayList@38[1] { JetTypeImpl@39['Any'] }
+LazyJavaClassTypeConstructor@24['Serializable'] {
+    parameters = ArrayList@37[empty]
+    supertypes = ArrayList@38[1] { JetTypeImpl@39['Any'] }
 }

 LazyJavaClassifierType@34['AbstractMap<K, V>'] {
-    _arguments = ArrayList@40[2] { TypeProjectionImpl@41, TypeProjectionImpl@42 }
-    _memberScope = SubstitutingScope@43
-    _typeConstructor = LazyJavaClassTypeConstructor@8['AbstractMap']
-    classifier = JavaClassImpl@44['AbstractMap']
+    arguments = ArrayList@40[2] { TypeProjectionImpl@41, TypeProjectionImpl@42 }
+    classifier = JavaClassImpl@43['AbstractMap']
+    memberScope = SubstitutingScope@44
+    typeConstructor = LazyJavaClassTypeConstructor@9['AbstractMap']
 }

 LazyJavaClassifierType@36['Cloneable'] {
-    _arguments = ArrayList@45[empty]
-    _memberScope = DeserializedClassMemberScope@46
-    _typeConstructor = DeserializedClassTypeConstructor@47
-    classifier = JavaClassImpl@48['Cloneable']
+    arguments = ArrayList@45[empty]
+    classifier = JavaClassImpl@46['Cloneable']
+    memberScope = DeserializedClassMemberScope@47
+    typeConstructor = DeserializedClassTypeConstructor@48
 }

 LazyJavaClassifierType@49['K'] {
-    _arguments = ArrayList@50[empty]
-    _nullable = 'false': Boolean@51
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-    classifier = JavaTypeParameterImpl@53['K']
+    arguments = ArrayList@50[empty]
+    classifier = JavaTypeParameterImpl@51['K']
+    nullable = 'false': Boolean@52
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }

 LazyJavaClassifierType@54['K'] {
-    _arguments = ArrayList@55[empty]
-    _nullable = 'false': Boolean@51
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
+    arguments = ArrayList@55[empty]
    classifier = JavaTypeParameterImpl@56['K']
+    nullable = 'false': Boolean@52
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }

 LazyJavaClassifierType@57['K'] {
-    _arguments = ArrayList@58[empty]
-    _nullable = 'false': Boolean@51
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
-    classifier = JavaTypeParameterImpl@60['K']
+    arguments = ArrayList@58[empty]
+    classifier = JavaTypeParameterImpl@59['K']
+    nullable = 'false': Boolean@52
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }

-LazyJavaClassifierType@61['K'] {
-    _arguments = ArrayList@62[empty]
-    _nullable = 'false': Boolean@51
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-    classifier = JavaTypeParameterImpl@63['K']
+LazyJavaClassifierType@60['K'] {
+    arguments = ArrayList@61[empty]
+    classifier = JavaTypeParameterImpl@62['K']
+    nullable = 'false': Boolean@52
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }

 LazyJavaClassifierType@64['K'] {
-    _arguments = ArrayList@65[empty]
-    _nullable = 'false': Boolean@51
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
+    arguments = ArrayList@65[empty]
    classifier = JavaTypeParameterImpl@66['K']
+    nullable = 'false': Boolean@52
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }

 LazyJavaClassifierType@67['K'] {
-    _arguments = ArrayList@68[empty]
-    _nullable = 'true': Boolean@69
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-    classifier = JavaTypeParameterImpl@56['K']
+    arguments = ArrayList@68[empty]
+    classifier = JavaTypeParameterImpl@51['K']
+    nullable = 'true': Boolean@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }

 LazyJavaClassifierType@70['K'] {
-    _arguments = ArrayList@71[empty]
-    _nullable = 'true': Boolean@69
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-    classifier = JavaTypeParameterImpl@63['K']
+    arguments = ArrayList@71[empty]
+    classifier = JavaTypeParameterImpl@62['K']
+    nullable = 'true': Boolean@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }

 LazyJavaClassifierType@72['K'] {
-    _arguments = ArrayList@73[empty]
-    _nullable = 'true': Boolean@69
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
+    arguments = ArrayList@73[empty]
    classifier = JavaTypeParameterImpl@66['K']
+    nullable = 'true': Boolean@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }

 LazyJavaClassifierType@74['K'] {
-    _arguments = ArrayList@75[empty]
-    _nullable = 'true': Boolean@69
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
-    classifier = JavaTypeParameterImpl@60['K']
+    arguments = ArrayList@75[empty]
+    classifier = JavaTypeParameterImpl@59['K']
+    nullable = 'true': Boolean@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }

 LazyJavaClassifierType@76['K'] {
-    _arguments = ArrayList@77[empty]
-    _nullable = 'true': Boolean@69
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-    classifier = JavaTypeParameterImpl@53['K']
+    arguments = ArrayList@77[empty]
+    classifier = JavaTypeParameterImpl@56['K']
+    nullable = 'true': Boolean@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }

 LazyJavaClassifierType@78['Map<? extends K, ? extends V>'] {
-    _arguments = ArrayList@79[2] { TypeProjectionImpl@80, TypeProjectionImpl@81 }
-    _memberScope = SubstitutingScope@82
-    _nullable = 'false': Boolean@51
-    _typeConstructor = DeserializedClassTypeConstructor@83
-    classifier = JavaClassImpl@84['Map']
+    arguments = ArrayList@79[2] { TypeProjectionImpl@80, TypeProjectionImpl@81 }
+    classifier = JavaClassImpl@82['Map']
+    memberScope = SubstitutingScope@83
+    nullable = 'false': Boolean@52
+    typeConstructor = DeserializedClassTypeConstructor@84
 }

 LazyJavaClassifierType@85['Map<? extends K, ? extends V>'] {
-    _arguments = ArrayList@86[2] { TypeProjectionImpl@87, TypeProjectionImpl@88 }
-    _memberScope = SubstitutingScope@89
-    _nullable = 'true': Boolean@69
-    _typeConstructor = DeserializedClassTypeConstructor@90
-    classifier = JavaClassImpl@84['Map']
+    arguments = ArrayList@86[2] { TypeProjectionImpl@87, TypeProjectionImpl@88 }
+    classifier = JavaClassImpl@82['Map']
+    memberScope = SubstitutingScope@89
+    nullable = 'true': Boolean@69
+    typeConstructor = DeserializedClassTypeConstructor@90
 }

 LazyJavaClassifierType@29['Map<K, V>'] {
-    _arguments = ArrayList@91[2] { TypeProjectionImpl@92, TypeProjectionImpl@93 }
-    _memberScope = SubstitutingScope@94
-    _typeConstructor = DeserializedClassTypeConstructor@83
-    classifier = JavaClassImpl@95['Map']
+    arguments = ArrayList@91[2] { TypeProjectionImpl@92, TypeProjectionImpl@93 }
+    classifier = JavaClassImpl@94['Map']
+    memberScope = SubstitutingScope@95
+    typeConstructor = DeserializedClassTypeConstructor@84
 }

 LazyJavaClassifierType@35['Map<K, V>'] {
-    _arguments = ArrayList@96[2] { TypeProjectionImpl@97, TypeProjectionImpl@98 }
-    _memberScope = SubstitutingScope@99
-    _typeConstructor = DeserializedClassTypeConstructor@83
-    classifier = JavaClassImpl@100['Map']
+    arguments = ArrayList@96[2] { TypeProjectionImpl@97, TypeProjectionImpl@98 }
+    classifier = JavaClassImpl@99['Map']
+    memberScope = SubstitutingScope@100
+    typeConstructor = DeserializedClassTypeConstructor@84
 }

 LazyJavaClassifierType@101['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@102
-    classifier = JavaClassImpl@103['Object']
+    classifier = JavaClassImpl@102['Object']
+    typeConstructor = DeserializedClassTypeConstructor@103
 }

 LazyJavaClassifierType@104['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@102
    classifier = JavaClassImpl@105['Object']
+    typeConstructor = DeserializedClassTypeConstructor@103
 }

 LazyJavaClassifierType@106['Serializable'] {
-    _arguments = ArrayList@107[empty]
-    _memberScope = LazyJavaClassMemberScope@22
-    _typeConstructor = LazyJavaClassTypeConstructor@23['Serializable']
+    arguments = ArrayList@107[empty]
    classifier = JavaClassImpl@108['Serializable']
+    memberScope = LazyJavaClassMemberScope@22
+    typeConstructor = LazyJavaClassTypeConstructor@24['Serializable']
 }

 LazyJavaClassifierType@109['V'] {
-    _arguments = ArrayList@110[empty]
-    _nullable = 'false': Boolean@51
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
-    classifier = JavaTypeParameterImpl@112['V']
+    arguments = ArrayList@110[empty]
+    classifier = JavaTypeParameterImpl@111['V']
+    nullable = 'false': Boolean@52
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }

 LazyJavaClassifierType@113['V'] {
-    _arguments = ArrayList@114[empty]
-    _nullable = 'false': Boolean@51
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
-    classifier = JavaTypeParameterImpl@116['V']
+    arguments = ArrayList@114[empty]
+    classifier = JavaTypeParameterImpl@115['V']
+    nullable = 'false': Boolean@52
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
 }

 LazyJavaClassifierType@117['V'] {
-    _arguments = ArrayList@118[empty]
-    _nullable = 'false': Boolean@51
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
+    arguments = ArrayList@118[empty]
    classifier = JavaTypeParameterImpl@119['V']
+    nullable = 'false': Boolean@52
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
 }

 LazyJavaClassifierType@120['V'] {
-    _arguments = ArrayList@121[empty]
-    _nullable = 'false': Boolean@51
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
+    arguments = ArrayList@121[empty]
    classifier = JavaTypeParameterImpl@122['V']
+    nullable = 'false': Boolean@52
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
 }

 LazyJavaClassifierType@123['V'] {
-    _arguments = ArrayList@124[empty]
-    _nullable = 'false': Boolean@51
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
+    arguments = ArrayList@124[empty]
    classifier = JavaTypeParameterImpl@125['V']
+    nullable = 'false': Boolean@52
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
 }

 LazyJavaClassifierType@126['V'] {
-    _arguments = ArrayList@127[empty]
-    _nullable = 'true': Boolean@69
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
-    classifier = JavaTypeParameterImpl@119['V']
+    arguments = ArrayList@127[empty]
+    classifier = JavaTypeParameterImpl@115['V']
+    nullable = 'true': Boolean@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
 }

 LazyJavaClassifierType@128['V'] {
-    _arguments = ArrayList@129[empty]
-    _nullable = 'true': Boolean@69
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
-    classifier = JavaTypeParameterImpl@116['V']
+    arguments = ArrayList@129[empty]
+    classifier = JavaTypeParameterImpl@119['V']
+    nullable = 'true': Boolean@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
 }

 LazyJavaClassifierType@130['V'] {
-    _arguments = ArrayList@131[empty]
-    _nullable = 'true': Boolean@69
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
+    arguments = ArrayList@131[empty]
    classifier = JavaTypeParameterImpl@122['V']
+    nullable = 'true': Boolean@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
 }

 LazyJavaClassifierType@132['V'] {
-    _arguments = ArrayList@133[empty]
-    _nullable = 'true': Boolean@69
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
-    classifier = JavaTypeParameterImpl@112['V']
+    arguments = ArrayList@133[empty]
+    classifier = JavaTypeParameterImpl@111['V']
+    nullable = 'true': Boolean@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }

 LazyJavaClassifierType@134['V'] {
-    _arguments = ArrayList@135[empty]
-    _nullable = 'true': Boolean@69
-    _typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
+    arguments = ArrayList@135[empty]
    classifier = JavaTypeParameterImpl@125['V']
+    nullable = 'true': Boolean@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
 }

 LazyJavaPackageFragmentProvider@136 {
-    _packageFragments('<root>': FqName@137) = LazyJavaPackageFragment@138['<root>']
-    _packageFragments('Any': FqName@139) = null
-    _packageFragments('Array': FqName@140) = null
-    _packageFragments('Int': FqName@141) = null
-    _packageFragments('K': FqName@142) = null
-    _packageFragments('Map': FqName@143) = null
-    _packageFragments('String': FqName@144) = null
-    _packageFragments('V': FqName@145) = null
-    _packageFragments('V1': FqName@146) = null
-    _packageFragments('d': FqName@147) = null
-    _packageFragments('d.Any': FqName@148) = null
-    _packageFragments('d.Array': FqName@149) = null
-    _packageFragments('d.Int': FqName@150) = null
-    _packageFragments('d.K': FqName@151) = null
-    _packageFragments('d.Map': FqName@152) = null
-    _packageFragments('d.String': FqName@153) = null
-    _packageFragments('d.V': FqName@154) = null
-    _packageFragments('d.V1': FqName@155) = null
-    _packageFragments('d.inline': FqName@156) = null
-    _packageFragments('inline': FqName@157) = null
-    _packageFragments('java': FqName@158) = LazyJavaPackageFragment@159['java']
-    _packageFragments('java.io': FqName@160) = LazyJavaPackageFragment@161['io']
-    _packageFragments('java.lang': FqName@162) = LazyJavaPackageFragment@163['lang']
-    _packageFragments('java.lang.Any': FqName@164) = null
-    _packageFragments('java.lang.Array': FqName@165) = null
-    _packageFragments('java.lang.Int': FqName@166) = null
-    _packageFragments('java.lang.K': FqName@167) = null
-    _packageFragments('java.lang.Map': FqName@168) = null
-    _packageFragments('java.lang.String': FqName@169) = null
-    _packageFragments('java.lang.V': FqName@170) = null
-    _packageFragments('java.lang.V1': FqName@171) = null
-    _packageFragments('java.lang.inline': FqName@172) = null
-    _packageFragments('java.util': FqName@173) = LazyJavaPackageFragment@174['util']
-    _packageFragments('java.util.HashMap': FqName@175) = null
-    _packageFragments('kotlin': FqName@176) = null
-    _packageFragments('kotlin.Any': FqName@177) = null
-    _packageFragments('kotlin.Array': FqName@178) = null
-    _packageFragments('kotlin.Int': FqName@179) = null
-    _packageFragments('kotlin.K': FqName@180) = null
-    _packageFragments('kotlin.Map': FqName@181) = null
-    _packageFragments('kotlin.String': FqName@182) = null
-    _packageFragments('kotlin.V': FqName@183) = null
-    _packageFragments('kotlin.V1': FqName@184) = null
-    _packageFragments('kotlin.inline': FqName@185) = null
-    _packageFragments('kotlin.io': FqName@186) = null
-    _packageFragments('kotlin.jvm': FqName@187) = null
-    topLevelClasses(JavaClassImpl@44['AbstractMap']) = LazyJavaClassDescriptor@4['AbstractMap']
+    packageFragments('<root>': FqName@137) = LazyJavaPackageFragment@138['<root>']
+    packageFragments('Any': FqName@139) = null
+    packageFragments('Array': FqName@140) = null
+    packageFragments('Int': FqName@141) = null
+    packageFragments('K': FqName@142) = null
+    packageFragments('Map': FqName@143) = null
+    packageFragments('String': FqName@144) = null
+    packageFragments('V': FqName@145) = null
+    packageFragments('V1': FqName@146) = null
+    packageFragments('d': FqName@147) = null
+    packageFragments('d.Any': FqName@148) = null
+    packageFragments('d.Array': FqName@149) = null
+    packageFragments('d.Int': FqName@150) = null
+    packageFragments('d.K': FqName@151) = null
+    packageFragments('d.Map': FqName@152) = null
+    packageFragments('d.String': FqName@153) = null
+    packageFragments('d.V': FqName@154) = null
+    packageFragments('d.V1': FqName@155) = null
+    packageFragments('d.inline': FqName@156) = null
+    packageFragments('inline': FqName@157) = null
+    packageFragments('java': FqName@158) = LazyJavaPackageFragment@159['java']
+    packageFragments('java.io': FqName@160) = LazyJavaPackageFragment@161['io']
+    packageFragments('java.lang': FqName@162) = LazyJavaPackageFragment@163['lang']
+    packageFragments('java.lang.Any': FqName@164) = null
+    packageFragments('java.lang.Array': FqName@165) = null
+    packageFragments('java.lang.Int': FqName@166) = null
+    packageFragments('java.lang.K': FqName@167) = null
+    packageFragments('java.lang.Map': FqName@168) = null
+    packageFragments('java.lang.String': FqName@169) = null
+    packageFragments('java.lang.V': FqName@170) = null
+    packageFragments('java.lang.V1': FqName@171) = null
+    packageFragments('java.lang.inline': FqName@172) = null
+    packageFragments('java.util': FqName@173) = LazyJavaPackageFragment@174['util']
+    packageFragments('java.util.HashMap': FqName@175) = null
+    packageFragments('kotlin': FqName@176) = null
+    packageFragments('kotlin.Any': FqName@177) = null
+    packageFragments('kotlin.Array': FqName@178) = null
+    packageFragments('kotlin.Int': FqName@179) = null
+    packageFragments('kotlin.K': FqName@180) = null
+    packageFragments('kotlin.Map': FqName@181) = null
+    packageFragments('kotlin.String': FqName@182) = null
+    packageFragments('kotlin.V': FqName@183) = null
+    packageFragments('kotlin.V1': FqName@184) = null
+    packageFragments('kotlin.inline': FqName@185) = null
+    packageFragments('kotlin.io': FqName@186) = null
+    packageFragments('kotlin.jvm': FqName@187) = null
+    topLevelClasses(JavaClassImpl@43['AbstractMap']) = LazyJavaClassDescriptor@4['AbstractMap']
    topLevelClasses(JavaClassImpl@188['HashMap']) = LazyJavaClassDescriptor@10['HashMap']
    topLevelClasses(JavaClassImpl@108['Serializable']) = LazyJavaClassDescriptor@21['Serializable']
 }

 LazyJavaPackageFragment@159['java'] {
-    _functions('lang': Name@189) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    _functions('util': Name@191) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('lang': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('util': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    deserializedPackageScope = Empty@194 // through LazyPackageFragmentScopeForJavaPackage@190
+    classes('lang': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@190
+    classes('util': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@190
+    deserializedPackageScope = Empty@192 // through LazyPackageFragmentScopeForJavaPackage@190
+    functions('lang': Name@193) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@190
+    functions('util': Name@194) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@190
    memberIndex = computeMemberIndex$1@195 // through LazyPackageFragmentScopeForJavaPackage@190
 }

 LazyJavaPackageFragment@163['lang'] {
-    _functions('HashMap': Name@196) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    _functions('containsKey': Name@198) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    _functions('defaultValue': Name@199) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    _functions('get': Name@200) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    _functions('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    _functions('invoke': Name@201) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    _functions('println': Name@202) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
    classes('HashMap': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@197
    classes('containsKey': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@197
    classes('defaultValue': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@197
@@ -323,35 +316,42 @@ LazyJavaPackageFragment@163['lang'] {
    classes('getOrElse1': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@197
    classes('invoke': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@197
    classes('println': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    deserializedPackageScope = Empty@194 // through LazyPackageFragmentScopeForJavaPackage@197
+    deserializedPackageScope = Empty@192 // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('HashMap': Name@196) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('containsKey': Name@198) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('defaultValue': Name@199) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('get': Name@200) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('invoke': Name@201) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('println': Name@202) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
    memberIndex = computeMemberIndex$1@203 // through LazyPackageFragmentScopeForJavaPackage@197
 }

 LazyJavaPackageFragment@174['util'] {
-    _functions('HashMap': Name@204) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@205
-    classes('HashMap': Name@206) = LazyJavaClassDescriptor@10['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@205
-    deserializedPackageScope = Empty@194 // through LazyPackageFragmentScopeForJavaPackage@205
+    classes('HashMap': Name@204) = LazyJavaClassDescriptor@10['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@205
+    deserializedPackageScope = Empty@192 // through LazyPackageFragmentScopeForJavaPackage@205
+    functions('HashMap': Name@206) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@205
    memberIndex = computeMemberIndex$1@207 // through LazyPackageFragmentScopeForJavaPackage@205
 }

 LazyJavaTypeParameterDescriptor@31['K'] {
    defaultType = JetTypeImpl@208['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
    upperBounds = LinkedHashSet@209[1] { NullableType@210 }
 }

 LazyJavaTypeParameterDescriptor@26['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }

 LazyJavaTypeParameterDescriptor@32['V'] {
    defaultType = JetTypeImpl@211['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
    upperBounds = LinkedHashSet@212[1] { NullableType@213 }
 }

 LazyJavaTypeParameterDescriptor@27['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }

 LazyJavaTypeParameterResolver@214 {
@@ -1,153 +1,153 @@
 LazyJavaClassDescriptor@0['Exception'] {
-    _constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    _functionTypeForSamInterface = null
-    _typeConstructor = LazyJavaClassTypeConstructor@6['Exception']
-    defaultType = JetTypeImpl@7['Exception']
+    constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
+    defaultType = JetTypeImpl@6['Exception']
+    functionTypeForSamInterface = null
+    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
 }

-LazyJavaClassTypeConstructor@6['Exception'] {
-    _parameters = ArrayList@8[empty]
-    _supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
+LazyJavaClassTypeConstructor@7['Exception'] {
+    parameters = ArrayList@8[empty]
+    supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
 }

 LazyJavaClassifierType@11['String'] {
-    _arguments = ArrayList@12[empty]
-    _nullable = 'false': Boolean@13
-    _typeConstructor = DeserializedClassTypeConstructor@14
-    classifier = JavaClassImpl@15['String']
+    arguments = ArrayList@12[empty]
+    classifier = JavaClassImpl@13['String']
+    nullable = 'false': Boolean@14
+    typeConstructor = DeserializedClassTypeConstructor@15
 }

 LazyJavaClassifierType@16['String'] {
-    _arguments = ArrayList@17[empty]
-    _nullable = 'false': Boolean@13
-    _typeConstructor = DeserializedClassTypeConstructor@14
+    arguments = ArrayList@17[empty]
    classifier = JavaClassImpl@18['String']
+    nullable = 'false': Boolean@14
+    typeConstructor = DeserializedClassTypeConstructor@15
 }

 LazyJavaClassifierType@19['String'] {
-    _arguments = ArrayList@20[empty]
-    _nullable = 'false': Boolean@13
-    _typeConstructor = DeserializedClassTypeConstructor@14
+    arguments = ArrayList@20[empty]
    classifier = JavaClassImpl@21['String']
+    nullable = 'false': Boolean@14
+    typeConstructor = DeserializedClassTypeConstructor@15
 }

 LazyJavaClassifierType@22['String'] {
-    _arguments = ArrayList@23[empty]
-    _nullable = 'true': Boolean@24
-    _typeConstructor = DeserializedClassTypeConstructor@14
-    classifier = JavaClassImpl@15['String']
+    arguments = ArrayList@23[empty]
+    classifier = JavaClassImpl@18['String']
+    nullable = 'true': Boolean@24
+    typeConstructor = DeserializedClassTypeConstructor@15
 }

 LazyJavaClassifierType@25['String'] {
-    _arguments = ArrayList@26[empty]
-    _nullable = 'true': Boolean@24
-    _typeConstructor = DeserializedClassTypeConstructor@14
-    classifier = JavaClassImpl@18['String']
+    arguments = ArrayList@26[empty]
+    classifier = JavaClassImpl@21['String']
+    nullable = 'true': Boolean@24
+    typeConstructor = DeserializedClassTypeConstructor@15
 }

 LazyJavaClassifierType@27['String'] {
-    _arguments = ArrayList@28[empty]
-    _nullable = 'true': Boolean@24
-    _typeConstructor = DeserializedClassTypeConstructor@14
-    classifier = JavaClassImpl@21['String']
+    arguments = ArrayList@28[empty]
+    classifier = JavaClassImpl@13['String']
+    nullable = 'true': Boolean@24
+    typeConstructor = DeserializedClassTypeConstructor@15
 }

 LazyJavaClassifierType@29['Throwable'] {
-    _arguments = ArrayList@30[empty]
-    _nullable = 'false': Boolean@13
-    _typeConstructor = DeserializedClassTypeConstructor@31
-    classifier = JavaClassImpl@32['Throwable']
+    arguments = ArrayList@30[empty]
+    classifier = JavaClassImpl@31['Throwable']
+    nullable = 'false': Boolean@14
+    typeConstructor = DeserializedClassTypeConstructor@32
 }

 LazyJavaClassifierType@33['Throwable'] {
-    _arguments = ArrayList@34[empty]
-    _nullable = 'false': Boolean@13
-    _typeConstructor = DeserializedClassTypeConstructor@31
+    arguments = ArrayList@34[empty]
    classifier = JavaClassImpl@35['Throwable']
+    nullable = 'false': Boolean@14
+    typeConstructor = DeserializedClassTypeConstructor@32
 }

 LazyJavaClassifierType@36['Throwable'] {
-    _arguments = ArrayList@37[empty]
-    _nullable = 'false': Boolean@13
-    _typeConstructor = DeserializedClassTypeConstructor@31
+    arguments = ArrayList@37[empty]
    classifier = JavaClassImpl@38['Throwable']
+    nullable = 'false': Boolean@14
+    typeConstructor = DeserializedClassTypeConstructor@32
 }

 LazyJavaClassifierType@39['Throwable'] {
-    _arguments = ArrayList@40[empty]
-    _nullable = 'true': Boolean@24
-    _typeConstructor = DeserializedClassTypeConstructor@31
-    classifier = JavaClassImpl@38['Throwable']
+    arguments = ArrayList@40[empty]
+    classifier = JavaClassImpl@35['Throwable']
+    nullable = 'true': Boolean@24
+    typeConstructor = DeserializedClassTypeConstructor@32
 }

 LazyJavaClassifierType@41['Throwable'] {
-    _arguments = ArrayList@42[empty]
-    _nullable = 'true': Boolean@24
-    _typeConstructor = DeserializedClassTypeConstructor@31
-    classifier = JavaClassImpl@32['Throwable']
+    arguments = ArrayList@42[empty]
+    classifier = JavaClassImpl@31['Throwable']
+    nullable = 'true': Boolean@24
+    typeConstructor = DeserializedClassTypeConstructor@32
 }

 LazyJavaClassifierType@43['Throwable'] {
-    _arguments = ArrayList@44[empty]
-    _nullable = 'true': Boolean@24
-    _typeConstructor = DeserializedClassTypeConstructor@31
-    classifier = JavaClassImpl@35['Throwable']
+    arguments = ArrayList@44[empty]
+    classifier = JavaClassImpl@38['Throwable']
+    nullable = 'true': Boolean@24
+    typeConstructor = DeserializedClassTypeConstructor@32
 }

 LazyJavaClassifierType@10['Throwable'] {
-    _arguments = ArrayList@45[empty]
-    _typeConstructor = DeserializedClassTypeConstructor@31
+    arguments = ArrayList@45[empty]
    classifier = JavaClassImpl@46['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@32
 }

 LazyJavaPackageFragmentProvider@47 {
-    _packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    _packageFragments('A': FqName@50) = null
-    _packageFragments('Any': FqName@51) = null
-    _packageFragments('R': FqName@52) = null
-    _packageFragments('T': FqName@53) = null
-    _packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
-    _packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
-    _packageFragments('java.lang.A': FqName@58) = null
-    _packageFragments('java.lang.Any': FqName@59) = null
-    _packageFragments('java.lang.R': FqName@60) = null
-    _packageFragments('java.lang.T': FqName@61) = null
-    _packageFragments('kotlin': FqName@62) = null
-    _packageFragments('kotlin.A': FqName@63) = null
-    _packageFragments('kotlin.Any': FqName@64) = null
-    _packageFragments('kotlin.R': FqName@65) = null
-    _packageFragments('kotlin.T': FqName@66) = null
-    _packageFragments('kotlin.io': FqName@67) = null
-    _packageFragments('kotlin.jvm': FqName@68) = null
+    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
+    packageFragments('A': FqName@50) = null
+    packageFragments('Any': FqName@51) = null
+    packageFragments('R': FqName@52) = null
+    packageFragments('T': FqName@53) = null
+    packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
+    packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
+    packageFragments('java.lang.A': FqName@58) = null
+    packageFragments('java.lang.Any': FqName@59) = null
+    packageFragments('java.lang.R': FqName@60) = null
+    packageFragments('java.lang.T': FqName@61) = null
+    packageFragments('kotlin': FqName@62) = null
+    packageFragments('kotlin.A': FqName@63) = null
+    packageFragments('kotlin.Any': FqName@64) = null
+    packageFragments('kotlin.R': FqName@65) = null
+    packageFragments('kotlin.T': FqName@66) = null
+    packageFragments('kotlin.io': FqName@67) = null
+    packageFragments('kotlin.jvm': FqName@68) = null
    topLevelClasses(JavaClassImpl@69['Exception']) = LazyJavaClassDescriptor@0['Exception']
 }

 LazyJavaPackageFragment@49['<root>'] {
-    _functions('Exception': Name@70) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    _functions('unescape': Name@73) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    _functions('unescapeA': Name@74) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('Any': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('Exception': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('unescape': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('unescapeA': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('Any': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('Exception': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('unescape': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('unescapeA': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@71
+    functions('Exception': Name@72) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@71
+    functions('unescape': Name@73) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@71
+    functions('unescapeA': Name@74) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@71
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@71
 }

 LazyJavaPackageFragment@55['java'] {
-    _functions('lang': Name@78) = EmptyList@71[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@57['lang'] {
-    _functions('Exception': Name@70) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    _functions('unescape': Name@73) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    _functions('unescapeA': Name@74) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('Exception': Name@70) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('Exception': Name@72) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@82
    classes('unescape': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@82
    classes('unescapeA': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@82
+    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@82
+    functions('Exception': Name@72) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@82
+    functions('unescape': Name@73) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@82
+    functions('unescapeA': Name@74) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@82
    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
 }
@@ -1,47 +1,47 @@
 LazyJavaPackageFragmentProvider@0 {
-    _packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    _packageFragments('Base': FqName@3) = null
-    _packageFragments('Hello': FqName@4) = null
-    _packageFragments('Hello.Base': FqName@5) = null
-    _packageFragments('Hello.Client': FqName@6) = null
-    _packageFragments('Hello.Int': FqName@7) = null
-    _packageFragments('Hello.String': FqName@8) = null
-    _packageFragments('Hello.StringBase': FqName@9) = null
-    _packageFragments('Hello.T': FqName@10) = null
-    _packageFragments('Hello.X': FqName@11) = null
-    _packageFragments('Int': FqName@12) = null
-    _packageFragments('String': FqName@13) = null
-    _packageFragments('T': FqName@14) = null
-    _packageFragments('X': FqName@15) = null
-    _packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    _packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    _packageFragments('java.lang.Base': FqName@20) = null
-    _packageFragments('java.lang.Int': FqName@21) = null
-    _packageFragments('java.lang.String': FqName@22) = null
-    _packageFragments('java.lang.T': FqName@23) = null
-    _packageFragments('java.lang.X': FqName@24) = null
-    _packageFragments('kotlin': FqName@25) = null
-    _packageFragments('kotlin.Base': FqName@26) = null
-    _packageFragments('kotlin.Int': FqName@27) = null
-    _packageFragments('kotlin.String': FqName@28) = null
-    _packageFragments('kotlin.T': FqName@29) = null
-    _packageFragments('kotlin.X': FqName@30) = null
-    _packageFragments('kotlin.io': FqName@31) = null
-    _packageFragments('kotlin.jvm': FqName@32) = null
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
+    packageFragments('Base': FqName@3) = null
+    packageFragments('Hello': FqName@4) = null
+    packageFragments('Hello.Base': FqName@5) = null
+    packageFragments('Hello.Client': FqName@6) = null
+    packageFragments('Hello.Int': FqName@7) = null
+    packageFragments('Hello.String': FqName@8) = null
+    packageFragments('Hello.StringBase': FqName@9) = null
+    packageFragments('Hello.T': FqName@10) = null
+    packageFragments('Hello.X': FqName@11) = null
+    packageFragments('Int': FqName@12) = null
+    packageFragments('String': FqName@13) = null
+    packageFragments('T': FqName@14) = null
+    packageFragments('X': FqName@15) = null
+    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
+    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
+    packageFragments('java.lang.Base': FqName@20) = null
+    packageFragments('java.lang.Int': FqName@21) = null
+    packageFragments('java.lang.String': FqName@22) = null
+    packageFragments('java.lang.T': FqName@23) = null
+    packageFragments('java.lang.X': FqName@24) = null
+    packageFragments('kotlin': FqName@25) = null
+    packageFragments('kotlin.Base': FqName@26) = null
+    packageFragments('kotlin.Int': FqName@27) = null
+    packageFragments('kotlin.String': FqName@28) = null
+    packageFragments('kotlin.T': FqName@29) = null
+    packageFragments('kotlin.X': FqName@30) = null
+    packageFragments('kotlin.io': FqName@31) = null
+    packageFragments('kotlin.jvm': FqName@32) = null
 }

 LazyJavaPackageFragment@17['java'] {
-    _functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
 }

 LazyJavaPackageFragment@19['lang'] {
-    _functions('Client': Name@39) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    _functions('StringBase': Name@41) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
    classes('Client': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
    classes('StringBase': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('Client': Name@39) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('StringBase': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
 }
@@ -5,61 +5,61 @@ DescriptorResolver@0 {
 }

 LazyJavaPackageFragmentProvider@4 {
-    _packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    _packageFragments('Any': FqName@7) = null
-    _packageFragments('MutableList': FqName@8) = null
-    _packageFragments('MutableSet': FqName@9) = null
-    _packageFragments('String': FqName@10) = null
-    _packageFragments('T': FqName@11) = null
-    _packageFragments('U': FqName@12) = null
-    _packageFragments('V': FqName@13) = null
-    _packageFragments('a': FqName@14) = null
-    _packageFragments('a.Any': FqName@15) = null
-    _packageFragments('a.MutableList': FqName@16) = null
-    _packageFragments('a.MutableSet': FqName@17) = null
-    _packageFragments('a.String': FqName@18) = null
-    _packageFragments('a.T': FqName@19) = null
-    _packageFragments('a.U': FqName@20) = null
-    _packageFragments('a.V': FqName@21) = null
-    _packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    _packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    _packageFragments('java.lang.Any': FqName@26) = null
-    _packageFragments('java.lang.MutableList': FqName@27) = null
-    _packageFragments('java.lang.MutableSet': FqName@28) = null
-    _packageFragments('java.lang.String': FqName@29) = null
-    _packageFragments('java.lang.T': FqName@30) = null
-    _packageFragments('java.lang.U': FqName@31) = null
-    _packageFragments('java.lang.V': FqName@32) = null
-    _packageFragments('kotlin': FqName@33) = null
-    _packageFragments('kotlin.Any': FqName@34) = null
-    _packageFragments('kotlin.MutableList': FqName@35) = null
-    _packageFragments('kotlin.MutableSet': FqName@36) = null
-    _packageFragments('kotlin.String': FqName@37) = null
-    _packageFragments('kotlin.T': FqName@38) = null
-    _packageFragments('kotlin.U': FqName@39) = null
-    _packageFragments('kotlin.V': FqName@40) = null
-    _packageFragments('kotlin.io': FqName@41) = null
-    _packageFragments('kotlin.jvm': FqName@42) = null
+    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
+    packageFragments('Any': FqName@7) = null
+    packageFragments('MutableList': FqName@8) = null
+    packageFragments('MutableSet': FqName@9) = null
+    packageFragments('String': FqName@10) = null
+    packageFragments('T': FqName@11) = null
+    packageFragments('U': FqName@12) = null
+    packageFragments('V': FqName@13) = null
+    packageFragments('a': FqName@14) = null
+    packageFragments('a.Any': FqName@15) = null
+    packageFragments('a.MutableList': FqName@16) = null
+    packageFragments('a.MutableSet': FqName@17) = null
+    packageFragments('a.String': FqName@18) = null
+    packageFragments('a.T': FqName@19) = null
+    packageFragments('a.U': FqName@20) = null
+    packageFragments('a.V': FqName@21) = null
+    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
+    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
+    packageFragments('java.lang.Any': FqName@26) = null
+    packageFragments('java.lang.MutableList': FqName@27) = null
+    packageFragments('java.lang.MutableSet': FqName@28) = null
+    packageFragments('java.lang.String': FqName@29) = null
+    packageFragments('java.lang.T': FqName@30) = null
+    packageFragments('java.lang.U': FqName@31) = null
+    packageFragments('java.lang.V': FqName@32) = null
+    packageFragments('kotlin': FqName@33) = null
+    packageFragments('kotlin.Any': FqName@34) = null
+    packageFragments('kotlin.MutableList': FqName@35) = null
+    packageFragments('kotlin.MutableSet': FqName@36) = null
+    packageFragments('kotlin.String': FqName@37) = null
+    packageFragments('kotlin.T': FqName@38) = null
+    packageFragments('kotlin.U': FqName@39) = null
+    packageFragments('kotlin.V': FqName@40) = null
+    packageFragments('kotlin.io': FqName@41) = null
+    packageFragments('kotlin.jvm': FqName@42) = null
 }

 LazyJavaPackageFragment@23['java'] {
-    _functions('lang': Name@43) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('lang': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('lang': Name@46) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@44
 }

 LazyJavaPackageFragment@25['lang'] {
-    _functions('arrayListOf': Name@49) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    _functions('bar': Name@51) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    _functions('baz': Name@52) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    _functions('checkItIsExactlyAny': Name@53) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    _functions('foo': Name@54) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@50
    classes('arrayListOf': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@50
    classes('bar': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@50
    classes('baz': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@50
    classes('checkItIsExactlyAny': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@50
    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@50
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('arrayListOf': Name@49) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('bar': Name@51) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('baz': Name@52) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('checkItIsExactlyAny': Name@53) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('foo': Name@54) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@50
 }