Update lazy.log files

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject1.lazy.log

@@ -19,29 +19,52 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('A': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('equals': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('invoke': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('A': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('A': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('equals': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('invoke': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('A': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject2.lazy.log

@@ -22,29 +22,58 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('A': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('A': Name@20) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('equals': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('invoke': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('A': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('invoke': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@21
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('A': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('A': Name@20) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('equals': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('invoke': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('A': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('A': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('invoke': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+}
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
 }

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.lazy.log

@@ -20,26 +20,60 @@ LazyJavaPackageFragmentProvider@3 {
 
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.lazy.log

@@ -20,30 +20,53 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('Nested': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('A': Name@17) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('Nested': Name@25) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('A': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('Nested': Name@23) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('Nested': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('Nested': Name@25) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('Nested': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('Nested': Name@23) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
 }

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.lazy.log

@@ -20,26 +20,60 @@ LazyJavaPackageFragmentProvider@3 {
 
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
 }

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.lazy.log

@@ -20,26 +20,68 @@ LazyJavaPackageFragmentProvider@3 {
 
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('invoke': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('invoke': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+}
+
+ResolutionTaskHolder@51 {
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.lazy.log

@@ -20,30 +20,53 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('ONE': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('A': Name@17) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('ONE': Name@25) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('A': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('ONE': Name@23) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('ONE': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('ONE': Name@25) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('ONE': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('ONE': Name@23) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+}
+
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
 }

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.lazy.log

@@ -22,30 +22,59 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('A': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('ONE': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('A': Name@19) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('ONE': Name@27) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('A': Name@19) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('ONE': Name@26) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('invoke': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('lang': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('ONE': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('ONE': Name@27) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('equals': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('invoke': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('ONE': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('ONE': Name@26) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('invoke': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
 }

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject1.lazy.log

@@ -21,29 +21,58 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('A': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('A': Name@19) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('A': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('A': Name@19) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('equals': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('invoke': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('A': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('A': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+}
+
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject2.lazy.log

@@ -19,29 +19,52 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('A': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('equals': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('invoke': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('A': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('A': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('equals': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('invoke': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('A': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }

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

@@ -61,14 +61,14 @@ LazyJavaClassifierType@33['String'] {
 
 LazyJavaClassifierType@36['String'] {
     arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@35['String']
+    classifier = JavaClassImpl@30['String']
     nullable = 'true': Boolean@38
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@39['String'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@30['String']
+    classifier = JavaClassImpl@35['String']
     nullable = 'true': Boolean@38
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -89,14 +89,14 @@ LazyJavaClassifierType@45['Throwable'] {
 
 LazyJavaClassifierType@48['Throwable'] {
     arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@47['Throwable']
+    classifier = JavaClassImpl@43['Throwable']
     nullable = 'true': Boolean@38
     typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaClassifierType@50['Throwable'] {
     arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@43['Throwable']
+    classifier = JavaClassImpl@47['Throwable']
     nullable = 'true': Boolean@38
     typeConstructor = DeserializedClassTypeConstructor@44
 }
@@ -136,42 +136,93 @@ LazyJavaPackageFragment@56['<root>'] {
     classes('IllegalArgumentException': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@78
     classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@78
     classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('compareTo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('equals': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('minus': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('not': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('tailRecursive': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('test': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('IllegalArgumentException': Name@79) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('compareTo': Name@82) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('equals': Name@83) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('minus': Name@84) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('not': Name@85) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('test': Name@87) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('tailRecursive': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('test': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('IllegalArgumentException': Name@79) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('test': Name@83) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@78
 }
 
 LazyJavaPackageFragment@61['java'] {
-    classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('lang': Name@93) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('lang': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('lang': Name@89) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@88
 }
 
 LazyJavaPackageFragment@63['lang'] {
-    classes('IllegalArgumentException': Name@79) = LazyJavaClassDescriptor@5['IllegalArgumentException'] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('compareTo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('equals': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('minus': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('not': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('test': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('IllegalArgumentException': Name@79) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('compareTo': Name@82) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('equals': Name@83) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('minus': Name@84) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('not': Name@85) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('test': Name@87) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('IllegalArgumentException': Name@79) = LazyJavaClassDescriptor@5['IllegalArgumentException'] // through LazyPackageFragmentScopeForJavaPackage@91
+    classes('test': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@91
+    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@91
+    functions('IllegalArgumentException': Name@79) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@91
+    functions('test': Name@83) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@91
+    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@91
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+}
+
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+}
+
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[4] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
+    <name not found> = ArrayList@130[4] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+    <name not found> = EmptyList@85[empty]
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
+    <name not found> = ArrayList@136[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
+}
+
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[8] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
+    <name not found> = ArrayList@142[8] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
 }

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

@@ -24,31 +24,68 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('foo': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('minus': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('foo': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+    <name not found> = ArrayList@65[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
 }

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

@@ -40,3 +40,17 @@ LazyJavaPackageFragment@10['lang'] {
     functions('noTails': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+}

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

@@ -34,39 +34,169 @@ LazyJavaPackageFragment@10['<root>'] {
     classes('Int': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
     classes('String': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
     classes('badTails': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('compareTo': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('equals': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('minus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('plus': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('suppress': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('tailRecursive': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('badTails': Name@33) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('compareTo': Name@34) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('equals': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('minus': Name@36) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('plus': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('suppress': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('tailRecursive': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('badTails': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
 }
 
 LazyJavaPackageFragment@16['lang'] {
-    classes('badTails': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('compareTo': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('equals': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('minus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('plus': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('badTails': Name@33) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('compareTo': Name@34) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('equals': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('minus': Name@36) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('plus': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('badTails': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('badTails': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+}
+
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[7] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
+    <name not found> = ArrayList@122[7] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
+}
+
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[7] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127, ... }
+    <name not found> = ArrayList@128[7] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127, ... }
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[7] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
+    <name not found> = ArrayList@134[7] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
+}
+
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[8] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
+    <name not found> = ArrayList@140[8] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
+}
+
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[8] { ResolutionCandidate@143, ResolutionCandidate@144, ResolutionCandidate@145, ... }
+    <name not found> = ArrayList@146[8] { ResolutionCandidate@143, ResolutionCandidate@144, ResolutionCandidate@145, ... }
+}
+
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[8] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
+    <name not found> = ArrayList@152[8] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
+}
+
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[8] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
+    <name not found> = ArrayList@158[8] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
+}
+
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[8] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163, ... }
+    <name not found> = ArrayList@164[8] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163, ... }
 }

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

@@ -20,38 +20,80 @@ LazyJavaPackageFragmentProvider@1 {
 LazyJavaPackageFragment@3['<root>'] {
     classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('String': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('compareTo': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('minus': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('plus': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('withoutAnnotation': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('compareTo': Name@20) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('equals': Name@21) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('minus': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('plus': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('withoutAnnotation': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('withoutAnnotation': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('withoutAnnotation': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('compareTo': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('minus': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('plus': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('withoutAnnotation': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('compareTo': Name@20) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('equals': Name@21) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('minus': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('plus': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('withoutAnnotation': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('withoutAnnotation': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('withoutAnnotation': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+}
+
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
+    <name not found> = ArrayList@63[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[8] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
+    <name not found> = ArrayList@69[8] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[8] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
+    <name not found> = ArrayList@75[8] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
 }

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

@@ -24,35 +24,73 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[7] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+    <name not found> = ArrayList@65[7] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
+    <name not found> = ArrayList@71[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
 }

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

@@ -28,31 +28,73 @@ LazyJavaPackageFragmentProvider@4 {
 LazyJavaPackageFragment@6['<root>'] {
     classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('foo': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('minus': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('tailRecursive': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('foo': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('foo': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('foo': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[8] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
+    <name not found> = ArrayList@70[8] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
 }

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

@@ -24,35 +24,132 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('equals': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('test': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = ArrayList@97[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+    <name not found> = ArrayList@103[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[8] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
+    <name not found> = ArrayList@109[8] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[8] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+    <name not found> = ArrayList@115[8] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
 }

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

@@ -39,45 +39,112 @@ LazyJavaPackageFragment@8['<root>'] {
     classes('C': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
     classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
     classes('String': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('compareTo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('h': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('h2': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('makeC': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('minus': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('tailRecursive': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('B': Name@34) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('C': Name@35) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('compareTo': Name@38) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('h': Name@39) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('h2': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('makeC': Name@41) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('minus': Name@42) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('tailRecursive': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('B': Name@34) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('C': Name@35) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('lang': Name@49) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('lang': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('lang': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
 }
 
 LazyJavaPackageFragment@17['lang'] {
-    classes('B': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('C': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('compareTo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('h': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('h2': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('makeC': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('minus': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('B': Name@34) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('C': Name@35) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('compareTo': Name@38) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('h': Name@39) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('h2': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('makeC': Name@41) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('minus': Name@42) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('B': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('C': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('B': Name@34) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('C': Name@35) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[7] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
+    <name not found> = ArrayList@105[7] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[8] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
+    <name not found> = ArrayList@111[8] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
 }

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

@@ -24,35 +24,130 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = ArrayList@97[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[7] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+    <name not found> = ArrayList@103[7] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[7] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
+    <name not found> = ArrayList@109[7] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[8] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+    <name not found> = ArrayList@115[8] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[8] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
+    <name not found> = ArrayList@121[8] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
 }

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

@@ -24,39 +24,162 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('plus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('plus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[7] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+    <name not found> = ArrayList@113[7] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+    <name not found> = ArrayList@119[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[8] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+    <name not found> = ArrayList@125[8] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[8] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
+    <name not found> = ArrayList@131[8] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
+}
+
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[8] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
+    <name not found> = ArrayList@137[8] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
 }

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

@@ -42,59 +42,164 @@ LazyJavaPackageFragment@6['<root>'] {
     classes('Iterator': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('Long': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('String': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('equals': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foldFunction': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foldl': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('hasNext': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('invoke': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('iterator': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('next': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('not': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('plus': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('rangeTo': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('tailRecursive': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@40) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foldFunction': Name@41) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foldl': Name@42) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('hasNext': Name@43) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('invoke': Name@44) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('iterator': Name@45) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('next': Name@46) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('not': Name@47) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('plus': Name@48) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('rangeTo': Name@49) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('foldFunction': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('foldl': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('hasNext': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('next': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('tailRecursive': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('foldFunction': Name@40) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('foldl': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('hasNext': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('next': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@36
 }
 
 LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('lang': Name@56) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@49
+    functions('lang': Name@50) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@49
+    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
 }
 
 LazyJavaPackageFragment@16['lang'] {
-    classes('equals': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('foldFunction': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('foldl': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('hasNext': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('invoke': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('iterator': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('next': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('not': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('plus': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('rangeTo': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('equals': Name@40) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('foldFunction': Name@41) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('foldl': Name@42) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('hasNext': Name@43) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('invoke': Name@44) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('iterator': Name@45) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('next': Name@46) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('not': Name@47) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('plus': Name@48) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('rangeTo': Name@49) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('foldFunction': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('foldl': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('hasNext': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('next': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('foldFunction': Name@40) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('foldl': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('hasNext': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('next': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+}
+
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+}
+
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[7] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
+    <name not found> = ArrayList@135[7] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
+    <name not found> = ArrayList@141[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
 }

compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.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,244 +78,244 @@ 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@100['AbstractStringBuilder']
+    classifier = JavaClassImpl@91['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@125['AbstractStringBuilder'] {
     arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@88['AbstractStringBuilder']
+    classifier = JavaClassImpl@103['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@127['AbstractStringBuilder'] {
     arguments = ArrayList@128[empty]
     classifier = JavaClassImpl@97['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@129['AbstractStringBuilder'] {
     arguments = ArrayList@130[empty]
-    classifier = JavaClassImpl@118['AbstractStringBuilder']
+    classifier = JavaClassImpl@109['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@131['AbstractStringBuilder'] {
     arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@106['AbstractStringBuilder']
+    classifier = JavaClassImpl@94['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@133['AbstractStringBuilder'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaClassImpl@121['AbstractStringBuilder']
+    classifier = JavaClassImpl@88['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@135['AbstractStringBuilder'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaClassImpl@94['AbstractStringBuilder']
+    classifier = JavaClassImpl@106['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@137['AbstractStringBuilder'] {
     arguments = ArrayList@138[empty]
     classifier = JavaClassImpl@115['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@139['AbstractStringBuilder'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaClassImpl@103['AbstractStringBuilder']
+    classifier = JavaClassImpl@118['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@141['AbstractStringBuilder'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaClassImpl@91['AbstractStringBuilder']
+    classifier = JavaClassImpl@121['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@143['AbstractStringBuilder'] {
     arguments = ArrayList@144[empty]
-    classifier = JavaClassImpl@109['AbstractStringBuilder']
+    classifier = JavaClassImpl@100['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@145['AbstractStringBuilder'] {
     arguments = ArrayList@146[empty]
     classifier = JavaClassImpl@112['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@147['AbstractStringBuilder'] {
     arguments = ArrayList@148[empty]
     classifier = JavaClassImpl@84['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@155['Appendable']
+    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@161['Appendable']
+    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@158['Appendable']
+    classifier = JavaClassImpl@155['Appendable']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@64['CharSequence'] {
@@ -391,49 +383,49 @@ LazyJavaClassifierType@192['CharSequence'] {
 
 LazyJavaClassifierType@195['CharSequence'] {
     arguments = ArrayList@196[empty]
-    classifier = JavaClassImpl@176['CharSequence']
+    classifier = JavaClassImpl@191['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@197['CharSequence'] {
     arguments = ArrayList@198[empty]
-    classifier = JavaClassImpl@194['CharSequence']
+    classifier = JavaClassImpl@179['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@199['CharSequence'] {
     arguments = ArrayList@200[empty]
-    classifier = JavaClassImpl@185['CharSequence']
+    classifier = JavaClassImpl@182['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@201['CharSequence'] {
     arguments = ArrayList@202[empty]
-    classifier = JavaClassImpl@188['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@188['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@205['CharSequence'] {
     arguments = ArrayList@206[empty]
-    classifier = JavaClassImpl@179['CharSequence']
+    classifier = JavaClassImpl@176['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@207['CharSequence'] {
     arguments = ArrayList@208[empty]
-    classifier = JavaClassImpl@182['CharSequence']
+    classifier = JavaClassImpl@194['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
@@ -459,14 +451,14 @@ LazyJavaClassifierType@214['Object'] {
 
 LazyJavaClassifierType@217['Object'] {
     arguments = ArrayList@218[empty]
-    classifier = JavaClassImpl@216['Object']
+    classifier = JavaClassImpl@212['Object']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@213
 }
 
 LazyJavaClassifierType@219['Object'] {
     arguments = ArrayList@220[empty]
-    classifier = JavaClassImpl@212['Object']
+    classifier = JavaClassImpl@216['Object']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@213
 }
@@ -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,35 +527,35 @@ LazyJavaClassifierType@243['String'] {
 
 LazyJavaClassifierType@246['String'] {
     arguments = ArrayList@247[empty]
-    classifier = JavaClassImpl@245['String']
+    classifier = JavaClassImpl@242['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
 
 LazyJavaClassifierType@248['String'] {
     arguments = ArrayList@249[empty]
-    classifier = JavaClassImpl@236['String']
+    classifier = JavaClassImpl@232['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
 
 LazyJavaClassifierType@250['String'] {
     arguments = ArrayList@251[empty]
-    classifier = JavaClassImpl@242['String']
+    classifier = JavaClassImpl@239['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
 
 LazyJavaClassifierType@252['String'] {
     arguments = ArrayList@253[empty]
-    classifier = JavaClassImpl@239['String']
+    classifier = JavaClassImpl@245['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
 
 LazyJavaClassifierType@254['String'] {
     arguments = ArrayList@255[empty]
-    classifier = JavaClassImpl@232['String']
+    classifier = JavaClassImpl@236['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@261['StringBuffer']
+    classifier = JavaClassImpl@258['StringBuffer']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@42['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
 LazyJavaClassifierType@264['StringBuffer'] {
     arguments = ArrayList@265[empty]
-    classifier = JavaClassImpl@258['StringBuffer']
+    classifier = JavaClassImpl@261['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@280['StringBuilder']
+    classifier = JavaClassImpl@286['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@313['StringBuilder'] {
     arguments = ArrayList@314[empty]
-    classifier = JavaClassImpl@301['StringBuilder']
+    classifier = JavaClassImpl@292['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@315['StringBuilder'] {
     arguments = ArrayList@316[empty]
-    classifier = JavaClassImpl@283['StringBuilder']
+    classifier = JavaClassImpl@307['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@317['StringBuilder'] {
     arguments = ArrayList@318[empty]
-    classifier = JavaClassImpl@277['StringBuilder']
+    classifier = JavaClassImpl@289['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@319['StringBuilder'] {
     arguments = ArrayList@320[empty]
-    classifier = JavaClassImpl@304['StringBuilder']
+    classifier = JavaClassImpl@277['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@321['StringBuilder'] {
     arguments = ArrayList@322[empty]
-    classifier = JavaClassImpl@286['StringBuilder']
+    classifier = JavaClassImpl@298['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@323['StringBuilder'] {
     arguments = ArrayList@324[empty]
-    classifier = JavaClassImpl@295['StringBuilder']
+    classifier = JavaClassImpl@271['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@325['StringBuilder'] {
     arguments = ArrayList@326[empty]
-    classifier = JavaClassImpl@271['StringBuilder']
+    classifier = JavaClassImpl@301['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@327['StringBuilder'] {
     arguments = ArrayList@328[empty]
-    classifier = JavaClassImpl@298['StringBuilder']
+    classifier = JavaClassImpl@274['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@329['StringBuilder'] {
     arguments = ArrayList@330[empty]
-    classifier = JavaClassImpl@274['StringBuilder']
+    classifier = JavaClassImpl@268['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@331['StringBuilder'] {
     arguments = ArrayList@332[empty]
-    classifier = JavaClassImpl@310['StringBuilder']
+    classifier = JavaClassImpl@295['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@333['StringBuilder'] {
     arguments = ArrayList@334[empty]
-    classifier = JavaClassImpl@307['StringBuilder']
+    classifier = JavaClassImpl@280['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@335['StringBuilder'] {
     arguments = ArrayList@336[empty]
-    classifier = JavaClassImpl@268['StringBuilder']
+    classifier = JavaClassImpl@310['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@337['StringBuilder'] {
     arguments = ArrayList@338[empty]
-    classifier = JavaClassImpl@292['StringBuilder']
+    classifier = JavaClassImpl@283['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@339['StringBuilder'] {
     arguments = ArrayList@340[empty]
-    classifier = JavaClassImpl@289['StringBuilder']
+    classifier = JavaClassImpl@304['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
@@ -830,10 +822,10 @@ LazyJavaPackageFragmentProvider@341 {
     packageFragments('kotlin.tailRecursive': FqName@366) = null
     packageFragments('tailRecursive': FqName@367) = null
     topLevelClasses(JavaClassImpl@81['AbstractStringBuilder']) = LazyJavaClassDescriptor@3['AbstractStringBuilder']
-    topLevelClasses(JavaClassImpl@152['Appendable']) = LazyJavaClassDescriptor@20['Appendable']
-    topLevelClasses(JavaClassImpl@228['Serializable']) = LazyJavaClassDescriptor@34['Serializable']
-    topLevelClasses(JavaClassImpl@261['StringBuffer']) = LazyJavaClassDescriptor@41['StringBuffer']
-    topLevelClasses(JavaClassImpl@368['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@368['StringBuilder']) = LazyJavaClassDescriptor@41['StringBuilder']
 }
 
 LazyJavaPackageFragment@343['<root>'] {
@@ -841,52 +833,188 @@ LazyJavaPackageFragment@343['<root>'] {
     classes('Int': Name@371) = null // through LazyPackageFragmentScopeForJavaPackage@370
     classes('String': Name@372) = null // through LazyPackageFragmentScopeForJavaPackage@370
     classes('StringBuilder': Name@373) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('append': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('equals': Name@374) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('escape': Name@375) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('escapeChar': Name@376) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('get': Name@377) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('length': Name@378) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('plus': Name@379) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('tailRecursive': Name@380) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('toString': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    deserializedPackageScope = Empty@381 // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('StringBuilder': Name@382) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('append': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('equals': Name@374) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('escape': Name@375) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('escapeChar': Name@376) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('get': Name@377) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('plus': Name@379) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('toString': Name@17) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    memberIndex = computeMemberIndex$1@383 // through LazyPackageFragmentScopeForJavaPackage@370
+    classes('escape': Name@374) = null // through LazyPackageFragmentScopeForJavaPackage@370
+    classes('escapeChar': Name@375) = null // through LazyPackageFragmentScopeForJavaPackage@370
+    classes('get': Name@376) = null // through LazyPackageFragmentScopeForJavaPackage@370
+    classes('length': Name@377) = null // through LazyPackageFragmentScopeForJavaPackage@370
+    classes('tailRecursive': Name@378) = null // through LazyPackageFragmentScopeForJavaPackage@370
+    deserializedPackageScope = Empty@379 // through LazyPackageFragmentScopeForJavaPackage@370
+    functions('StringBuilder': Name@380) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@370
+    functions('escape': Name@374) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@370
+    functions('escapeChar': Name@375) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@370
+    functions('get': Name@376) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@370
+    memberIndex = computeMemberIndex$1@381 // through LazyPackageFragmentScopeForJavaPackage@370
 }
 
 LazyJavaPackageFragment@349['java'] {
-    classes('lang': Name@384) = null // through LazyPackageFragmentScopeForJavaPackage@385
-    deserializedPackageScope = Empty@381 // through LazyPackageFragmentScopeForJavaPackage@385
-    functions('lang': Name@386) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@385
-    memberIndex = computeMemberIndex$1@387 // through LazyPackageFragmentScopeForJavaPackage@385
+    classes('lang': Name@382) = null // through LazyPackageFragmentScopeForJavaPackage@383
+    deserializedPackageScope = Empty@379 // through LazyPackageFragmentScopeForJavaPackage@383
+    functions('lang': Name@384) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@383
+    memberIndex = computeMemberIndex$1@385 // through LazyPackageFragmentScopeForJavaPackage@383
 }
 
 LazyJavaPackageFragment@353['lang'] {
-    classes('StringBuilder': Name@373) = LazyJavaClassDescriptor@43['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('append': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('equals': Name@374) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('escape': Name@375) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('escapeChar': Name@376) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('get': Name@377) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('length': Name@378) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('plus': Name@379) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('toString': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    deserializedPackageScope = Empty@381 // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('StringBuilder': Name@382) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('append': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('equals': Name@374) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('escape': Name@375) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('escapeChar': Name@376) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('get': Name@377) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('plus': Name@379) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('toString': Name@17) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    memberIndex = computeMemberIndex$1@389 // through LazyPackageFragmentScopeForJavaPackage@388
+    classes('StringBuilder': Name@373) = LazyJavaClassDescriptor@41['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@386
+    classes('escape': Name@374) = null // through LazyPackageFragmentScopeForJavaPackage@386
+    classes('escapeChar': Name@375) = null // through LazyPackageFragmentScopeForJavaPackage@386
+    classes('get': Name@376) = null // through LazyPackageFragmentScopeForJavaPackage@386
+    classes('length': Name@377) = null // through LazyPackageFragmentScopeForJavaPackage@386
+    deserializedPackageScope = Empty@379 // through LazyPackageFragmentScopeForJavaPackage@386
+    functions('StringBuilder': Name@380) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@386
+    functions('escape': Name@374) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@386
+    functions('escapeChar': Name@375) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@386
+    functions('get': Name@376) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@386
+    memberIndex = computeMemberIndex$1@387 // through LazyPackageFragmentScopeForJavaPackage@386
+}
+
+ResolutionTaskHolder@388 {
+    <name not found> = ArrayList@389[13] { ResolutionCandidate@390, ResolutionCandidate@391, ResolutionCandidate@392, ... }
+    <name not found> = ArrayList@393[14] { ResolutionCandidate@390, ResolutionCandidate@391, ResolutionCandidate@394, ... }
+}
+
+ResolutionTaskHolder@395 {
+    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
+    <name not found> = ArrayList@398[1] { ResolutionCandidate@397 }
+    <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@399 {
+    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
+    <name not found> = ArrayList@402[1] { ResolutionCandidate@401 }
+    <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@403 {
+    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
+    <name not found> = ArrayList@406[1] { ResolutionCandidate@405 }
+    <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@407 {
+    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
+    <name not found> = ArrayList@410[1] { ResolutionCandidate@409 }
+    <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@411 {
+    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
+    <name not found> = ArrayList@414[1] { ResolutionCandidate@413 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@415 {
+    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
+    <name not found> = ArrayList@418[1] { ResolutionCandidate@417 }
+}
+
+ResolutionTaskHolder@419 {
+    <name not found> = ArrayList@420[1] { ResolutionCandidate@421 }
+    <name not found> = ArrayList@422[1] { ResolutionCandidate@421 }
+}
+
+ResolutionTaskHolder@423 {
+    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
+    <name not found> = ArrayList@426[1] { ResolutionCandidate@425 }
+}
+
+ResolutionTaskHolder@427 {
+    <name not found> = ArrayList@428[1] { ResolutionCandidate@429 }
+    <name not found> = ArrayList@430[1] { ResolutionCandidate@429 }
+}
+
+ResolutionTaskHolder@431 {
+    <name not found> = ArrayList@432[1] { ResolutionCandidate@433 }
+    <name not found> = ArrayList@434[1] { ResolutionCandidate@433 }
+}
+
+ResolutionTaskHolder@435 {
+    <name not found> = ArrayList@436[1] { ResolutionCandidate@437 }
+    <name not found> = ArrayList@438[1] { ResolutionCandidate@437 }
+}
+
+ResolutionTaskHolder@439 {
+    <name not found> = ArrayList@440[1] { ResolutionCandidate@441 }
+    <name not found> = ArrayList@442[1] { ResolutionCandidate@441 }
+}
+
+ResolutionTaskHolder@443 {
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@445 }
+    <name not found> = ArrayList@446[1] { ResolutionCandidate@445 }
+}
+
+ResolutionTaskHolder@447 {
+    <name not found> = ArrayList@448[1] { ResolutionCandidate@449 }
+    <name not found> = ArrayList@450[1] { ResolutionCandidate@449 }
+}
+
+ResolutionTaskHolder@451 {
+    <name not found> = ArrayList@452[1] { ResolutionCandidate@453 }
+    <name not found> = ArrayList@454[1] { ResolutionCandidate@453 }
+}
+
+ResolutionTaskHolder@455 {
+    <name not found> = ArrayList@456[1] { ResolutionCandidate@457 }
+    <name not found> = ArrayList@458[1] { ResolutionCandidate@457 }
+}
+
+ResolutionTaskHolder@459 {
+    <name not found> = ArrayList@460[1] { ResolutionCandidate@461 }
+    <name not found> = ArrayList@462[1] { ResolutionCandidate@461 }
+}
+
+ResolutionTaskHolder@463 {
+    <name not found> = ArrayList@464[4] { ResolutionCandidate@465, ResolutionCandidate@466, ResolutionCandidate@467, ... }
+    <name not found> = ArrayList@468[4] { ResolutionCandidate@465, ResolutionCandidate@466, ResolutionCandidate@467, ... }
+    <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@469 {
+    <name not found> = ArrayList@470[8] { ResolutionCandidate@471, ResolutionCandidate@472, ResolutionCandidate@473, ... }
+    <name not found> = ArrayList@474[8] { ResolutionCandidate@471, ResolutionCandidate@472, ResolutionCandidate@473, ... }
 }

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, ... }
 }

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

@@ -48,3 +48,35 @@ LazyJavaPackageFragment@11['lang'] {
     functions('foo': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
     memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
 }
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+}

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

@@ -40,3 +40,26 @@ LazyJavaPackageFragment@10['lang'] {
     functions('foo': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+}

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

@@ -24,35 +24,71 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('g3': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('g3': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('g3': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('g3': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('g3': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('g3': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('g3': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('g3': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('test': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[7] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
+    <name not found> = ArrayList@66[7] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[8] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
+    <name not found> = ArrayList@72[8] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
 }

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

@@ -24,39 +24,139 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('plus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('plus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[7] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
+    <name not found> = ArrayList@101[7] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = ArrayList@107[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+    <name not found> = ArrayList@113[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+    <name not found> = ArrayList@119[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[8] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+    <name not found> = ArrayList@125[8] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
 }

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

@@ -38,21 +38,21 @@ LazyJavaClassifierType@22['String'] {
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@24['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@28['String'] {
     arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@24['String']
+    classifier = JavaClassImpl@16['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@30['String'] {
     arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@16['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -87,14 +87,14 @@ LazyJavaClassifierType@42['Throwable'] {
 
 LazyJavaClassifierType@44['Throwable'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@41['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@46['Throwable'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@41['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
@@ -131,34 +131,88 @@ LazyJavaPackageFragment@52['<root>'] {
     classes('Exception': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
     classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@74
     classes('String': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('minus': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('tailRecursive': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('test': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('Exception': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('equals': Name@77) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('minus': Name@78) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('test': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('tailRecursive': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('test': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('Exception': Name@80) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('test': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@74
 }
 
 LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('lang': Name@87) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('lang': Name@85) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
 }
 
 LazyJavaPackageFragment@59['lang'] {
-    classes('Exception': Name@73) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('minus': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('test': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('Exception': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('equals': Name@77) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('minus': Name@78) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('test': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('Exception': Name@73) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('test': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('Exception': Name@80) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('test': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+}
+
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[4] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
+    <name not found> = ArrayList@126[5] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+    <name not found> = EmptyList@81[empty]
+}
+
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
+    <name not found> = ArrayList@132[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
 }

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

@@ -24,31 +24,76 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('test': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('minus': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('test': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[8] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72, ... }
+    <name not found> = ArrayList@73[8] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72, ... }
 }

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

@@ -24,35 +24,91 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[7] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
+    <name not found> = ArrayList@77[7] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[8] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
+    <name not found> = ArrayList@83[8] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[8] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
+    <name not found> = ArrayList@89[8] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
 }

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

@@ -24,31 +24,66 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('foo': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('minus': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('foo': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+    <name not found> = ArrayList@65[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
 }

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

@@ -28,31 +28,81 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('Throwable': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('minus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('tailRecursive': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('test': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('minus': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('test': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('minus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('test': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('equals': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('minus': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('test': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
+    <name not found> = ArrayList@77[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[8] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
+    <name not found> = ArrayList@83[8] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
 }

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

@@ -24,39 +24,139 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('plus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('plus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[7] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
+    <name not found> = ArrayList@101[7] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = ArrayList@107[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+    <name not found> = ArrayList@113[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+    <name not found> = ArrayList@119[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[8] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+    <name not found> = ArrayList@125[8] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
 }

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

@@ -24,39 +24,110 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('plus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('plus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[7] { ResolutionCandidate@82, ResolutionCandidate@83, ResolutionCandidate@84, ... }
+    <name not found> = ArrayList@85[7] { ResolutionCandidate@82, ResolutionCandidate@83, ResolutionCandidate@84, ... }
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
+    <name not found> = ArrayList@91[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = ArrayList@97[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+    <name not found> = ArrayList@103[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
 }

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

@@ -24,35 +24,129 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('plus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('plus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[8] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
+    <name not found> = ArrayList@101[8] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = ArrayList@107[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+    <name not found> = ArrayList@113[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
 }

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

@@ -28,43 +28,128 @@ LazyJavaPackageFragmentProvider@4 {
 LazyJavaPackageFragment@6['<root>'] {
     classes('Long': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('invoke': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('plus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('sum': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('toLong': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('equals': Name@26) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('invoke': Name@27) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('minus': Name@28) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('plus': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('sum': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('toLong': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('sum': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('invoke': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('sum': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('invoke': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('plus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('sum': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('toLong': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('equals': Name@26) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('invoke': Name@27) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('minus': Name@28) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('plus': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('sum': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('toLong': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('sum': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('invoke': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('sum': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[8] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <name not found> = ArrayList@102[8] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
+    <name not found> = ArrayList@108[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
 }

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

@@ -25,31 +25,78 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('Unit': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('compareTo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('foo': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('compareTo': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('foo': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('foo': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[7] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
+    <name not found> = ArrayList@70[7] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[8] { ResolutionCandidate@73, ResolutionCandidate@74, ResolutionCandidate@75, ... }
+    <name not found> = ArrayList@76[8] { ResolutionCandidate@73, ResolutionCandidate@74, ResolutionCandidate@75, ... }
 }

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

@@ -24,31 +24,66 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('foo': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('minus': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('foo': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+    <name not found> = ArrayList@65[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
 }

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

@@ -48,28 +48,75 @@ LazyJavaPackageFragment@13['<root>'] {
     classes('Exception': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
     classes('String': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@38
     classes('Unit': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('not': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('tailRecursive': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('test': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('not': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('test': Name@44) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('tailRecursive': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('test': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('test': Name@43) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@38
 }
 
 LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('lang': Name@50) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('lang': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('lang': Name@49) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
 }
 
 LazyJavaPackageFragment@21['lang'] {
-    classes('Exception': Name@39) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('not': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('test': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('not': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('test': Name@44) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('Exception': Name@39) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('test': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('test': Name@43) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@51
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
 }

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

@@ -38,42 +38,138 @@ LazyJavaPackageFragment@11['<root>'] {
     classes('A': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
     classes('Int': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
     classes('String': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('compareTo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('f1': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('f2': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('f3': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('minus': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('tailRecursive': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('A': Name@31) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('compareTo': Name@35) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('f1': Name@36) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('f2': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('f3': Name@38) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('minus': Name@39) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('f2': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('tailRecursive': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('A': Name@31) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('f2': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@32
 }
 
 LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@46) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('lang': Name@42) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
 }
 
 LazyJavaPackageFragment@18['lang'] {
-    classes('A': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('compareTo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('f1': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('f2': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('f3': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('minus': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('A': Name@31) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('compareTo': Name@35) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('f1': Name@36) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('f2': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('f3': Name@38) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('minus': Name@39) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('A': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('f2': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('A': Name@31) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('f2': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[7] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+    <name not found> = ArrayList@115[7] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[7] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
+    <name not found> = ArrayList@121[7] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
+}
+
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[8] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126, ... }
+    <name not found> = ArrayList@127[8] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126, ... }
+}
+
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[8] { ResolutionCandidate@130, ResolutionCandidate@131, ResolutionCandidate@132, ... }
+    <name not found> = ArrayList@133[8] { ResolutionCandidate@130, ResolutionCandidate@131, ResolutionCandidate@132, ... }
 }

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

@@ -28,35 +28,197 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('Unit': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('compareTo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('minus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('tailRecursive': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('test': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('compareTo': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('minus': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('test': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('compareTo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('minus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('test': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('compareTo': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('equals': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('minus': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('test': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+}
+
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+}
+
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[7] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
+    <name not found> = ArrayList@141[7] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
+}
+
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[8] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
+    <name not found> = ArrayList@147[8] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[8] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152, ... }
+    <name not found> = ArrayList@153[8] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152, ... }
+}
+
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[8] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158, ... }
+    <name not found> = ArrayList@159[8] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158, ... }
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[8] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
+    <name not found> = ArrayList@165[8] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
+}
+
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[8] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
+    <name not found> = ArrayList@171[8] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
 }

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

@@ -24,35 +24,100 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('withWhen': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('plus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('withWhen': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('withWhen': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('withWhen': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('withWhen': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('plus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('withWhen': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('withWhen': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('withWhen': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[8] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
+    <name not found> = ArrayList@81[8] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
+    <name not found> = ArrayList@87[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
+    <name not found> = ArrayList@93[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
 }

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

@@ -28,43 +28,177 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('Any': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('contains': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('minus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('plus': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('rangeTo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('tailRecursive': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('withWhen': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('contains': Name@29) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@30) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('minus': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('plus': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('rangeTo': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('withWhen': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('withWhen': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('withWhen': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('contains': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('minus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('plus': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('rangeTo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('withWhen': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('contains': Name@29) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('equals': Name@30) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('minus': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('plus': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('rangeTo': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('withWhen': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('withWhen': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('withWhen': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
+    <name not found> = ArrayList@117[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[7] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122, ... }
+    <name not found> = ArrayList@123[7] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122, ... }
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[8] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128, ... }
+    <name not found> = ArrayList@129[8] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128, ... }
+}
+
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[8] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
+    <name not found> = ArrayList@135[8] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
+    <name not found> = ArrayList@141[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
+}
+
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[8] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
+    <name not found> = ArrayList@147[8] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[8] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152, ... }
+    <name not found> = ArrayList@153[8] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152, ... }
+}
+
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[8] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158, ... }
+    <name not found> = ArrayList@159[8] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158, ... }
 }

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

@@ -140,34 +140,146 @@ LazyJavaPackageFragment@56['<root>'] {
     classes('Int': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('Number': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('String': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('equals': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('minus': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('tailRecursive': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('withWhen': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('IllegalStateException': Name@82) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('equals': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('minus': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('withWhen': Name@89) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('tailRecursive': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('withWhen': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('IllegalStateException': Name@82) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('withWhen': Name@87) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@81
+    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
 LazyJavaPackageFragment@62['java'] {
-    classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('lang': Name@95) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@92
+    functions('lang': Name@93) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
+    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
 }
 
 LazyJavaPackageFragment@64['lang'] {
-    classes('IllegalStateException': Name@82) = LazyJavaClassDescriptor@5['IllegalStateException'] // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('equals': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('minus': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('withWhen': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('IllegalStateException': Name@82) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('equals': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('minus': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('withWhen': Name@89) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('IllegalStateException': Name@82) = LazyJavaClassDescriptor@5['IllegalStateException'] // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('withWhen': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('IllegalStateException': Name@82) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('withWhen': Name@87) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@95
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+}
+
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+}
+
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+}
+
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
+}
+
+ResolutionTaskHolder@137 {
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+}
+
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+}
+
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
+}
+
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+}
+
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
+}
+
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[4] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
+    <name not found> = ArrayList@170[4] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+}
+
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[8] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
+    <name not found> = ArrayList@176[8] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
+}
+
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[8] { ResolutionCandidate@179, ResolutionCandidate@180, ResolutionCandidate@181, ... }
+    <name not found> = ArrayList@182[8] { ResolutionCandidate@179, ResolutionCandidate@180, ResolutionCandidate@181, ... }
 }

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

@@ -24,35 +24,129 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('withWhen2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('plus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('withWhen2': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('withWhen2': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('withWhen2': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('withWhen2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('plus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('withWhen2': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('withWhen2': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('withWhen2': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+    <name not found> = EmptyList@28[empty]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
+
+ResolutionTaskHolder@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[8] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
+    <name not found> = ArrayList@101[8] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = ArrayList@107[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+    <name not found> = ArrayList@113[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
 }