Update lazy.log files

compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.lazy.log

@@ -8,71 +8,63 @@ LazyJavaClassDescriptor@3['AbstractStringBuilder'] {
     functions('append': Name@5) = ArrayList@6[13] { JavaMethodDescriptor@7['append'], JavaMethodDescriptor@8['append'], JavaMethodDescriptor@9['append'], ... } // through LazyJavaClassMemberScope@10
     functions('toString': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['toString'] } // through LazyJavaClassMemberScope@10
     memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@10
-    properties('append': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    properties('toString': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@18['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@15['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
-LazyJavaClassDescriptor@20['Appendable'] {
-    defaultType = JetTypeImpl@21['Appendable']
-    functions('append': Name@22) = ArrayList@23[3] { JavaMethodDescriptor@24['append'], JavaMethodDescriptor@25['append'], JavaMethodDescriptor@26['append'] } // through LazyJavaClassMemberScope@27
-    functions('toString': Name@28) = ArrayList@29[1] { DeserializedSimpleFunctionDescriptor@30['toString'] } // through LazyJavaClassMemberScope@27
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@27
-    properties('append': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@27
-    properties('toString': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@27
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@32['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+LazyJavaClassDescriptor@17['Appendable'] {
+    defaultType = JetTypeImpl@18['Appendable']
+    functions('append': Name@19) = ArrayList@20[3] { JavaMethodDescriptor@21['append'], JavaMethodDescriptor@22['append'], JavaMethodDescriptor@23['append'] } // through LazyJavaClassMemberScope@24
+    functions('toString': Name@25) = ArrayList@26[1] { DeserializedSimpleFunctionDescriptor@27['toString'] } // through LazyJavaClassMemberScope@24
+    memberIndex = computeMemberIndex$1@28 // through LazyJavaClassMemberScope@24
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@29['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
-LazyJavaClassDescriptor@34['Serializable'] {
-    defaultType = JetTypeImpl@35['Serializable']
-    functions('append': Name@5) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('toString': Name@11) = ArrayList@37[1] { DeserializedSimpleFunctionDescriptor@38['toString'] } // through LazyJavaClassMemberScope@36
-    memberIndex = computeMemberIndex$1@39 // through LazyJavaClassMemberScope@36
-    properties('append': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('toString': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@40['Serializable']
+LazyJavaClassDescriptor@31['Serializable'] {
+    defaultType = JetTypeImpl@32['Serializable']
+    functions('append': Name@5) = EmptyList@33[empty] // through LazyJavaClassMemberScope@34
+    functions('toString': Name@11) = ArrayList@35[1] { DeserializedSimpleFunctionDescriptor@36['toString'] } // through LazyJavaClassMemberScope@34
+    memberIndex = computeMemberIndex$1@37 // through LazyJavaClassMemberScope@34
+    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
 }
 
-LazyJavaClassDescriptor@41['StringBuffer'] {
+LazyJavaClassDescriptor@39['StringBuffer'] {
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@42['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
-LazyJavaClassDescriptor@43['StringBuilder'] {
-    constructors = ArrayList@44[4] { JavaConstructorDescriptor@45['<init>'], JavaConstructorDescriptor@46['<init>'], JavaConstructorDescriptor@47['<init>'], ... } // through LazyJavaClassMemberScope@48
-    defaultType = JetTypeImpl@49['StringBuilder']
-    enumEntryIndex = LinkedHashMap@50 // through LazyJavaClassMemberScope@48
+LazyJavaClassDescriptor@41['StringBuilder'] {
+    constructors = ArrayList@42[4] { JavaConstructorDescriptor@43['<init>'], JavaConstructorDescriptor@44['<init>'], JavaConstructorDescriptor@45['<init>'], ... } // through LazyJavaClassMemberScope@46
+    defaultType = JetTypeImpl@47['StringBuilder']
+    enumEntryIndex = LinkedHashMap@48 // through LazyJavaClassMemberScope@46
     functionTypeForSamInterface = null
-    functions('append': Name@15) = ArrayList@51[14] { JavaMethodDescriptor@52['append'], JavaMethodDescriptor@53['append'], JavaMethodDescriptor@54['append'], ... } // through LazyJavaClassMemberScope@48
-    functions('toString': Name@17) = ArrayList@55[1] { JavaMethodDescriptor@56['toString'] } // through LazyJavaClassMemberScope@48
-    memberIndex = computeMemberIndex$1@57 // through LazyJavaClassMemberScope@48
-    nestedClassIndex = LinkedHashMap@58 // through LazyJavaClassMemberScope@48
-    nestedClasses('append': Name@15) = null // through LazyJavaClassMemberScope@48
-    nestedClasses('toString': Name@17) = null // through LazyJavaClassMemberScope@48
-    properties('append': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@48
-    properties('toString': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@48
+    functions('append': Name@49) = ArrayList@50[14] { JavaMethodDescriptor@51['append'], JavaMethodDescriptor@52['append'], JavaMethodDescriptor@53['append'], ... } // through LazyJavaClassMemberScope@46
+    functions('toString': Name@54) = ArrayList@55[1] { JavaMethodDescriptor@56['toString'] } // through LazyJavaClassMemberScope@46
+    memberIndex = computeMemberIndex$1@57 // through LazyJavaClassMemberScope@46
+    nestedClassIndex = LinkedHashMap@58 // through LazyJavaClassMemberScope@46
+    nestedClasses('append': Name@49) = null // through LazyJavaClassMemberScope@46
+    nestedClasses('toString': Name@54) = null // through LazyJavaClassMemberScope@46
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@59['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
-LazyJavaClassTypeConstructor@19['AbstractStringBuilder'] {
+LazyJavaClassTypeConstructor@16['AbstractStringBuilder'] {
     parameters = ArrayList@61[empty]
     supertypes = ArrayList@62[2] { LazyJavaClassifierType@63['Appendable'], LazyJavaClassifierType@64['CharSequence'] }
 }
 
-LazyJavaClassTypeConstructor@33['Appendable'] {
+LazyJavaClassTypeConstructor@30['Appendable'] {
     parameters = ArrayList@65[empty]
     supertypes = ArrayList@66[1] { JetTypeImpl@67['Any'] }
 }
 
-LazyJavaClassTypeConstructor@40['Serializable'] {
+LazyJavaClassTypeConstructor@38['Serializable'] {
     parameters = ArrayList@68[empty]
     supertypes = ArrayList@69[1] { JetTypeImpl@67['Any'] }
 }
 
-LazyJavaClassTypeConstructor@42['StringBuffer'] {
+LazyJavaClassTypeConstructor@40['StringBuffer'] {
     parameters = ArrayList@70[empty]
     supertypes = ArrayList@71[3] { LazyJavaClassifierType@72['AbstractStringBuilder'], LazyJavaClassifierType@73['Serializable'], LazyJavaClassifierType@74['CharSequence'] }
 }
@@ -86,254 +78,254 @@ LazyJavaClassifierType@77['AbstractStringBuilder'] {
     arguments = ArrayList@80[empty]
     classifier = JavaClassImpl@81['AbstractStringBuilder']
     memberScope = LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@82['AbstractStringBuilder'] {
     arguments = ArrayList@83[empty]
     classifier = JavaClassImpl@84['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@86['AbstractStringBuilder'] {
     arguments = ArrayList@87[empty]
     classifier = JavaClassImpl@88['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@89['AbstractStringBuilder'] {
     arguments = ArrayList@90[empty]
     classifier = JavaClassImpl@91['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@92['AbstractStringBuilder'] {
     arguments = ArrayList@93[empty]
     classifier = JavaClassImpl@94['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@95['AbstractStringBuilder'] {
     arguments = ArrayList@96[empty]
     classifier = JavaClassImpl@97['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@98['AbstractStringBuilder'] {
     arguments = ArrayList@99[empty]
     classifier = JavaClassImpl@100['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@101['AbstractStringBuilder'] {
     arguments = ArrayList@102[empty]
     classifier = JavaClassImpl@103['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@104['AbstractStringBuilder'] {
     arguments = ArrayList@105[empty]
     classifier = JavaClassImpl@106['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@107['AbstractStringBuilder'] {
     arguments = ArrayList@108[empty]
     classifier = JavaClassImpl@109['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@110['AbstractStringBuilder'] {
     arguments = ArrayList@111[empty]
     classifier = JavaClassImpl@112['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@113['AbstractStringBuilder'] {
     arguments = ArrayList@114[empty]
     classifier = JavaClassImpl@115['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@116['AbstractStringBuilder'] {
     arguments = ArrayList@117[empty]
     classifier = JavaClassImpl@118['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@119['AbstractStringBuilder'] {
     arguments = ArrayList@120[empty]
     classifier = JavaClassImpl@121['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@122['AbstractStringBuilder'] {
     arguments = ArrayList@123[empty]
-    classifier = JavaClassImpl@118['AbstractStringBuilder']
+    classifier = JavaClassImpl@106['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@125['AbstractStringBuilder'] {
     arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@97['AbstractStringBuilder']
+    classifier = JavaClassImpl@88['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@127['AbstractStringBuilder'] {
     arguments = ArrayList@128[empty]
-    classifier = JavaClassImpl@103['AbstractStringBuilder']
+    classifier = JavaClassImpl@118['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@129['AbstractStringBuilder'] {
     arguments = ArrayList@130[empty]
-    classifier = JavaClassImpl@112['AbstractStringBuilder']
+    classifier = JavaClassImpl@84['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@131['AbstractStringBuilder'] {
     arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@115['AbstractStringBuilder']
+    classifier = JavaClassImpl@109['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@133['AbstractStringBuilder'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaClassImpl@100['AbstractStringBuilder']
+    classifier = JavaClassImpl@121['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@135['AbstractStringBuilder'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaClassImpl@109['AbstractStringBuilder']
+    classifier = JavaClassImpl@100['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@137['AbstractStringBuilder'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaClassImpl@94['AbstractStringBuilder']
+    classifier = JavaClassImpl@103['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@139['AbstractStringBuilder'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaClassImpl@121['AbstractStringBuilder']
+    classifier = JavaClassImpl@94['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@141['AbstractStringBuilder'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaClassImpl@88['AbstractStringBuilder']
+    classifier = JavaClassImpl@112['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@143['AbstractStringBuilder'] {
     arguments = ArrayList@144[empty]
-    classifier = JavaClassImpl@106['AbstractStringBuilder']
+    classifier = JavaClassImpl@97['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@145['AbstractStringBuilder'] {
     arguments = ArrayList@146[empty]
-    classifier = JavaClassImpl@91['AbstractStringBuilder']
+    classifier = JavaClassImpl@115['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@147['AbstractStringBuilder'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaClassImpl@84['AbstractStringBuilder']
+    classifier = JavaClassImpl@91['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@72['AbstractStringBuilder'] {
     arguments = ArrayList@149[empty]
     classifier = JavaClassImpl@150['AbstractStringBuilder']
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@63['Appendable'] {
     arguments = ArrayList@151[empty]
     classifier = JavaClassImpl@152['Appendable']
-    memberScope = LazyJavaClassMemberScope@27
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    memberScope = LazyJavaClassMemberScope@24
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@153['Appendable'] {
     arguments = ArrayList@154[empty]
     classifier = JavaClassImpl@155['Appendable']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@156['Appendable'] {
     arguments = ArrayList@157[empty]
     classifier = JavaClassImpl@158['Appendable']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@159['Appendable'] {
     arguments = ArrayList@160[empty]
     classifier = JavaClassImpl@161['Appendable']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@162['Appendable'] {
     arguments = ArrayList@163[empty]
     classifier = JavaClassImpl@161['Appendable']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@164['Appendable'] {
     arguments = ArrayList@165[empty]
     classifier = JavaClassImpl@158['Appendable']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@166['Appendable'] {
     arguments = ArrayList@167[empty]
     classifier = JavaClassImpl@155['Appendable']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
-LazyJavaClassifierType@64['CharSequence'] {
+LazyJavaClassifierType@79['CharSequence'] {
     arguments = ArrayList@168[empty]
     classifier = JavaClassImpl@169['CharSequence']
     memberScope = DeserializedClassMemberScope@170
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
-LazyJavaClassifierType@79['CharSequence'] {
+LazyJavaClassifierType@64['CharSequence'] {
     arguments = ArrayList@172[empty]
     classifier = JavaClassImpl@173['CharSequence']
     memberScope = DeserializedClassMemberScope@170
@@ -398,42 +390,42 @@ LazyJavaClassifierType@195['CharSequence'] {
 
 LazyJavaClassifierType@197['CharSequence'] {
     arguments = ArrayList@198[empty]
-    classifier = JavaClassImpl@185['CharSequence']
+    classifier = JavaClassImpl@194['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@199['CharSequence'] {
     arguments = ArrayList@200[empty]
-    classifier = JavaClassImpl@194['CharSequence']
+    classifier = JavaClassImpl@179['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@201['CharSequence'] {
     arguments = ArrayList@202[empty]
-    classifier = JavaClassImpl@179['CharSequence']
+    classifier = JavaClassImpl@185['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@203['CharSequence'] {
     arguments = ArrayList@204[empty]
-    classifier = JavaClassImpl@191['CharSequence']
+    classifier = JavaClassImpl@176['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@205['CharSequence'] {
     arguments = ArrayList@206[empty]
-    classifier = JavaClassImpl@188['CharSequence']
+    classifier = JavaClassImpl@191['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@207['CharSequence'] {
     arguments = ArrayList@208[empty]
-    classifier = JavaClassImpl@176['CharSequence']
+    classifier = JavaClassImpl@188['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
@@ -489,13 +481,13 @@ LazyJavaClassifierType@225['Object'] {
 LazyJavaClassifierType@78['Serializable'] {
     arguments = ArrayList@227[empty]
     classifier = JavaClassImpl@228['Serializable']
-    memberScope = LazyJavaClassMemberScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@40['Serializable']
+    memberScope = LazyJavaClassMemberScope@34
+    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
 }
 
 LazyJavaClassifierType@73['Serializable'] {
     classifier = JavaClassImpl@229['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@40['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
 }
 
 LazyJavaClassifierType@230['String'] {
@@ -535,28 +527,28 @@ LazyJavaClassifierType@243['String'] {
 
 LazyJavaClassifierType@246['String'] {
     arguments = ArrayList@247[empty]
-    classifier = JavaClassImpl@236['String']
+    classifier = JavaClassImpl@242['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
 
 LazyJavaClassifierType@248['String'] {
     arguments = ArrayList@249[empty]
-    classifier = JavaClassImpl@239['String']
+    classifier = JavaClassImpl@236['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
 
 LazyJavaClassifierType@250['String'] {
     arguments = ArrayList@251[empty]
-    classifier = JavaClassImpl@242['String']
+    classifier = JavaClassImpl@245['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
 
 LazyJavaClassifierType@252['String'] {
     arguments = ArrayList@253[empty]
-    classifier = JavaClassImpl@245['String']
+    classifier = JavaClassImpl@239['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
@@ -572,28 +564,28 @@ LazyJavaClassifierType@256['StringBuffer'] {
     arguments = ArrayList@257[empty]
     classifier = JavaClassImpl@258['StringBuffer']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@42['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
 LazyJavaClassifierType@259['StringBuffer'] {
     arguments = ArrayList@260[empty]
     classifier = JavaClassImpl@261['StringBuffer']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@42['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
 LazyJavaClassifierType@262['StringBuffer'] {
     arguments = ArrayList@263[empty]
-    classifier = JavaClassImpl@258['StringBuffer']
+    classifier = JavaClassImpl@261['StringBuffer']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@42['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
 LazyJavaClassifierType@264['StringBuffer'] {
     arguments = ArrayList@265[empty]
-    classifier = JavaClassImpl@261['StringBuffer']
+    classifier = JavaClassImpl@258['StringBuffer']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@42['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
 LazyJavaClassifierType@266['StringBuilder'] {
@@ -703,105 +695,105 @@ LazyJavaClassifierType@308['StringBuilder'] {
 
 LazyJavaClassifierType@311['StringBuilder'] {
     arguments = ArrayList@312[empty]
-    classifier = JavaClassImpl@271['StringBuilder']
+    classifier = JavaClassImpl@274['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@313['StringBuilder'] {
     arguments = ArrayList@314[empty]
-    classifier = JavaClassImpl@310['StringBuilder']
+    classifier = JavaClassImpl@283['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@315['StringBuilder'] {
     arguments = ArrayList@316[empty]
-    classifier = JavaClassImpl@301['StringBuilder']
+    classifier = JavaClassImpl@304['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@317['StringBuilder'] {
     arguments = ArrayList@318[empty]
-    classifier = JavaClassImpl@292['StringBuilder']
+    classifier = JavaClassImpl@286['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@319['StringBuilder'] {
     arguments = ArrayList@320[empty]
-    classifier = JavaClassImpl@289['StringBuilder']
+    classifier = JavaClassImpl@301['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@321['StringBuilder'] {
     arguments = ArrayList@322[empty]
-    classifier = JavaClassImpl@280['StringBuilder']
+    classifier = JavaClassImpl@298['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@323['StringBuilder'] {
     arguments = ArrayList@324[empty]
-    classifier = JavaClassImpl@268['StringBuilder']
+    classifier = JavaClassImpl@271['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@325['StringBuilder'] {
     arguments = ArrayList@326[empty]
-    classifier = JavaClassImpl@304['StringBuilder']
+    classifier = JavaClassImpl@307['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@327['StringBuilder'] {
     arguments = ArrayList@328[empty]
-    classifier = JavaClassImpl@274['StringBuilder']
+    classifier = JavaClassImpl@295['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@329['StringBuilder'] {
     arguments = ArrayList@330[empty]
-    classifier = JavaClassImpl@286['StringBuilder']
+    classifier = JavaClassImpl@280['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@331['StringBuilder'] {
     arguments = ArrayList@332[empty]
-    classifier = JavaClassImpl@298['StringBuilder']
+    classifier = JavaClassImpl@268['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@333['StringBuilder'] {
     arguments = ArrayList@334[empty]
-    classifier = JavaClassImpl@295['StringBuilder']
+    classifier = JavaClassImpl@310['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@335['StringBuilder'] {
     arguments = ArrayList@336[empty]
-    classifier = JavaClassImpl@283['StringBuilder']
+    classifier = JavaClassImpl@292['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@337['StringBuilder'] {
     arguments = ArrayList@338[empty]
-    classifier = JavaClassImpl@307['StringBuilder']
+    classifier = JavaClassImpl@277['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@339['StringBuilder'] {
     arguments = ArrayList@340[empty]
-    classifier = JavaClassImpl@277['StringBuilder']
+    classifier = JavaClassImpl@289['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
@@ -827,52 +819,161 @@ LazyJavaPackageFragmentProvider@341 {
     packageFragments('kotlin.tailRecursive': FqName@363) = null
     packageFragments('tailRecursive': FqName@364) = null
     topLevelClasses(JavaClassImpl@81['AbstractStringBuilder']) = LazyJavaClassDescriptor@3['AbstractStringBuilder']
-    topLevelClasses(JavaClassImpl@152['Appendable']) = LazyJavaClassDescriptor@20['Appendable']
-    topLevelClasses(JavaClassImpl@228['Serializable']) = LazyJavaClassDescriptor@34['Serializable']
-    topLevelClasses(JavaClassImpl@258['StringBuffer']) = LazyJavaClassDescriptor@41['StringBuffer']
-    topLevelClasses(JavaClassImpl@365['StringBuilder']) = LazyJavaClassDescriptor@43['StringBuilder']
+    topLevelClasses(JavaClassImpl@152['Appendable']) = LazyJavaClassDescriptor@17['Appendable']
+    topLevelClasses(JavaClassImpl@228['Serializable']) = LazyJavaClassDescriptor@31['Serializable']
+    topLevelClasses(JavaClassImpl@261['StringBuffer']) = LazyJavaClassDescriptor@39['StringBuffer']
+    topLevelClasses(JavaClassImpl@365['StringBuilder']) = LazyJavaClassDescriptor@41['StringBuilder']
 }
 
 LazyJavaPackageFragment@343['<root>'] {
     classes('Int': Name@366) = null // through LazyPackageFragmentScopeForJavaPackage@367
     classes('String': Name@368) = null // through LazyPackageFragmentScopeForJavaPackage@367
     classes('StringBuilder': Name@369) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    classes('append': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    classes('equals': Name@370) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    classes('minus': Name@371) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    classes('repeat': Name@372) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    classes('tailRecursive': Name@373) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    classes('toString': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    deserializedPackageScope = Empty@374 // through LazyPackageFragmentScopeForJavaPackage@367
-    functions('StringBuilder': Name@375) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@367
-    functions('append': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@367
-    functions('equals': Name@370) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@367
-    functions('minus': Name@371) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@367
-    functions('repeat': Name@372) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@367
-    functions('toString': Name@17) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@367
-    memberIndex = computeMemberIndex$1@376 // through LazyPackageFragmentScopeForJavaPackage@367
+    classes('repeat': Name@370) = null // through LazyPackageFragmentScopeForJavaPackage@367
+    classes('tailRecursive': Name@371) = null // through LazyPackageFragmentScopeForJavaPackage@367
+    deserializedPackageScope = Empty@372 // through LazyPackageFragmentScopeForJavaPackage@367
+    functions('StringBuilder': Name@373) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@367
+    functions('repeat': Name@370) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@367
+    memberIndex = computeMemberIndex$1@374 // through LazyPackageFragmentScopeForJavaPackage@367
 }
 
 LazyJavaPackageFragment@348['java'] {
-    classes('lang': Name@377) = null // through LazyPackageFragmentScopeForJavaPackage@378
-    deserializedPackageScope = Empty@374 // through LazyPackageFragmentScopeForJavaPackage@378
-    functions('lang': Name@379) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@378
-    memberIndex = computeMemberIndex$1@380 // through LazyPackageFragmentScopeForJavaPackage@378
+    classes('lang': Name@375) = null // through LazyPackageFragmentScopeForJavaPackage@376
+    deserializedPackageScope = Empty@372 // through LazyPackageFragmentScopeForJavaPackage@376
+    functions('lang': Name@377) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@376
+    memberIndex = computeMemberIndex$1@378 // through LazyPackageFragmentScopeForJavaPackage@376
 }
 
 LazyJavaPackageFragment@352['lang'] {
-    classes('StringBuilder': Name@369) = LazyJavaClassDescriptor@43['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@381
-    classes('append': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@381
-    classes('equals': Name@370) = null // through LazyPackageFragmentScopeForJavaPackage@381
-    classes('minus': Name@371) = null // through LazyPackageFragmentScopeForJavaPackage@381
-    classes('repeat': Name@372) = null // through LazyPackageFragmentScopeForJavaPackage@381
-    classes('toString': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@381
-    deserializedPackageScope = Empty@374 // through LazyPackageFragmentScopeForJavaPackage@381
-    functions('StringBuilder': Name@375) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@381
-    functions('append': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@381
-    functions('equals': Name@370) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@381
-    functions('minus': Name@371) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@381
-    functions('repeat': Name@372) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@381
-    functions('toString': Name@17) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@381
-    memberIndex = computeMemberIndex$1@382 // through LazyPackageFragmentScopeForJavaPackage@381
+    classes('StringBuilder': Name@369) = LazyJavaClassDescriptor@41['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@379
+    classes('repeat': Name@370) = null // through LazyPackageFragmentScopeForJavaPackage@379
+    deserializedPackageScope = Empty@372 // through LazyPackageFragmentScopeForJavaPackage@379
+    functions('StringBuilder': Name@373) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@379
+    functions('repeat': Name@370) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@379
+    memberIndex = computeMemberIndex$1@380 // through LazyPackageFragmentScopeForJavaPackage@379
+}
+
+ResolutionTaskHolder@381 {
+    <name not found> = ArrayList@382[13] { ResolutionCandidate@383, ResolutionCandidate@384, ResolutionCandidate@385, ... }
+    <name not found> = ArrayList@386[14] { ResolutionCandidate@383, ResolutionCandidate@384, ResolutionCandidate@387, ... }
+}
+
+ResolutionTaskHolder@388 {
+    <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@390 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@392 {
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@394 }
+    <name not found> = ArrayList@395[1] { ResolutionCandidate@394 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@396 {
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
+    <name not found> = ArrayList@399[1] { ResolutionCandidate@398 }
+}
+
+ResolutionTaskHolder@400 {
+    <name not found> = ArrayList@401[1] { ResolutionCandidate@402 }
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@402 }
+}
+
+ResolutionTaskHolder@404 {
+    <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
+    <name not found> = ArrayList@407[1] { ResolutionCandidate@406 }
+}
+
+ResolutionTaskHolder@408 {
+    <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
+    <name not found> = ArrayList@411[1] { ResolutionCandidate@410 }
+}
+
+ResolutionTaskHolder@412 {
+    <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@414 }
+}
+
+ResolutionTaskHolder@416 {
+    <name not found> = ArrayList@417[1] { ResolutionCandidate@418 }
+    <name not found> = ArrayList@419[1] { ResolutionCandidate@418 }
+}
+
+ResolutionTaskHolder@420 {
+    <name not found> = ArrayList@421[1] { ResolutionCandidate@422 }
+    <name not found> = ArrayList@423[1] { ResolutionCandidate@422 }
+}
+
+ResolutionTaskHolder@424 {
+    <name not found> = ArrayList@425[1] { ResolutionCandidate@426 }
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@426 }
+}
+
+ResolutionTaskHolder@428 {
+    <name not found> = ArrayList@429[1] { ResolutionCandidate@430 }
+    <name not found> = ArrayList@431[1] { ResolutionCandidate@430 }
+}
+
+ResolutionTaskHolder@432 {
+    <name not found> = ArrayList@433[1] { ResolutionCandidate@434 }
+    <name not found> = ArrayList@435[1] { ResolutionCandidate@434 }
+}
+
+ResolutionTaskHolder@436 {
+    <name not found> = ArrayList@437[1] { ResolutionCandidate@438 }
+    <name not found> = ArrayList@439[1] { ResolutionCandidate@438 }
+}
+
+ResolutionTaskHolder@440 {
+    <name not found> = ArrayList@441[1] { ResolutionCandidate@442 }
+    <name not found> = ArrayList@443[1] { ResolutionCandidate@442 }
+}
+
+ResolutionTaskHolder@444 {
+    <name not found> = ArrayList@445[1] { ResolutionCandidate@446 }
+    <name not found> = ArrayList@447[1] { ResolutionCandidate@446 }
+}
+
+ResolutionTaskHolder@448 {
+    <name not found> = ArrayList@449[1] { ResolutionCandidate@450 }
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@450 }
+}
+
+ResolutionTaskHolder@452 {
+    <name not found> = ArrayList@453[4] { ResolutionCandidate@454, ResolutionCandidate@455, ResolutionCandidate@456, ... }
+    <name not found> = ArrayList@457[4] { ResolutionCandidate@454, ResolutionCandidate@455, ResolutionCandidate@456, ... }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@458 {
+    <name not found> = ArrayList@459[8] { ResolutionCandidate@460, ResolutionCandidate@461, ResolutionCandidate@462, ... }
+    <name not found> = ArrayList@463[8] { ResolutionCandidate@460, ResolutionCandidate@461, ResolutionCandidate@462, ... }
 }