Update lazy.log files

compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.lazy.log

@@ -226,9 +226,80 @@ LazyJavaTypeParameterDescriptor@19['E'] {
 }
 
 LazyJavaTypeParameterResolver@134 {
-    resolve(JavaTypeParameterImpl@135['E']) = LazyJavaTypeParameterDescriptor@24['E']
+    resolve(JavaTypeParameterImpl@135['E']) = LazyJavaTypeParameterDescriptor@19['E']
 }
 
 LazyJavaTypeParameterResolver@136 {
-    resolve(JavaTypeParameterImpl@137['E']) = LazyJavaTypeParameterDescriptor@19['E']
+    resolve(JavaTypeParameterImpl@137['E']) = LazyJavaTypeParameterDescriptor@24['E']
+}
+
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
+    <name not found> = EmptyList@118[empty]
+    <name not found> = EmptyList@118[empty]
+    <name not found> = EmptyList@118[empty]
+    <name not found> = EmptyList@118[empty]
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+    <name not found> = EmptyList@118[empty]
+    <name not found> = EmptyList@118[empty]
+}
+
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+    <name not found> = EmptyList@118[empty]
+    <name not found> = EmptyList@118[empty]
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+    <name not found> = EmptyList@118[empty]
+    <name not found> = EmptyList@118[empty]
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+    <name not found> = EmptyList@118[empty]
+    <name not found> = EmptyList@118[empty]
+}
+
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+    <name not found> = EmptyList@118[empty]
+    <name not found> = EmptyList@118[empty]
+}
+
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+    <name not found> = EmptyList@118[empty]
+    <name not found> = EmptyList@118[empty]
+}
+
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+    <name not found> = EmptyList@118[empty]
+    <name not found> = EmptyList@118[empty]
+}
+
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[4] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
+    <name not found> = ArrayList@181[5] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
+    <name not found> = EmptyList@118[empty]
+    <name not found> = EmptyList@118[empty]
+    <name not found> = EmptyList@118[empty]
+    <name not found> = EmptyList@118[empty]
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/breakOrContinueInLoopCondition.lazy.log

@@ -12,42 +12,141 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Boolean': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('equals': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('hasNext': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('inc': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('iterator': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('next': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('rangeTo': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('equals': Name@15) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('hasNext': Name@16) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('inc': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('iterator': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('next': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('rangeTo': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@5['java'] {
-    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
+    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
-LazyJavaPackageFragment@7['lang'] {
-    classes('equals': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('hasNext': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('inc': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('iterator': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('next': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('rangeTo': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('equals': Name@15) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('hasNext': Name@16) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('inc': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('iterator': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('next': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('rangeTo': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+ResolutionTaskHolder@21 {
+    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
+}
+
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+}
+
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+}
+
+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 }
+}
+
+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[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[7] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
+    <name not found> = ArrayList@114[7] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
+}
+
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[7] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
+    <name not found> = ArrayList@120[7] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[7] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
+    <name not found> = ArrayList@126[7] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
+}
+
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[7] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
+    <name not found> = ArrayList@132[7] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/checkInnerLocalDeclarations.lazy.log

@@ -14,3 +14,8 @@ LazyJavaPackageFragment@5['java'] {
     functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
     memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
 }
+
+ResolutionTaskHolder@17 {
+    <name not found> = ArrayList@18[1] { ResolutionCandidate@19 }
+    <name not found> = ArrayList@20[1] { ResolutionCandidate@19 }
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/checkPropertyAccessor.lazy.log

@@ -21,6 +21,22 @@ LazyJavaPackageFragment@9['java'] {
     memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
-LazyJavaPackageFragment@11['lang'] {
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
+ResolutionTaskHolder@23 {
+    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
+}
+
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
+}
+
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commasAndWhitespaces.lazy.log

@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,7 +79,7 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -93,7 +93,7 @@ LazyJavaClassifierType@43['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -154,3 +154,26 @@ LazyJavaPackageFragment@58['lang'] {
     functions('todo': Name@75) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@83
     memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
 }
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}
+
+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[4] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
+    <name not found> = ArrayList@98[5] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commentsInDeadCode.lazy.log

@@ -86,14 +86,14 @@ LazyJavaClassifierType@41['Throwable'] {
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -144,3 +144,66 @@ LazyJavaPackageFragment@62['lang'] {
     functions('todo': Name@82) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@80
 }
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+    <name not found> = ArrayList@113[5] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInInvokeCall.lazy.log

@@ -81,21 +81,21 @@ LazyJavaClassifierType@40['Throwable'] {
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@42['Throwable']
+    classifier = JavaClassImpl@39['Throwable']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@36
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@39['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@36
 }
 
 LazyJavaClassifierType@47['Throwable'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@42['Throwable']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@36
 }
@@ -152,3 +152,49 @@ LazyJavaPackageFragment@59['lang'] {
     functions('todo': Name@73) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@81
     memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@81
 }
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[4] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
+    <name not found> = ArrayList@108[5] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInReceiver.lazy.log

@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,14 +79,14 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -150,3 +150,48 @@ LazyJavaPackageFragment@57['lang'] {
     functions('todo': Name@71) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
     memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@79
 }
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <name not found> = ArrayList@102[5] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeDifferentExamples.lazy.log

@@ -52,7 +52,7 @@ LazyJavaClassifierType@28['String'] {
 
 LazyJavaClassifierType@31['String'] {
     arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@30['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
@@ -66,7 +66,7 @@ LazyJavaClassifierType@34['String'] {
 
 LazyJavaClassifierType@36['String'] {
     arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@27['String']
+    classifier = JavaClassImpl@30['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
@@ -94,7 +94,7 @@ LazyJavaClassifierType@45['Throwable'] {
 
 LazyJavaClassifierType@48['Throwable'] {
     arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@44['Throwable']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@41
 }
@@ -108,7 +108,7 @@ LazyJavaClassifierType@50['Throwable'] {
 
 LazyJavaClassifierType@52['Throwable'] {
     arguments = ArrayList@53[empty]
-    classifier = JavaClassImpl@44['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@41
 }
@@ -151,50 +151,217 @@ LazyJavaPackageFragment@58['<root>'] {
     classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@83
     classes('Nothing': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@83
     classes('Unit': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('compareTo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('equals': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('fail': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('hasNext': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('iterator': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('java': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('next': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('rangeTo': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('compareTo': Name@88) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('equals': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('fail': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('hasNext': Name@91) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('iterator': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('next': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('rangeTo': Name@95) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('equals': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('fail': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('java': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('equals': Name@88) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('fail': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
 LazyJavaPackageFragment@65['java'] {
-    classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('lang': Name@101) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('lang': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('lang': Name@96) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@95
 }
 
 LazyJavaPackageFragment@67['lang'] {
-    classes('RuntimeException': Name@103) = LazyJavaClassDescriptor@4['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('compareTo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('equals': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('fail': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('hasNext': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('iterator': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('java': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('next': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('rangeTo': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('RuntimeException': Name@103) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('compareTo': Name@88) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('equals': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('fail': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('hasNext': Name@91) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('iterator': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('next': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('rangeTo': Name@95) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('RuntimeException': Name@98) = LazyJavaClassDescriptor@4['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('equals': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('fail': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('java': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('RuntimeException': Name@98) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('equals': Name@88) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('fail': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@99
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+}
+
+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[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+}
+
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+}
+
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+}
+
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+}
+
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+}
+
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+}
+
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+}
+
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+}
+
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[4] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
+    <name not found> = ArrayList@185[5] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+}
+
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[7] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
+    <name not found> = ArrayList@191[7] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
+}
+
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[7] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196, ... }
+    <name not found> = ArrayList@197[7] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196, ... }
+}
+
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[7] { ResolutionCandidate@200, ResolutionCandidate@201, ResolutionCandidate@202, ... }
+    <name not found> = ArrayList@203[7] { ResolutionCandidate@200, ResolutionCandidate@201, ResolutionCandidate@202, ... }
+}
+
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[7] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
+    <name not found> = ArrayList@209[7] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
+}
+
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[7] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
+    <name not found> = ArrayList@215[7] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
+}
+
+ResolutionTaskHolder@216 {
+    <name not found> = ArrayList@217[7] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
+    <name not found> = ArrayList@221[7] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
+}
+
+ResolutionTaskHolder@222 {
+    <name not found> = ArrayList@223[7] { ResolutionCandidate@224, ResolutionCandidate@225, ResolutionCandidate@226, ... }
+    <name not found> = ArrayList@227[7] { ResolutionCandidate@224, ResolutionCandidate@225, ResolutionCandidate@226, ... }
+}
+
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[7] { ResolutionCandidate@230, ResolutionCandidate@231, ResolutionCandidate@232, ... }
+    <name not found> = ArrayList@233[7] { ResolutionCandidate@230, ResolutionCandidate@231, ResolutionCandidate@232, ... }
+}
+
+ResolutionTaskHolder@234 {
+    <name not found> = ArrayList@235[7] { ResolutionCandidate@236, ResolutionCandidate@237, ResolutionCandidate@238, ... }
+    <name not found> = ArrayList@239[7] { ResolutionCandidate@236, ResolutionCandidate@237, ResolutionCandidate@238, ... }
+}
+
+ResolutionTaskHolder@240 {
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+}
+
+ResolutionTaskHolder@241 {
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeFromDifferentSources.lazy.log

@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,14 +79,14 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -133,10 +133,77 @@ LazyJavaPackageFragment@58['java'] {
 LazyJavaPackageFragment@60['lang'] {
     classes('Exception': Name@75) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@76
     classes('bar': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('plus': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@76
     deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@76
     functions('Exception': Name@75) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
     functions('bar': Name@77) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('plus': Name@78) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+}
+
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[4] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
+    <name not found> = ArrayList@116[5] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInArrayAccess.lazy.log

@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,21 +79,21 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -174,3 +174,221 @@ LazyJavaPackageFragment@60['lang'] {
     functions('todo': Name@86) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@94
     memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
 }
+
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@152 {
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@154 }
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+}
+
+ResolutionTaskHolder@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+}
+
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+}
+
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+}
+
+ResolutionTaskHolder@172 {
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@174 }
+}
+
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
+}
+
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+}
+
+ResolutionTaskHolder@184 {
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+}
+
+ResolutionTaskHolder@188 {
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+}
+
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@194 }
+}
+
+ResolutionTaskHolder@196 {
+    <name not found> = ArrayList@197[4] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
+    <name not found> = ArrayList@201[5] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInAssignment.lazy.log

@@ -44,14 +44,14 @@ LazyJavaClassifierType@24['String'] {
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,14 +79,14 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -120,33 +120,98 @@ LazyJavaPackageFragmentProvider@49 {
 LazyJavaPackageFragment@51['<root>'] {
     classes('Exception': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
     classes('Int': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('plus': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('plusAssign': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('todo': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('Exception': Name@63) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('plus': Name@66) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('plusAssign': Name@67) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('todo': Name@68) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('plusAssign': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('todo': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('Exception': Name@63) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('plusAssign': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('todo': Name@67) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
 LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('lang': Name@74) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('lang': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('lang': Name@73) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
 }
 
 LazyJavaPackageFragment@56['lang'] {
-    classes('Exception': Name@63) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('plus': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('plusAssign': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('todo': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('Exception': Name@63) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('plus': Name@66) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('plusAssign': Name@67) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('todo': Name@68) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('Exception': Name@63) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('plusAssign': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('todo': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('Exception': Name@63) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('plusAssign': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('todo': Name@67) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[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[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = ArrayList@110[5] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+}
+
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[8] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
+    <name not found> = ArrayList@116[8] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInBinaryExpressions.lazy.log

@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,7 +79,7 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -93,7 +93,7 @@ LazyJavaClassifierType@43['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -129,36 +129,152 @@ LazyJavaPackageFragment@51['<root>'] {
     classes('Int': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@70
     classes('String': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@70
     classes('bar': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('plus': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('times': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('todo': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('Exception': Name@71) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('bar': Name@74) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('plus': Name@75) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('times': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('todo': Name@77) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('times': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('todo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('Exception': Name@71) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('bar': Name@74) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('times': Name@75) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('todo': Name@76) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@70
+    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@70
 }
 
 LazyJavaPackageFragment@56['java'] {
-    classes('lang': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('lang': Name@83) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('lang': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('lang': Name@82) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@81
+    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
 LazyJavaPackageFragment@58['lang'] {
-    classes('Exception': Name@71) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('bar': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('plus': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('times': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('todo': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('Exception': Name@71) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('bar': Name@74) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('plus': Name@75) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('times': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('todo': Name@77) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('Exception': Name@71) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('bar': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('times': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('todo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('Exception': Name@71) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('bar': Name@74) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('times': Name@75) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('todo': Name@76) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+}
+
+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[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+}
+
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+}
+
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+}
+
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+}
+
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[4] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
+    <name not found> = ArrayList@151[5] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInCalls.lazy.log

@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,21 +79,21 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -134,35 +134,75 @@ LazyJavaPackageFragment@51['<root>'] {
     classes('Unit': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('bar': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('f': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('invoke': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('todo': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('Exception': Name@74) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('bar': Name@78) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('f': Name@79) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('invoke': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('todo': Name@81) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('todo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('Exception': Name@74) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('bar': Name@78) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('f': Name@79) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('todo': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
 LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('lang': Name@87) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('lang': Name@86) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
 LazyJavaPackageFragment@59['lang'] {
-    classes('Exception': Name@74) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('bar': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('f': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('invoke': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('todo': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('Exception': Name@74) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('bar': Name@78) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('f': Name@79) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('invoke': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('todo': Name@81) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('Exception': Name@74) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('bar': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('f': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('todo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('Exception': Name@74) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('bar': Name@78) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('f': Name@79) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('todo': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+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[4] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+    <name not found> = ArrayList@115[5] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInDeadCode.lazy.log

@@ -37,7 +37,7 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -51,7 +51,7 @@ LazyJavaClassifierType@27['String'] {
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,7 +79,7 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -93,7 +93,7 @@ LazyJavaClassifierType@43['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -125,32 +125,92 @@ LazyJavaPackageFragment@51['<root>'] {
     classes('Array': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
     classes('Exception': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
     classes('bar': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('get': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('todo': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('Exception': Name@69) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('bar': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('get': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('todo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('todo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('Exception': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('bar': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('todo': Name@71) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@67
 }
 
 LazyJavaPackageFragment@55['java'] {
-    classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('lang': Name@78) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('lang': Name@77) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@57['lang'] {
-    classes('Exception': Name@69) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('bar': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('get': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('todo': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('Exception': Name@69) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('bar': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('get': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('todo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('Exception': Name@69) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('bar': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('todo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('Exception': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('bar': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('todo': Name@71) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@79
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[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[4] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
+    <name not found> = ArrayList@114[5] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInIf.lazy.log

@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,21 +79,21 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -146,3 +146,54 @@ LazyJavaPackageFragment@56['lang'] {
     functions('todo': Name@67) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
     memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
 }
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+}
+
+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[4] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
+    <name not found> = ArrayList@106[5] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInInnerExpressions.lazy.log

@@ -37,14 +37,14 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -162,3 +162,79 @@ LazyJavaPackageFragment@59['lang'] {
     functions('todo': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
     memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
 }
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+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[4] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+    <name not found> = ArrayList@119[5] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+    <name not found> = ArrayList@125[5] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLocalDeclarations.lazy.log

@@ -61,21 +61,21 @@ LazyJavaClassifierType@31['String'] {
 
 LazyJavaClassifierType@34['String'] {
     arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@33['String']
+    classifier = JavaClassImpl@25['String']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@27
 }
 
 LazyJavaClassifierType@37['String'] {
     arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@25['String']
+    classifier = JavaClassImpl@30['String']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@27
 }
 
 LazyJavaClassifierType@39['String'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@30['String']
+    classifier = JavaClassImpl@33['String']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@27
 }
@@ -103,14 +103,14 @@ LazyJavaClassifierType@48['Throwable'] {
 
 LazyJavaClassifierType@51['Throwable'] {
     arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@43['Throwable']
+    classifier = JavaClassImpl@50['Throwable']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaClassifierType@53['Throwable'] {
     arguments = ArrayList@54[empty]
-    classifier = JavaClassImpl@50['Throwable']
+    classifier = JavaClassImpl@43['Throwable']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@44
 }
@@ -177,3 +177,100 @@ LazyJavaPackageFragment@68['lang'] {
     functions('todo': Name@84) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@92
     memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@92
 }
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+}
+
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+}
+
+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[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+}
+
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+}
+
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+}
+
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[4] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
+    <name not found> = ArrayList@147[5] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLoops.lazy.log

@@ -122,44 +122,106 @@ LazyJavaPackageFragment@52['<root>'] {
     classes('Exception': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
     classes('Nothing': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
     classes('bar': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('hasNext': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('iterator': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('next': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('rangeTo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('todo': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('Exception': Name@64) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('bar': Name@67) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('hasNext': Name@68) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('iterator': Name@69) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('next': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('rangeTo': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('todo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('iterator': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('todo': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('Exception': Name@64) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('bar': Name@67) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('iterator': Name@68) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('todo': Name@69) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@65
 }
 
 LazyJavaPackageFragment@55['java'] {
-    classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('lang': Name@78) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('lang': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('lang': Name@75) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@74
 }
 
 LazyJavaPackageFragment@57['lang'] {
-    classes('Exception': Name@64) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('bar': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('hasNext': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('iterator': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('next': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('rangeTo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('todo': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('Exception': Name@64) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('bar': Name@67) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('hasNext': Name@68) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('iterator': Name@69) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('next': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('rangeTo': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('todo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('Exception': Name@64) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('bar': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('iterator': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('todo': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('Exception': Name@64) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('bar': Name@67) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('iterator': Name@68) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('todo': Name@69) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+}
+
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[4] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
+    <name not found> = ArrayList@116[5] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+}
+
+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, ... }
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInReturn.lazy.log

@@ -37,7 +37,7 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -51,7 +51,7 @@ LazyJavaClassifierType@27['String'] {
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,14 +79,14 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -138,3 +138,21 @@ LazyJavaPackageFragment@55['lang'] {
     functions('todo': Name@62) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
     memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
 }
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[4] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
+    <name not found> = ArrayList@81[5] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInUnaryExpr.lazy.log

@@ -44,14 +44,14 @@ LazyJavaClassifierType@24['String'] {
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,21 +79,21 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -154,3 +154,58 @@ LazyJavaPackageFragment@57['lang'] {
     functions('todo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
 }
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+}
+
+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[4] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
+    <name not found> = ArrayList@111[5] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInWhileFromBreak.lazy.log

@@ -21,37 +21,112 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Array': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('bar': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('compareTo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('get': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('set': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('bar': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('compareTo': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('foo': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('get': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('set': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('foo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('bar': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('foo': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    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
+    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
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('compareTo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('get': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('set': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('bar': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('compareTo': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('foo': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('get': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('set': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('bar': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('foo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('bar': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('foo': Name@24) = EmptyList@26[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@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+}
+
+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[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[7] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
+    <name not found> = ArrayList@83[7] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
+}
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[7] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
+    <name not found> = ArrayList@89[7] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[7] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
+    <name not found> = ArrayList@95[7] { ResolutionCandidate@92, ResolutionCandidate@93, 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, ... }
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.lazy.log

@@ -24,29 +24,46 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('Unit': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('f': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('invoke': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('run': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('f': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('invoke': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('run': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('run': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('f': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('run': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@8['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@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@10['lang'] {
-    classes('f': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('invoke': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('run': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('f': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('invoke': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('run': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('f': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('run': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('f': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('run': 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 }
+    <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 }
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_1.lazy.log

@@ -48,21 +48,21 @@ LazyJavaClassifierType@26['String'] {
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@25['String']
     nullable = 'true': Boolean@31
     typeConstructor = DeserializedClassTypeConstructor@22
 }
 
 LazyJavaClassifierType@32['String'] {
     arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@25['String']
+    classifier = JavaClassImpl@28['String']
     nullable = 'true': Boolean@31
     typeConstructor = DeserializedClassTypeConstructor@22
 }
 
 LazyJavaClassifierType@34['String'] {
     arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@28['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@31
     typeConstructor = DeserializedClassTypeConstructor@22
 }
@@ -90,21 +90,21 @@ LazyJavaClassifierType@43['Throwable'] {
 
 LazyJavaClassifierType@46['Throwable'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@42['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@31
     typeConstructor = DeserializedClassTypeConstructor@39
 }
 
 LazyJavaClassifierType@48['Throwable'] {
     arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@45['Throwable']
     nullable = 'true': Boolean@31
     typeConstructor = DeserializedClassTypeConstructor@39
 }
 
 LazyJavaClassifierType@50['Throwable'] {
     arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@45['Throwable']
+    classifier = JavaClassImpl@42['Throwable']
     nullable = 'true': Boolean@31
     typeConstructor = DeserializedClassTypeConstructor@39
 }
@@ -155,3 +155,17 @@ LazyJavaPackageFragment@62['lang'] {
     functions('RuntimeException': Name@74) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@83
     memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@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[4] { ResolutionCandidate@91, ResolutionCandidate@92, ResolutionCandidate@93, ... }
+    <name not found> = ArrayList@94[5] { ResolutionCandidate@91, ResolutionCandidate@92, ResolutionCandidate@93, ... }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_2.lazy.log

@@ -52,21 +52,21 @@ LazyJavaClassifierType@28['String'] {
 
 LazyJavaClassifierType@31['String'] {
     arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@30['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@34['String'] {
     arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@22['String']
+    classifier = JavaClassImpl@30['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@36['String'] {
     arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@27['String']
+    classifier = JavaClassImpl@22['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
@@ -159,3 +159,30 @@ LazyJavaPackageFragment@63['lang'] {
     functions('cond': Name@74) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@82
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
 }
+
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[4] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
+    <name not found> = ArrayList@93[5] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+}
+
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[4] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
+    <name not found> = ArrayList@99[5] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_3.lazy.log

@@ -73,28 +73,28 @@ LazyJavaClassifierType@41['String'] {
 
 LazyJavaClassifierType@44['String'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@37['String']
+    classifier = JavaClassImpl@40['String']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@47['String'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@32['String']
+    classifier = JavaClassImpl@43['String']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@49['String'] {
     arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@40['String']
+    classifier = JavaClassImpl@37['String']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@51['String'] {
     arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@43['String']
+    classifier = JavaClassImpl@32['String']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -129,14 +129,14 @@ LazyJavaClassifierType@63['Throwable'] {
 
 LazyJavaClassifierType@65['Throwable'] {
     arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@59['Throwable']
+    classifier = JavaClassImpl@55['Throwable']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@56
 }
 
 LazyJavaClassifierType@67['Throwable'] {
     arguments = ArrayList@68[empty]
-    classifier = JavaClassImpl@55['Throwable']
+    classifier = JavaClassImpl@59['Throwable']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@56
 }
@@ -187,3 +187,21 @@ LazyJavaPackageFragment@78['lang'] {
     functions('RuntimeException': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@96
     memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@96
 }
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
+    <name not found> = ArrayList@102[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[4] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
+    <name not found> = ArrayList@108[5] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt3162tryAsInitializer.lazy.log

@@ -44,3 +44,13 @@ LazyJavaPackageFragment@14['java'] {
 LazyJavaPackageFragment@16['lang'] {
     classes('Exception': Name@25) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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 }
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt5200DeadCodeInLambdas.lazy.log

@@ -98,31 +98,86 @@ LazyJavaPackageFragment@43['<root>'] {
     classes('block': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@62
     classes('doCall': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@62
     classes('inline': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('invoke': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('NullPointerException': Name@63) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('block': Name@65) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('doCall': Name@66) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('invoke': Name@68) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('NullPointerException': Name@63) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('block': Name@65) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('doCall': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
 LazyJavaPackageFragment@48['java'] {
-    classes('lang': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('lang': Name@74) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('lang': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('lang': Name@73) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
 }
 
 LazyJavaPackageFragment@50['lang'] {
-    classes('NullPointerException': Name@63) = LazyJavaClassDescriptor@8['NullPointerException'] // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('block': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('doCall': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('invoke': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('NullPointerException': Name@63) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('block': Name@65) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('doCall': Name@66) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('invoke': Name@68) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('NullPointerException': Name@63) = LazyJavaClassDescriptor@8['NullPointerException'] // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('block': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('doCall': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('NullPointerException': Name@63) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('block': Name@65) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('doCall': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+}
+
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+}
+
+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[2] { ResolutionCandidate@111, ResolutionCandidate@112 }
+    <name not found> = ArrayList@113[2] { ResolutionCandidate@111, ResolutionCandidate@112 }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.lazy.log

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

compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt4034.lazy.log

@@ -22,3 +22,8 @@ LazyJavaPackageFragment@7['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturnInWhen.lazy.log

@@ -20,16 +20,31 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@29
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+}
+
+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 }
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1001.lazy.log

@@ -46,13 +46,56 @@ LazyJavaPackageFragment@15['java'] {
 LazyJavaPackageFragment@17['lang'] {
     classes('Exception': Name@38) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@39
     classes('doSmth': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('hasNext': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('iterator': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('next': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@39
     deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@39
     functions('doSmth': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('hasNext': Name@41) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('iterator': Name@42) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('next': Name@43) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+}
+
+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[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 }
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.lazy.log

@@ -25,17 +25,108 @@ LazyJavaPackageFragment@6['java'] {
 
 LazyJavaPackageFragment@8['lang'] {
     classes('doSmth': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('hasNext': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('iterator': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('next': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('plus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('plusAssign': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('plusAssign': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
     deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
     functions('doSmth': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('hasNext': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('iterator': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('next': Name@29) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('plus': Name@30) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('plusAssign': Name@31) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('plusAssign': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+    <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@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+    <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@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <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@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+    <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@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, ... }
+}
+
+ResolutionTaskHolder@71 {
+    <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]
+    <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]
+    <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/diagnostics/tests/controlFlowAnalysis/kt1066.lazy.log

@@ -32,22 +32,162 @@ LazyJavaPackageFragment@9['java'] {
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('contains': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('equals': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('mod': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('plus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('plusAssign': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('randomDigit': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('toChar': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('plusAssign': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('randomDigit': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
     deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('compareTo': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('contains': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('equals': Name@34) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('mod': Name@35) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('plus': Name@36) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('plusAssign': Name@37) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('randomDigit': Name@38) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('toChar': Name@39) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('plusAssign': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('randomDigit': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+    <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@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> = ArrayList@52[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+}
+
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+}
+
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[7] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
+    <name not found> = ArrayList@116[7] { ResolutionCandidate@113, ResolutionCandidate@114, 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[8] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127, ... }
+    <name not found> = ArrayList@128[8] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127, ... }
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[8] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
+    <name not found> = ArrayList@134[8] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
+}
+
+ResolutionTaskHolder@135 {
+    <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]
+    <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]
+    <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]
+    <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]
+    <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]
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1156.lazy.log

@@ -1,50 +1,44 @@
 LazyJavaClassDescriptor@0['Appendable'] {
     functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
     memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
 }
 
-LazyJavaClassDescriptor@7['AutoCloseable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@8
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@10['AutoCloseable']
+LazyJavaClassDescriptor@6['AutoCloseable'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@7
+    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
+    typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@11['Closeable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@12
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+LazyJavaClassDescriptor@10['Closeable'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
+    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
 }
 
-LazyJavaClassDescriptor@15['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@16['Exception']
+LazyJavaClassDescriptor@14['Exception'] {
+    typeConstructor = LazyJavaClassTypeConstructor@15['Exception']
 }
 
-LazyJavaClassDescriptor@17['FilterOutputStream'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
-    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['FilterOutputStream']
+LazyJavaClassDescriptor@16['FilterOutputStream'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@17
+    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
+    typeConstructor = LazyJavaClassTypeConstructor@19['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@21['OutputStream'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@22
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['OutputStream']
+LazyJavaClassDescriptor@20['OutputStream'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@21
+    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@21
+    typeConstructor = LazyJavaClassTypeConstructor@23['OutputStream']
 }
 
-LazyJavaClassDescriptor@25['PrintStream'] {
-    defaultType = JetTypeImpl@26['PrintStream']
-    enumEntryIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@28
-    functions('println': Name@5) = ArrayList@29[10] { JavaMethodDescriptor@30['println'], JavaMethodDescriptor@31['println'], JavaMethodDescriptor@32['println'], ... } // through LazyJavaClassMemberScope@28
-    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@28
-    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@28
-    nestedClasses('println': Name@5) = null // through LazyJavaClassMemberScope@28
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@28
+LazyJavaClassDescriptor@24['PrintStream'] {
+    defaultType = JetTypeImpl@25['PrintStream']
+    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@27
+    functions('println': Name@28) = ArrayList@29[10] { JavaMethodDescriptor@30['println'], JavaMethodDescriptor@31['println'], JavaMethodDescriptor@32['println'], ... } // through LazyJavaClassMemberScope@27
+    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@27
+    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@27
+    nestedClasses('println': Name@28) = null // through LazyJavaClassMemberScope@27
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@35['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
 }
@@ -67,32 +61,32 @@ LazyJavaClassDescriptor@45['System'] {
     typeConstructor = LazyJavaClassTypeConstructor@55['System']
 }
 
-LazyJavaClassTypeConstructor@6['Appendable'] {
+LazyJavaClassTypeConstructor@5['Appendable'] {
     parameters = ArrayList@56[empty]
     supertypes = ArrayList@57[1] { JetTypeImpl@58['Any'] }
 }
 
-LazyJavaClassTypeConstructor@10['AutoCloseable'] {
+LazyJavaClassTypeConstructor@9['AutoCloseable'] {
     parameters = ArrayList@59[empty]
     supertypes = ArrayList@60[1] { JetTypeImpl@58['Any'] }
 }
 
-LazyJavaClassTypeConstructor@14['Closeable'] {
+LazyJavaClassTypeConstructor@13['Closeable'] {
     parameters = ArrayList@61[empty]
     supertypes = ArrayList@62[1] { LazyJavaClassifierType@63['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@16['Exception'] {
+LazyJavaClassTypeConstructor@15['Exception'] {
     parameters = ArrayList@64[empty]
     supertypes = ArrayList@65[1] { LazyJavaClassifierType@66['Throwable'] }
 }
 
-LazyJavaClassTypeConstructor@20['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@19['FilterOutputStream'] {
     parameters = ArrayList@67[empty]
     supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@24['OutputStream'] {
+LazyJavaClassTypeConstructor@23['OutputStream'] {
     parameters = ArrayList@70[empty]
     supertypes = ArrayList@71[1] { LazyJavaClassifierType@72['Closeable'] }
 }
@@ -115,41 +109,41 @@ LazyJavaClassifierType@76['Appendable'] {
     arguments = ArrayList@82[empty]
     classifier = JavaClassImpl@83['Appendable']
     memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
 }
 
 LazyJavaClassifierType@63['AutoCloseable'] {
     arguments = ArrayList@84[empty]
     classifier = JavaClassImpl@85['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@10['AutoCloseable']
+    memberScope = LazyJavaClassMemberScope@7
+    typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
 }
 
 LazyJavaClassifierType@77['Closeable'] {
     arguments = ArrayList@86[empty]
     classifier = JavaClassImpl@87['Closeable']
-    memberScope = LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+    memberScope = LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
 }
 
 LazyJavaClassifierType@72['Closeable'] {
     arguments = ArrayList@88[empty]
     classifier = JavaClassImpl@89['Closeable']
-    memberScope = LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+    memberScope = LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
 }
 
 LazyJavaClassifierType@80['Exception'] {
     arguments = ArrayList@90[empty]
     classifier = JavaClassImpl@91['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@16['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@15['Exception']
 }
 
 LazyJavaClassifierType@75['FilterOutputStream'] {
     arguments = ArrayList@92[empty]
     classifier = JavaClassImpl@93['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@17
+    typeConstructor = LazyJavaClassTypeConstructor@19['FilterOutputStream']
 }
 
 LazyJavaClassifierType@94['Flushable'] {
@@ -194,14 +188,14 @@ LazyJavaClassifierType@110['Object'] {
 LazyJavaClassifierType@69['OutputStream'] {
     arguments = ArrayList@112[empty]
     classifier = JavaClassImpl@113['OutputStream']
-    memberScope = LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['OutputStream']
+    memberScope = LazyJavaClassMemberScope@21
+    typeConstructor = LazyJavaClassTypeConstructor@23['OutputStream']
 }
 
 LazyJavaClassifierType@114['PrintStream'] {
     arguments = ArrayList@115[empty]
     classifier = JavaClassImpl@116['PrintStream']
-    memberScope = LazyJavaClassMemberScope@28
+    memberScope = LazyJavaClassMemberScope@27
     nullable = 'false': Boolean@99
     typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
 }
@@ -243,28 +237,28 @@ LazyJavaClassifierType@129['String'] {
 
 LazyJavaClassifierType@132['String'] {
     arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@121['String']
+    classifier = JavaClassImpl@125['String']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@122
 }
 
 LazyJavaClassifierType@134['String'] {
     arguments = ArrayList@135[empty]
-    classifier = JavaClassImpl@131['String']
+    classifier = JavaClassImpl@128['String']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@122
 }
 
 LazyJavaClassifierType@136['String'] {
     arguments = ArrayList@137[empty]
-    classifier = JavaClassImpl@128['String']
+    classifier = JavaClassImpl@131['String']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@122
 }
 
 LazyJavaClassifierType@138['String'] {
     arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@125['String']
+    classifier = JavaClassImpl@121['String']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@122
 }
@@ -292,14 +286,14 @@ LazyJavaClassifierType@147['Throwable'] {
 
 LazyJavaClassifierType@150['Throwable'] {
     arguments = ArrayList@151[empty]
-    classifier = JavaClassImpl@146['Throwable']
+    classifier = JavaClassImpl@142['Throwable']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@143
 }
 
 LazyJavaClassifierType@152['Throwable'] {
     arguments = ArrayList@153[empty]
-    classifier = JavaClassImpl@142['Throwable']
+    classifier = JavaClassImpl@146['Throwable']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@143
 }
@@ -332,12 +326,12 @@ LazyJavaPackageFragmentProvider@158 {
     packageFragments('kotlin.io': FqName@174) = null
     packageFragments('kotlin.jvm': FqName@175) = null
     topLevelClasses(JavaClassImpl@83['Appendable']) = LazyJavaClassDescriptor@0['Appendable']
-    topLevelClasses(JavaClassImpl@85['AutoCloseable']) = LazyJavaClassDescriptor@7['AutoCloseable']
-    topLevelClasses(JavaClassImpl@87['Closeable']) = LazyJavaClassDescriptor@11['Closeable']
-    topLevelClasses(JavaClassImpl@91['Exception']) = LazyJavaClassDescriptor@15['Exception']
-    topLevelClasses(JavaClassImpl@93['FilterOutputStream']) = LazyJavaClassDescriptor@17['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@113['OutputStream']) = LazyJavaClassDescriptor@21['OutputStream']
-    topLevelClasses(JavaClassImpl@116['PrintStream']) = LazyJavaClassDescriptor@25['PrintStream']
+    topLevelClasses(JavaClassImpl@85['AutoCloseable']) = LazyJavaClassDescriptor@6['AutoCloseable']
+    topLevelClasses(JavaClassImpl@87['Closeable']) = LazyJavaClassDescriptor@10['Closeable']
+    topLevelClasses(JavaClassImpl@91['Exception']) = LazyJavaClassDescriptor@14['Exception']
+    topLevelClasses(JavaClassImpl@93['FilterOutputStream']) = LazyJavaClassDescriptor@16['FilterOutputStream']
+    topLevelClasses(JavaClassImpl@113['OutputStream']) = LazyJavaClassDescriptor@20['OutputStream']
+    topLevelClasses(JavaClassImpl@116['PrintStream']) = LazyJavaClassDescriptor@24['PrintStream']
     topLevelClasses(JavaClassImpl@176['RuntimeException']) = LazyJavaClassDescriptor@37['RuntimeException']
     topLevelClasses(JavaClassImpl@177['System']) = LazyJavaClassDescriptor@45['System']
 }
@@ -346,10 +340,8 @@ LazyJavaPackageFragment@160['<root>'] {
     classes('Int': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@179
     classes('RuntimeException': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@179
     classes('System': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('println': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@179
     deserializedPackageScope = Empty@182 // through LazyPackageFragmentScopeForJavaPackage@179
     functions('RuntimeException': Name@180) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('println': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@179
     memberIndex = computeMemberIndex$1@183 // through LazyPackageFragmentScopeForJavaPackage@179
 }
 
@@ -363,9 +355,56 @@ LazyJavaPackageFragment@164['java'] {
 LazyJavaPackageFragment@168['lang'] {
     classes('RuntimeException': Name@180) = LazyJavaClassDescriptor@37['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@188
     classes('System': Name@181) = LazyJavaClassDescriptor@45['System'] // through LazyPackageFragmentScopeForJavaPackage@188
-    classes('println': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@188
     deserializedPackageScope = Empty@182 // through LazyPackageFragmentScopeForJavaPackage@188
     functions('RuntimeException': Name@180) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@188
-    functions('println': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@188
     memberIndex = computeMemberIndex$1@189 // through LazyPackageFragmentScopeForJavaPackage@188
 }
+
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[10] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
+    <name not found> = ArrayList@195[10] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
+}
+
+ResolutionTaskHolder@196 {
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@198 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+}
+
+ResolutionTaskHolder@200 {
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@202 }
+}
+
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
+}
+
+ResolutionTaskHolder@208 {
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@210 }
+}
+
+ResolutionTaskHolder@212 {
+    <name not found> = ArrayList@213[4] { ResolutionCandidate@214, ResolutionCandidate@215, ResolutionCandidate@216, ... }
+    <name not found> = ArrayList@217[5] { ResolutionCandidate@214, ResolutionCandidate@215, ResolutionCandidate@216, ... }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+}
+
+ResolutionTaskHolder@218 {
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.lazy.log

@@ -38,3 +38,285 @@ LazyJavaPackageFragment@9['java'] {
 LazyJavaPackageFragment@11['lang'] {
     deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@41 {
+    <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]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+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> = 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]
+}
+
+ResolutionTaskHolder@114 {
+    <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]
+}
+
+ResolutionTaskHolder@115 {
+    <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]
+}
+
+ResolutionTaskHolder@116 {
+    <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]
+}
+
+ResolutionTaskHolder@117 {
+    <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]
+}
+
+ResolutionTaskHolder@118 {
+    <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]
+}
+
+ResolutionTaskHolder@119 {
+    <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]
+}
+
+ResolutionTaskHolder@120 {
+    <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]
+}
+
+ResolutionTaskHolder@121 {
+    <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]
+}
+
+ResolutionTaskHolder@122 {
+    <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]
+}
+
+ResolutionTaskHolder@123 {
+    <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]
+}
+
+ResolutionTaskHolder@124 {
+    <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/diagnostics/tests/controlFlowAnalysis/kt1189.lazy.log

@@ -13,419 +13,508 @@ LazyJavaClassDescriptor@5['Lock'] {
     functions('lock': Name@7) = ArrayList@8[1] { JavaMethodDescriptor@9['lock'] } // through LazyJavaClassMemberScope@10
     functions('unlock': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['unlock'] } // through LazyJavaClassMemberScope@10
     memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@10
-    properties('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    properties('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@18['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@15['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
 }
 
-LazyJavaClassDescriptor@20['ReadLock'] {
-    defaultType = JetTypeImpl@21['ReadLock']
-    enumEntryIndex = LinkedHashMap@22 // through LazyJavaClassMemberScope@23
-    functions('lock': Name@24) = ArrayList@25[1] { JavaMethodDescriptor@26['lock'] } // through LazyJavaClassMemberScope@23
-    functions('unlock': Name@17) = ArrayList@27[1] { JavaMethodDescriptor@28['unlock'] } // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@29 // through LazyJavaClassMemberScope@23
-    nestedClassIndex = LinkedHashMap@30 // through LazyJavaClassMemberScope@23
-    nestedClasses('lock': Name@24) = null // through LazyJavaClassMemberScope@23
-    nestedClasses('unlock': Name@17) = null // through LazyJavaClassMemberScope@23
-    properties('lock': Name@24) = EmptyList@16[empty] // through LazyJavaClassMemberScope@23
-    properties('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@23
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@31['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@32['ReadLock']
+LazyJavaClassDescriptor@17['ReadLock'] {
+    defaultType = JetTypeImpl@18['ReadLock']
+    enumEntryIndex = LinkedHashMap@19 // through LazyJavaClassMemberScope@20
+    functions('lock': Name@21) = ArrayList@22[1] { JavaMethodDescriptor@23['lock'] } // through LazyJavaClassMemberScope@20
+    functions('unlock': Name@24) = ArrayList@25[1] { JavaMethodDescriptor@26['unlock'] } // through LazyJavaClassMemberScope@20
+    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@20
+    nestedClassIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@20
+    nestedClasses('lock': Name@21) = null // through LazyJavaClassMemberScope@20
+    nestedClasses('unlock': Name@24) = null // through LazyJavaClassMemberScope@20
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@29['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@30['ReadLock']
 }
 
-LazyJavaClassDescriptor@33['ReadWriteLock'] {
-    defaultType = JetTypeImpl@34['ReadWriteLock']
-    functions('action': Name@35) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('compareTo': Name@37) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('equals': Name@38) = ArrayList@39[1] { DeserializedSimpleFunctionDescriptor@40['equals'] } // through LazyJavaClassMemberScope@36
-    functions('getReadHoldCount': Name@41) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('getWriteHoldCount': Name@42) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('hasNext': Name@43) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('invoke': Name@44) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('iterator': Name@45) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('next': Name@46) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('rangeTo': Name@47) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('readLock': Name@48) = ArrayList@49[1] { JavaMethodDescriptor@50['readLock'] } // through LazyJavaClassMemberScope@36
-    functions('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('writeLock': Name@51) = ArrayList@52[1] { JavaMethodDescriptor@53['writeLock'] } // through LazyJavaClassMemberScope@36
-    memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@36
-    properties('action': Name@35) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('compareTo': Name@37) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('equals': Name@38) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('getReadHoldCount': Name@55) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('getWriteHoldCount': Name@56) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('hasNext': Name@43) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('iterator': Name@45) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('next': Name@46) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('rangeTo': Name@47) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('readCount': Name@57) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('readLock': Name@58) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('rl': Name@59) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('wl': Name@60) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('writeCount': Name@61) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('writeLock': Name@62) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@63['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@64['ReadWriteLock']
+LazyJavaClassDescriptor@31['ReadWriteLock'] {
+    defaultType = JetTypeImpl@32['ReadWriteLock']
+    functions('getReadHoldCount': Name@33) = EmptyList@34[empty] // through LazyJavaClassMemberScope@35
+    functions('getWriteHoldCount': Name@36) = EmptyList@34[empty] // through LazyJavaClassMemberScope@35
+    functions('readLock': Name@37) = ArrayList@38[1] { JavaMethodDescriptor@39['readLock'] } // through LazyJavaClassMemberScope@35
+    functions('writeLock': Name@40) = ArrayList@41[1] { JavaMethodDescriptor@42['writeLock'] } // through LazyJavaClassMemberScope@35
+    memberIndex = computeMemberIndex$1@43 // through LazyJavaClassMemberScope@35
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@44['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@45['ReadWriteLock']
 }
 
-LazyJavaClassDescriptor@65['ReentrantReadWriteLock'] {
-    defaultType = JetTypeImpl@66['ReentrantReadWriteLock']
-    enumEntryIndex = LinkedHashMap@67 // through LazyJavaClassMemberScope@68
+LazyJavaClassDescriptor@46['ReentrantReadWriteLock'] {
+    defaultType = JetTypeImpl@47['ReentrantReadWriteLock']
+    enumEntryIndex = LinkedHashMap@48 // through LazyJavaClassMemberScope@49
     functionTypeForSamInterface = null
-    functions('action': Name@35) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    functions('compareTo': Name@37) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    functions('equals': Name@38) = ArrayList@69[1] { DeserializedSimpleFunctionDescriptor@70['equals'] } // through LazyJavaClassMemberScope@68
-    functions('getReadHoldCount': Name@55) = ArrayList@71[1] { JavaMethodDescriptor@72['getReadHoldCount'] } // through LazyJavaClassMemberScope@68
-    functions('getWriteHoldCount': Name@56) = ArrayList@73[1] { JavaMethodDescriptor@74['getWriteHoldCount'] } // through LazyJavaClassMemberScope@68
-    functions('hasNext': Name@43) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    functions('invoke': Name@44) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    functions('iterator': Name@45) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    functions('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    functions('next': Name@46) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    functions('rangeTo': Name@47) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    functions('readLock': Name@58) = ArrayList@75[1] { JavaMethodDescriptor@76['readLock'] } // through LazyJavaClassMemberScope@68
-    functions('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    functions('writeLock': Name@62) = ArrayList@77[1] { JavaMethodDescriptor@78['writeLock'] } // through LazyJavaClassMemberScope@68
-    memberIndex = computeMemberIndex$1@79 // through LazyJavaClassMemberScope@68
-    nestedClassIndex = LinkedHashMap@80 // through LazyJavaClassMemberScope@68
-    nestedClasses('ReadLock': Name@81) = LazyJavaClassDescriptor@20['ReadLock'] // through LazyJavaClassMemberScope@68
-    nestedClasses('WriteLock': Name@82) = LazyJavaClassDescriptor@83['WriteLock'] // through LazyJavaClassMemberScope@68
-    nestedClasses('action': Name@35) = null // through LazyJavaClassMemberScope@68
-    nestedClasses('getReadHoldCount': Name@55) = null // through LazyJavaClassMemberScope@68
-    nestedClasses('getWriteHoldCount': Name@56) = null // through LazyJavaClassMemberScope@68
-    nestedClasses('readCount': Name@57) = null // through LazyJavaClassMemberScope@68
-    nestedClasses('readLock': Name@58) = null // through LazyJavaClassMemberScope@68
-    nestedClasses('rl': Name@59) = null // through LazyJavaClassMemberScope@68
-    nestedClasses('wl': Name@60) = null // through LazyJavaClassMemberScope@68
-    nestedClasses('writeCount': Name@61) = null // through LazyJavaClassMemberScope@68
-    nestedClasses('writeLock': Name@62) = null // through LazyJavaClassMemberScope@68
-    properties('action': Name@35) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('compareTo': Name@37) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('equals': Name@38) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('getReadHoldCount': Name@55) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('getWriteHoldCount': Name@56) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('hasNext': Name@43) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('iterator': Name@45) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('next': Name@46) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('rangeTo': Name@47) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('readCount': Name@57) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('readLock': Name@58) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('rl': Name@59) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('wl': Name@60) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('writeCount': Name@61) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('writeLock': Name@62) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    functions('getReadHoldCount': Name@50) = ArrayList@51[1] { JavaMethodDescriptor@52['getReadHoldCount'] } // through LazyJavaClassMemberScope@49
+    functions('getWriteHoldCount': Name@53) = ArrayList@54[1] { JavaMethodDescriptor@55['getWriteHoldCount'] } // through LazyJavaClassMemberScope@49
+    functions('readLock': Name@56) = ArrayList@57[1] { JavaMethodDescriptor@58['readLock'] } // through LazyJavaClassMemberScope@49
+    functions('writeLock': Name@59) = ArrayList@60[1] { JavaMethodDescriptor@61['writeLock'] } // through LazyJavaClassMemberScope@49
+    memberIndex = computeMemberIndex$1@62 // through LazyJavaClassMemberScope@49
+    nestedClassIndex = LinkedHashMap@63 // through LazyJavaClassMemberScope@49
+    nestedClasses('ReadLock': Name@64) = LazyJavaClassDescriptor@17['ReadLock'] // through LazyJavaClassMemberScope@49
+    nestedClasses('WriteLock': Name@65) = LazyJavaClassDescriptor@66['WriteLock'] // through LazyJavaClassMemberScope@49
+    nestedClasses('getReadHoldCount': Name@50) = null // through LazyJavaClassMemberScope@49
+    nestedClasses('getWriteHoldCount': Name@53) = null // through LazyJavaClassMemberScope@49
+    nestedClasses('readLock': Name@56) = null // through LazyJavaClassMemberScope@49
+    nestedClasses('writeLock': Name@59) = null // through LazyJavaClassMemberScope@49
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@67['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@68['ReentrantReadWriteLock']
+}
+
+LazyJavaClassDescriptor@69['Serializable'] {
+    functions('getReadHoldCount': Name@33) = EmptyList@34[empty] // through LazyJavaClassMemberScope@70
+    functions('getWriteHoldCount': Name@36) = EmptyList@34[empty] // through LazyJavaClassMemberScope@70
+    functions('lock': Name@7) = EmptyList@34[empty] // through LazyJavaClassMemberScope@70
+    functions('readLock': Name@37) = EmptyList@34[empty] // through LazyJavaClassMemberScope@70
+    functions('unlock': Name@11) = EmptyList@34[empty] // through LazyJavaClassMemberScope@70
+    functions('writeLock': Name@40) = EmptyList@34[empty] // through LazyJavaClassMemberScope@70
+    memberIndex = computeMemberIndex$1@71 // through LazyJavaClassMemberScope@70
+    typeConstructor = LazyJavaClassTypeConstructor@72['Serializable']
+}
+
+LazyJavaClassDescriptor@66['WriteLock'] {
+    defaultType = JetTypeImpl@73['WriteLock']
+    enumEntryIndex = LinkedHashMap@74 // through LazyJavaClassMemberScope@75
+    functions('lock': Name@76) = ArrayList@77[1] { JavaMethodDescriptor@78['lock'] } // through LazyJavaClassMemberScope@75
+    functions('unlock': Name@79) = ArrayList@80[1] { JavaMethodDescriptor@81['unlock'] } // through LazyJavaClassMemberScope@75
+    memberIndex = computeMemberIndex$1@82 // through LazyJavaClassMemberScope@75
+    nestedClassIndex = LinkedHashMap@83 // through LazyJavaClassMemberScope@75
+    nestedClasses('lock': Name@76) = null // through LazyJavaClassMemberScope@75
+    nestedClasses('unlock': Name@79) = null // through LazyJavaClassMemberScope@75
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@84['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@85['ReentrantReadWriteLock']
+    typeConstructor = LazyJavaClassTypeConstructor@85['WriteLock']
 }
 
-LazyJavaClassDescriptor@86['Serializable'] {
-    defaultType = JetTypeImpl@87['Serializable']
-    functions('action': Name@35) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('compareTo': Name@37) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('equals': Name@38) = ArrayList@89[1] { DeserializedSimpleFunctionDescriptor@90['equals'] } // through LazyJavaClassMemberScope@88
-    functions('getReadHoldCount': Name@41) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('getWriteHoldCount': Name@42) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('hasNext': Name@43) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('invoke': Name@44) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('iterator': Name@45) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('lock': Name@7) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('next': Name@46) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('rangeTo': Name@47) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('readLock': Name@48) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('unlock': Name@11) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('writeLock': Name@51) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    memberIndex = computeMemberIndex$1@91 // through LazyJavaClassMemberScope@88
-    properties('action': Name@35) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('compareTo': Name@37) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('equals': Name@38) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('getReadHoldCount': Name@55) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('getWriteHoldCount': Name@56) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('hasNext': Name@43) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('iterator': Name@45) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('next': Name@46) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('rangeTo': Name@47) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('readCount': Name@57) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('readLock': Name@58) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('rl': Name@59) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('wl': Name@60) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('writeCount': Name@61) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('writeLock': Name@62) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    typeConstructor = LazyJavaClassTypeConstructor@92['Serializable']
+LazyJavaClassTypeConstructor@16['Lock'] {
+    parameters = ArrayList@86[empty]
+    supertypes = ArrayList@87[1] { JetTypeImpl@88['Any'] }
 }
 
-LazyJavaClassDescriptor@83['WriteLock'] {
-    defaultType = JetTypeImpl@93['WriteLock']
-    enumEntryIndex = LinkedHashMap@94 // through LazyJavaClassMemberScope@95
-    functions('lock': Name@15) = ArrayList@96[1] { JavaMethodDescriptor@97['lock'] } // through LazyJavaClassMemberScope@95
-    functions('unlock': Name@98) = ArrayList@99[1] { JavaMethodDescriptor@100['unlock'] } // through LazyJavaClassMemberScope@95
-    memberIndex = computeMemberIndex$1@101 // through LazyJavaClassMemberScope@95
-    nestedClassIndex = LinkedHashMap@102 // through LazyJavaClassMemberScope@95
-    nestedClasses('lock': Name@15) = null // through LazyJavaClassMemberScope@95
-    nestedClasses('unlock': Name@98) = null // through LazyJavaClassMemberScope@95
-    properties('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@95
-    properties('unlock': Name@98) = EmptyList@16[empty] // through LazyJavaClassMemberScope@95
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@103['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@104['WriteLock']
+LazyJavaClassTypeConstructor@30['ReadLock'] {
+    parameters = ArrayList@89[empty]
+    supertypes = ArrayList@90[2] { LazyJavaClassifierType@91['Lock'], LazyJavaClassifierType@92['Serializable'] }
 }
 
-LazyJavaClassTypeConstructor@19['Lock'] {
-    parameters = ArrayList@105[empty]
-    supertypes = ArrayList@106[1] { JetTypeImpl@107['Any'] }
+LazyJavaClassTypeConstructor@45['ReadWriteLock'] {
+    parameters = ArrayList@93[empty]
+    supertypes = ArrayList@94[1] { JetTypeImpl@88['Any'] }
 }
 
-LazyJavaClassTypeConstructor@32['ReadLock'] {
-    parameters = ArrayList@108[empty]
-    supertypes = ArrayList@109[2] { LazyJavaClassifierType@110['Lock'], LazyJavaClassifierType@111['Serializable'] }
+LazyJavaClassTypeConstructor@68['ReentrantReadWriteLock'] {
+    parameters = ArrayList@95[empty]
+    supertypes = ArrayList@96[2] { LazyJavaClassifierType@97['ReadWriteLock'], LazyJavaClassifierType@98['Serializable'] }
 }
 
-LazyJavaClassTypeConstructor@64['ReadWriteLock'] {
-    parameters = ArrayList@112[empty]
-    supertypes = ArrayList@113[1] { JetTypeImpl@107['Any'] }
+LazyJavaClassTypeConstructor@72['Serializable'] {
+    parameters = ArrayList@99[empty]
+    supertypes = ArrayList@100[1] { JetTypeImpl@88['Any'] }
 }
 
-LazyJavaClassTypeConstructor@85['ReentrantReadWriteLock'] {
-    parameters = ArrayList@114[empty]
-    supertypes = ArrayList@115[2] { LazyJavaClassifierType@116['ReadWriteLock'], LazyJavaClassifierType@117['Serializable'] }
+LazyJavaClassTypeConstructor@85['WriteLock'] {
+    parameters = ArrayList@101[empty]
+    supertypes = ArrayList@102[2] { LazyJavaClassifierType@103['Lock'], LazyJavaClassifierType@104['Serializable'] }
 }
 
-LazyJavaClassTypeConstructor@92['Serializable'] {
-    parameters = ArrayList@118[empty]
-    supertypes = ArrayList@119[1] { JetTypeImpl@107['Any'] }
-}
-
-LazyJavaClassTypeConstructor@104['WriteLock'] {
-    parameters = ArrayList@120[empty]
-    supertypes = ArrayList@121[2] { LazyJavaClassifierType@122['Lock'], LazyJavaClassifierType@123['Serializable'] }
-}
-
-LazyJavaClassifierType@110['Lock'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@125['Lock']
+LazyJavaClassifierType@91['Lock'] {
+    arguments = ArrayList@105[empty]
+    classifier = JavaClassImpl@106['Lock']
     memberScope = LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
+    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
 }
 
-LazyJavaClassifierType@122['Lock'] {
-    arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@127['Lock']
+LazyJavaClassifierType@103['Lock'] {
+    arguments = ArrayList@107[empty]
+    classifier = JavaClassImpl@108['Lock']
     memberScope = LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
+    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
 }
 
-LazyJavaClassifierType@128['Lock'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaClassImpl@130['Lock']
-    nullable = 'false': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
+LazyJavaClassifierType@109['Lock'] {
+    arguments = ArrayList@110[empty]
+    classifier = JavaClassImpl@111['Lock']
+    nullable = 'false': Boolean@112
+    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
 }
 
-LazyJavaClassifierType@132['Lock'] {
-    arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@134['Lock']
-    nullable = 'false': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
+LazyJavaClassifierType@113['Lock'] {
+    arguments = ArrayList@114[empty]
+    classifier = JavaClassImpl@115['Lock']
+    nullable = 'false': Boolean@112
+    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
 }
 
-LazyJavaClassifierType@135['Lock'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaClassImpl@130['Lock']
-    nullable = 'true': Boolean@137
-    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
+LazyJavaClassifierType@116['Lock'] {
+    arguments = ArrayList@117[empty]
+    classifier = JavaClassImpl@115['Lock']
+    nullable = 'true': Boolean@118
+    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
 }
 
-LazyJavaClassifierType@138['Lock'] {
+LazyJavaClassifierType@119['Lock'] {
+    arguments = ArrayList@120[empty]
+    classifier = JavaClassImpl@111['Lock']
+    nullable = 'true': Boolean@118
+    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
+}
+
+LazyJavaClassifierType@121['Object'] {
+    classifier = JavaClassImpl@122['Object']
+    typeConstructor = DeserializedClassTypeConstructor@123
+}
+
+LazyJavaClassifierType@124['Object'] {
+    classifier = JavaClassImpl@125['Object']
+    typeConstructor = DeserializedClassTypeConstructor@123
+}
+
+LazyJavaClassifierType@126['Object'] {
+    classifier = JavaClassImpl@127['Object']
+    typeConstructor = DeserializedClassTypeConstructor@123
+}
+
+LazyJavaClassifierType@128['Object'] {
+    classifier = JavaClassImpl@129['Object']
+    typeConstructor = DeserializedClassTypeConstructor@123
+}
+
+LazyJavaClassifierType@130['Object'] {
+    classifier = JavaClassImpl@131['Object']
+    typeConstructor = DeserializedClassTypeConstructor@123
+}
+
+LazyJavaClassifierType@132['Object'] {
+    classifier = JavaClassImpl@133['Object']
+    typeConstructor = DeserializedClassTypeConstructor@123
+}
+
+LazyJavaClassifierType@134['ReadLock'] {
+    arguments = ArrayList@135[empty]
+    classifier = JavaClassImpl@136['ReadLock']
+    memberScope = LazyJavaClassMemberScope@20
+    nullable = 'false': Boolean@112
+    typeConstructor = LazyJavaClassTypeConstructor@30['ReadLock']
+}
+
+LazyJavaClassifierType@137['ReadLock'] {
+    arguments = ArrayList@138[empty]
+    classifier = JavaClassImpl@136['ReadLock']
+    nullable = 'true': Boolean@118
+    typeConstructor = LazyJavaClassTypeConstructor@30['ReadLock']
+}
+
+LazyJavaClassifierType@97['ReadWriteLock'] {
     arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@134['Lock']
-    nullable = 'true': Boolean@137
-    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
+    classifier = JavaClassImpl@140['ReadWriteLock']
+    memberScope = LazyJavaClassMemberScope@35
+    typeConstructor = LazyJavaClassTypeConstructor@45['ReadWriteLock']
 }
 
-LazyJavaClassifierType@140['Object'] {
-    classifier = JavaClassImpl@141['Object']
-    typeConstructor = DeserializedClassTypeConstructor@142
+LazyJavaClassifierType@92['Serializable'] {
+    arguments = ArrayList@141[empty]
+    classifier = JavaClassImpl@142['Serializable']
+    memberScope = LazyJavaClassMemberScope@70
+    typeConstructor = LazyJavaClassTypeConstructor@72['Serializable']
 }
 
-LazyJavaClassifierType@143['Object'] {
-    classifier = JavaClassImpl@144['Object']
-    typeConstructor = DeserializedClassTypeConstructor@142
+LazyJavaClassifierType@104['Serializable'] {
+    arguments = ArrayList@143[empty]
+    classifier = JavaClassImpl@144['Serializable']
+    memberScope = LazyJavaClassMemberScope@70
+    typeConstructor = LazyJavaClassTypeConstructor@72['Serializable']
 }
 
-LazyJavaClassifierType@145['Object'] {
-    classifier = JavaClassImpl@146['Object']
-    typeConstructor = DeserializedClassTypeConstructor@142
+LazyJavaClassifierType@98['Serializable'] {
+    arguments = ArrayList@145[empty]
+    classifier = JavaClassImpl@146['Serializable']
+    memberScope = LazyJavaClassMemberScope@70
+    typeConstructor = LazyJavaClassTypeConstructor@72['Serializable']
 }
 
-LazyJavaClassifierType@147['Object'] {
-    classifier = JavaClassImpl@148['Object']
-    typeConstructor = DeserializedClassTypeConstructor@142
+LazyJavaClassifierType@147['WriteLock'] {
+    arguments = ArrayList@148[empty]
+    classifier = JavaClassImpl@149['WriteLock']
+    memberScope = LazyJavaClassMemberScope@75
+    nullable = 'false': Boolean@112
+    typeConstructor = LazyJavaClassTypeConstructor@85['WriteLock']
 }
 
-LazyJavaClassifierType@149['Object'] {
-    classifier = JavaClassImpl@150['Object']
-    typeConstructor = DeserializedClassTypeConstructor@142
+LazyJavaClassifierType@150['WriteLock'] {
+    arguments = ArrayList@151[empty]
+    classifier = JavaClassImpl@149['WriteLock']
+    nullable = 'true': Boolean@118
+    typeConstructor = LazyJavaClassTypeConstructor@85['WriteLock']
 }
 
-LazyJavaClassifierType@151['Object'] {
-    classifier = JavaClassImpl@152['Object']
-    typeConstructor = DeserializedClassTypeConstructor@142
+LazyJavaPackageFragmentProvider@152 {
+    packageFragments('<root>': FqName@153) = LazyJavaPackageFragment@154['<root>']
+    packageFragments('ReentrantReadWriteLock': FqName@155) = null
+    packageFragments('T': FqName@156) = null
+    packageFragments('inline': FqName@157) = null
+    packageFragments('java': FqName@158) = LazyJavaPackageFragment@159['java']
+    packageFragments('java.io': FqName@160) = LazyJavaPackageFragment@161['io']
+    packageFragments('java.lang': FqName@162) = LazyJavaPackageFragment@163['lang']
+    packageFragments('java.lang.ReentrantReadWriteLock': FqName@164) = null
+    packageFragments('java.lang.T': FqName@165) = null
+    packageFragments('java.lang.inline': FqName@166) = null
+    packageFragments('java.util': FqName@167) = LazyJavaPackageFragment@168['util']
+    packageFragments('java.util.concurrent': FqName@169) = LazyJavaPackageFragment@170['concurrent']
+    packageFragments('java.util.concurrent.locks': FqName@171) = LazyJavaPackageFragment@172['locks']
+    packageFragments('java.util.concurrent.locks.ReentrantReadWriteLock': FqName@173) = null
+    packageFragments('kotlin': FqName@174) = null
+    packageFragments('kotlin.ReentrantReadWriteLock': FqName@175) = null
+    packageFragments('kotlin.T': FqName@176) = null
+    packageFragments('kotlin.inline': FqName@177) = null
+    packageFragments('kotlin.io': FqName@178) = null
+    packageFragments('kotlin.jvm': FqName@179) = null
+    packageFragments('kt1189': FqName@180) = null
+    packageFragments('kt1189.ReentrantReadWriteLock': FqName@181) = null
+    packageFragments('kt1189.T': FqName@182) = null
+    packageFragments('kt1189.inline': FqName@183) = null
+    topLevelClasses(JavaClassImpl@115['Lock']) = LazyJavaClassDescriptor@5['Lock']
+    topLevelClasses(JavaClassImpl@140['ReadWriteLock']) = LazyJavaClassDescriptor@31['ReadWriteLock']
+    topLevelClasses(JavaClassImpl@184['ReentrantReadWriteLock']) = LazyJavaClassDescriptor@46['ReentrantReadWriteLock']
+    topLevelClasses(JavaClassImpl@146['Serializable']) = LazyJavaClassDescriptor@69['Serializable']
 }
 
-LazyJavaClassifierType@153['ReadLock'] {
-    arguments = ArrayList@154[empty]
-    classifier = JavaClassImpl@155['ReadLock']
-    memberScope = LazyJavaClassMemberScope@23
-    nullable = 'false': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@32['ReadLock']
+LazyJavaPackageFragment@170['concurrent'] {
+    classes('locks': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@186
+    deserializedPackageScope = Empty@187 // through LazyPackageFragmentScopeForJavaPackage@186
+    functions('locks': Name@188) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@186
+    memberIndex = computeMemberIndex$1@189 // through LazyPackageFragmentScopeForJavaPackage@186
 }
 
-LazyJavaClassifierType@156['ReadLock'] {
-    arguments = ArrayList@157[empty]
-    classifier = JavaClassImpl@155['ReadLock']
-    nullable = 'true': Boolean@137
-    typeConstructor = LazyJavaClassTypeConstructor@32['ReadLock']
+LazyJavaPackageFragment@159['java'] {
+    classes('lang': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('util': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    deserializedPackageScope = Empty@187 // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('lang': Name@193) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('util': Name@194) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    memberIndex = computeMemberIndex$1@195 // through LazyPackageFragmentScopeForJavaPackage@191
 }
 
-LazyJavaClassifierType@116['ReadWriteLock'] {
-    arguments = ArrayList@158[empty]
-    classifier = JavaClassImpl@159['ReadWriteLock']
-    memberScope = LazyJavaClassMemberScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@64['ReadWriteLock']
+LazyJavaPackageFragment@163['lang'] {
+    classes('action': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('getReadHoldCount': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('getWriteHoldCount': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('readLock': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('writeLock': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    deserializedPackageScope = Empty@187 // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('action': Name@196) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('getReadHoldCount': Name@50) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('getWriteHoldCount': Name@53) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('readLock': Name@56) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('writeLock': Name@59) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    memberIndex = computeMemberIndex$1@198 // through LazyPackageFragmentScopeForJavaPackage@197
 }
 
-LazyJavaClassifierType@111['Serializable'] {
-    arguments = ArrayList@160[empty]
-    classifier = JavaClassImpl@161['Serializable']
-    memberScope = LazyJavaClassMemberScope@88
-    typeConstructor = LazyJavaClassTypeConstructor@92['Serializable']
+LazyJavaPackageFragment@172['locks'] {
+    classes('ReentrantReadWriteLock': Name@199) = LazyJavaClassDescriptor@46['ReentrantReadWriteLock'] // through LazyPackageFragmentScopeForJavaPackage@200
+    deserializedPackageScope = Empty@187 // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('ReentrantReadWriteLock': Name@201) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    memberIndex = computeMemberIndex$1@202 // through LazyPackageFragmentScopeForJavaPackage@200
 }
 
-LazyJavaClassifierType@123['Serializable'] {
-    arguments = ArrayList@162[empty]
-    classifier = JavaClassImpl@163['Serializable']
-    memberScope = LazyJavaClassMemberScope@88
-    typeConstructor = LazyJavaClassTypeConstructor@92['Serializable']
+LazyJavaPackageFragment@168['util'] {
+    classes('concurrent': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@204
+    deserializedPackageScope = Empty@187 // through LazyPackageFragmentScopeForJavaPackage@204
+    functions('concurrent': Name@205) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@204
+    memberIndex = computeMemberIndex$1@206 // through LazyPackageFragmentScopeForJavaPackage@204
 }
 
-LazyJavaClassifierType@117['Serializable'] {
-    arguments = ArrayList@164[empty]
-    classifier = JavaClassImpl@165['Serializable']
-    memberScope = LazyJavaClassMemberScope@88
-    typeConstructor = LazyJavaClassTypeConstructor@92['Serializable']
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
 
-LazyJavaClassifierType@166['WriteLock'] {
-    arguments = ArrayList@167[empty]
-    classifier = JavaClassImpl@168['WriteLock']
-    memberScope = LazyJavaClassMemberScope@95
-    nullable = 'false': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@104['WriteLock']
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@213 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
 
-LazyJavaClassifierType@169['WriteLock'] {
-    arguments = ArrayList@170[empty]
-    classifier = JavaClassImpl@168['WriteLock']
-    nullable = 'true': Boolean@137
-    typeConstructor = LazyJavaClassTypeConstructor@104['WriteLock']
+ResolutionTaskHolder@215 {
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@217 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
 
-LazyJavaPackageFragmentProvider@171 {
-    packageFragments('<root>': FqName@172) = LazyJavaPackageFragment@173['<root>']
-    packageFragments('ReentrantReadWriteLock': FqName@174) = null
-    packageFragments('T': FqName@175) = null
-    packageFragments('inline': FqName@176) = null
-    packageFragments('java': FqName@177) = LazyJavaPackageFragment@178['java']
-    packageFragments('java.io': FqName@179) = LazyJavaPackageFragment@180['io']
-    packageFragments('java.lang': FqName@181) = LazyJavaPackageFragment@182['lang']
-    packageFragments('java.lang.ReentrantReadWriteLock': FqName@183) = null
-    packageFragments('java.lang.T': FqName@184) = null
-    packageFragments('java.lang.inline': FqName@185) = null
-    packageFragments('java.util': FqName@186) = LazyJavaPackageFragment@187['util']
-    packageFragments('java.util.concurrent': FqName@188) = LazyJavaPackageFragment@189['concurrent']
-    packageFragments('java.util.concurrent.locks': FqName@190) = LazyJavaPackageFragment@191['locks']
-    packageFragments('java.util.concurrent.locks.ReentrantReadWriteLock': FqName@192) = null
-    packageFragments('kotlin': FqName@193) = null
-    packageFragments('kotlin.ReentrantReadWriteLock': FqName@194) = null
-    packageFragments('kotlin.T': FqName@195) = null
-    packageFragments('kotlin.inline': FqName@196) = null
-    packageFragments('kotlin.io': FqName@197) = null
-    packageFragments('kotlin.jvm': FqName@198) = null
-    packageFragments('kt1189': FqName@199) = null
-    packageFragments('kt1189.ReentrantReadWriteLock': FqName@200) = null
-    packageFragments('kt1189.T': FqName@201) = null
-    packageFragments('kt1189.inline': FqName@202) = null
-    topLevelClasses(JavaClassImpl@134['Lock']) = LazyJavaClassDescriptor@5['Lock']
-    topLevelClasses(JavaClassImpl@159['ReadWriteLock']) = LazyJavaClassDescriptor@33['ReadWriteLock']
-    topLevelClasses(JavaClassImpl@203['ReentrantReadWriteLock']) = LazyJavaClassDescriptor@65['ReentrantReadWriteLock']
-    topLevelClasses(JavaClassImpl@165['Serializable']) = LazyJavaClassDescriptor@86['Serializable']
+ResolutionTaskHolder@219 {
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
 
-LazyJavaPackageFragment@189['concurrent'] {
-    classes('locks': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@205
-    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@205
-    functions('locks': Name@207) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@205
-    memberIndex = computeMemberIndex$1@208 // through LazyPackageFragmentScopeForJavaPackage@205
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
 
-LazyJavaPackageFragment@178['java'] {
-    classes('lang': Name@209) = null // through LazyPackageFragmentScopeForJavaPackage@210
-    classes('util': Name@211) = null // through LazyPackageFragmentScopeForJavaPackage@210
-    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@210
-    functions('lang': Name@212) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@210
-    functions('util': Name@213) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@210
-    memberIndex = computeMemberIndex$1@214 // through LazyPackageFragmentScopeForJavaPackage@210
+ResolutionTaskHolder@227 {
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
 }
 
-LazyJavaPackageFragment@182['lang'] {
-    classes('action': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('compareTo': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('equals': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('getReadHoldCount': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('getWriteHoldCount': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('hasNext': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('invoke': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('iterator': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('lock': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('next': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('rangeTo': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('readLock': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('unlock': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('writeLock': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('action': Name@35) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('compareTo': Name@37) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('equals': Name@38) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('getReadHoldCount': Name@55) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('getWriteHoldCount': Name@56) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('hasNext': Name@43) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('invoke': Name@44) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('iterator': Name@45) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('lock': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('next': Name@46) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('rangeTo': Name@47) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('readLock': Name@58) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('unlock': Name@17) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('writeLock': Name@62) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    memberIndex = computeMemberIndex$1@216 // through LazyPackageFragmentScopeForJavaPackage@215
+ResolutionTaskHolder@231 {
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
 }
 
-LazyJavaPackageFragment@191['locks'] {
-    classes('ReentrantReadWriteLock': Name@217) = LazyJavaClassDescriptor@65['ReentrantReadWriteLock'] // through LazyPackageFragmentScopeForJavaPackage@218
-    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@218
-    functions('ReentrantReadWriteLock': Name@219) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    memberIndex = computeMemberIndex$1@220 // through LazyPackageFragmentScopeForJavaPackage@218
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
 }
 
-LazyJavaPackageFragment@187['util'] {
-    classes('concurrent': Name@221) = null // through LazyPackageFragmentScopeForJavaPackage@222
-    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@222
-    functions('concurrent': Name@223) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@222
-    memberIndex = computeMemberIndex$1@224 // through LazyPackageFragmentScopeForJavaPackage@222
+ResolutionTaskHolder@239 {
+    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@241 }
+}
+
+ResolutionTaskHolder@243 {
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
+}
+
+ResolutionTaskHolder@247 {
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
+}
+
+ResolutionTaskHolder@251 {
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
+}
+
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
+}
+
+ResolutionTaskHolder@259 {
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
+}
+
+ResolutionTaskHolder@263 {
+    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@265 }
+}
+
+ResolutionTaskHolder@267 {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
+}
+
+ResolutionTaskHolder@271 {
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
+    <name not found> = ArrayList@274[1] { ResolutionCandidate@273 }
+}
+
+ResolutionTaskHolder@275 {
+    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@277 }
+}
+
+ResolutionTaskHolder@279 {
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
+}
+
+ResolutionTaskHolder@283 {
+    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
+    <name not found> = ArrayList@286[1] { ResolutionCandidate@285 }
+}
+
+ResolutionTaskHolder@287 {
+    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@289 }
+}
+
+ResolutionTaskHolder@291 {
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@293 }
+}
+
+ResolutionTaskHolder@295 {
+    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
+    <name not found> = ArrayList@298[1] { ResolutionCandidate@297 }
+}
+
+ResolutionTaskHolder@299 {
+    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
+    <name not found> = ArrayList@302[1] { ResolutionCandidate@301 }
+}
+
+ResolutionTaskHolder@303 {
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@305 }
+}
+
+ResolutionTaskHolder@307 {
+    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
+    <name not found> = ArrayList@310[1] { ResolutionCandidate@309 }
+}
+
+ResolutionTaskHolder@311 {
+    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@313 }
+}
+
+ResolutionTaskHolder@315 {
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@317 }
+}
+
+ResolutionTaskHolder@319 {
+    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
+    <name not found> = ArrayList@322[1] { ResolutionCandidate@321 }
+}
+
+ResolutionTaskHolder@323 {
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@325 }
+}
+
+ResolutionTaskHolder@327 {
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@329 }
+}
+
+ResolutionTaskHolder@331 {
+    <name not found> = ArrayList@332[7] { ResolutionCandidate@333, ResolutionCandidate@334, ResolutionCandidate@335, ... }
+    <name not found> = ArrayList@336[7] { ResolutionCandidate@333, ResolutionCandidate@334, ResolutionCandidate@335, ... }
+}
+
+ResolutionTaskHolder@337 {
+    <name not found> = ArrayList@338[7] { ResolutionCandidate@339, ResolutionCandidate@340, ResolutionCandidate@341, ... }
+    <name not found> = ArrayList@342[7] { ResolutionCandidate@339, ResolutionCandidate@340, ResolutionCandidate@341, ... }
+}
+
+ResolutionTaskHolder@343 {
+    <name not found> = ArrayList@344[7] { ResolutionCandidate@345, ResolutionCandidate@346, ResolutionCandidate@347, ... }
+    <name not found> = ArrayList@348[7] { ResolutionCandidate@345, ResolutionCandidate@346, ResolutionCandidate@347, ... }
+}
+
+ResolutionTaskHolder@349 {
+    <name not found> = ArrayList@350[7] { ResolutionCandidate@351, ResolutionCandidate@352, ResolutionCandidate@353, ... }
+    <name not found> = ArrayList@354[7] { ResolutionCandidate@351, ResolutionCandidate@352, ResolutionCandidate@353, ... }
+}
+
+ResolutionTaskHolder@355 {
+    <name not found> = ArrayList@356[7] { ResolutionCandidate@357, ResolutionCandidate@358, ResolutionCandidate@359, ... }
+    <name not found> = ArrayList@360[7] { ResolutionCandidate@357, ResolutionCandidate@358, ResolutionCandidate@359, ... }
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.lazy.log

@@ -39,9 +39,22 @@ LazyJavaPackageFragment@13['java'] {
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }
 
-LazyJavaPackageFragment@15['lang'] {
-    classes('plus': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('plus': Name@35) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+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[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
+    <name not found> = ArrayList@52[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.lazy.log

@@ -1,46 +1,40 @@
 LazyJavaClassDescriptor@0['Appendable'] {
     functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
     memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
 }
 
-LazyJavaClassDescriptor@7['AutoCloseable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@8
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@10['AutoCloseable']
+LazyJavaClassDescriptor@6['AutoCloseable'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@7
+    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
+    typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@11['Closeable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@12
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+LazyJavaClassDescriptor@10['Closeable'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
+    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
 }
 
-LazyJavaClassDescriptor@15['FilterOutputStream'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@16
-    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@16
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@16
-    typeConstructor = LazyJavaClassTypeConstructor@18['FilterOutputStream']
+LazyJavaClassDescriptor@14['FilterOutputStream'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@15
+    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
+    typeConstructor = LazyJavaClassTypeConstructor@17['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@19['OutputStream'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@20
-    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@20
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@20
-    typeConstructor = LazyJavaClassTypeConstructor@22['OutputStream']
+LazyJavaClassDescriptor@18['OutputStream'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@19
+    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
+    typeConstructor = LazyJavaClassTypeConstructor@21['OutputStream']
 }
 
-LazyJavaClassDescriptor@23['PrintStream'] {
-    defaultType = JetTypeImpl@24['PrintStream']
-    enumEntryIndex = LinkedHashMap@25 // through LazyJavaClassMemberScope@26
-    functions('println': Name@5) = ArrayList@27[10] { JavaMethodDescriptor@28['println'], JavaMethodDescriptor@29['println'], JavaMethodDescriptor@30['println'], ... } // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@26
-    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@26
-    nestedClasses('println': Name@5) = null // through LazyJavaClassMemberScope@26
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
+LazyJavaClassDescriptor@22['PrintStream'] {
+    defaultType = JetTypeImpl@23['PrintStream']
+    enumEntryIndex = LinkedHashMap@24 // through LazyJavaClassMemberScope@25
+    functions('println': Name@26) = ArrayList@27[10] { JavaMethodDescriptor@28['println'], JavaMethodDescriptor@29['println'], JavaMethodDescriptor@30['println'], ... } // through LazyJavaClassMemberScope@25
+    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@25
+    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@25
+    nestedClasses('println': Name@26) = null // through LazyJavaClassMemberScope@25
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@34['PrintStream']
 }
@@ -56,27 +50,27 @@ LazyJavaClassDescriptor@35['System'] {
     typeConstructor = LazyJavaClassTypeConstructor@45['System']
 }
 
-LazyJavaClassTypeConstructor@6['Appendable'] {
+LazyJavaClassTypeConstructor@5['Appendable'] {
     parameters = ArrayList@46[empty]
     supertypes = ArrayList@47[1] { JetTypeImpl@48['Any'] }
 }
 
-LazyJavaClassTypeConstructor@10['AutoCloseable'] {
+LazyJavaClassTypeConstructor@9['AutoCloseable'] {
     parameters = ArrayList@49[empty]
     supertypes = ArrayList@50[1] { JetTypeImpl@48['Any'] }
 }
 
-LazyJavaClassTypeConstructor@14['Closeable'] {
+LazyJavaClassTypeConstructor@13['Closeable'] {
     parameters = ArrayList@51[empty]
     supertypes = ArrayList@52[1] { LazyJavaClassifierType@53['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@18['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@17['FilterOutputStream'] {
     parameters = ArrayList@54[empty]
     supertypes = ArrayList@55[1] { LazyJavaClassifierType@56['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@22['OutputStream'] {
+LazyJavaClassTypeConstructor@21['OutputStream'] {
     parameters = ArrayList@57[empty]
     supertypes = ArrayList@58[1] { LazyJavaClassifierType@59['Closeable'] }
 }
@@ -94,35 +88,35 @@ LazyJavaClassifierType@63['Appendable'] {
     arguments = ArrayList@66[empty]
     classifier = JavaClassImpl@67['Appendable']
     memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
 }
 
 LazyJavaClassifierType@53['AutoCloseable'] {
     arguments = ArrayList@68[empty]
     classifier = JavaClassImpl@69['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@10['AutoCloseable']
-}
-
-LazyJavaClassifierType@59['Closeable'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@71['Closeable']
-    memberScope = LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+    memberScope = LazyJavaClassMemberScope@7
+    typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
 }
 
 LazyJavaClassifierType@64['Closeable'] {
+    arguments = ArrayList@70[empty]
+    classifier = JavaClassImpl@71['Closeable']
+    memberScope = LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
+}
+
+LazyJavaClassifierType@59['Closeable'] {
     arguments = ArrayList@72[empty]
     classifier = JavaClassImpl@73['Closeable']
-    memberScope = LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+    memberScope = LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
 }
 
 LazyJavaClassifierType@62['FilterOutputStream'] {
     arguments = ArrayList@74[empty]
     classifier = JavaClassImpl@75['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@16
-    typeConstructor = LazyJavaClassTypeConstructor@18['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@15
+    typeConstructor = LazyJavaClassTypeConstructor@17['FilterOutputStream']
 }
 
 LazyJavaClassifierType@76['Flushable'] {
@@ -167,14 +161,14 @@ LazyJavaClassifierType@92['Object'] {
 LazyJavaClassifierType@56['OutputStream'] {
     arguments = ArrayList@94[empty]
     classifier = JavaClassImpl@95['OutputStream']
-    memberScope = LazyJavaClassMemberScope@20
-    typeConstructor = LazyJavaClassTypeConstructor@22['OutputStream']
+    memberScope = LazyJavaClassMemberScope@19
+    typeConstructor = LazyJavaClassTypeConstructor@21['OutputStream']
 }
 
 LazyJavaClassifierType@96['PrintStream'] {
     arguments = ArrayList@97[empty]
     classifier = JavaClassImpl@98['PrintStream']
-    memberScope = LazyJavaClassMemberScope@26
+    memberScope = LazyJavaClassMemberScope@25
     nullable = 'false': Boolean@81
     typeConstructor = LazyJavaClassTypeConstructor@34['PrintStream']
 }
@@ -230,11 +224,11 @@ LazyJavaPackageFragmentProvider@107 {
     packageFragments('kt1219.T': FqName@138) = null
     packageFragments('kt1219.Unit': FqName@139) = null
     topLevelClasses(JavaClassImpl@67['Appendable']) = LazyJavaClassDescriptor@0['Appendable']
-    topLevelClasses(JavaClassImpl@69['AutoCloseable']) = LazyJavaClassDescriptor@7['AutoCloseable']
-    topLevelClasses(JavaClassImpl@73['Closeable']) = LazyJavaClassDescriptor@11['Closeable']
-    topLevelClasses(JavaClassImpl@75['FilterOutputStream']) = LazyJavaClassDescriptor@15['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@95['OutputStream']) = LazyJavaClassDescriptor@19['OutputStream']
-    topLevelClasses(JavaClassImpl@98['PrintStream']) = LazyJavaClassDescriptor@23['PrintStream']
+    topLevelClasses(JavaClassImpl@69['AutoCloseable']) = LazyJavaClassDescriptor@6['AutoCloseable']
+    topLevelClasses(JavaClassImpl@71['Closeable']) = LazyJavaClassDescriptor@10['Closeable']
+    topLevelClasses(JavaClassImpl@75['FilterOutputStream']) = LazyJavaClassDescriptor@14['FilterOutputStream']
+    topLevelClasses(JavaClassImpl@95['OutputStream']) = LazyJavaClassDescriptor@18['OutputStream']
+    topLevelClasses(JavaClassImpl@98['PrintStream']) = LazyJavaClassDescriptor@22['PrintStream']
     topLevelClasses(JavaClassImpl@140['System']) = LazyJavaClassDescriptor@35['System']
 }
 
@@ -249,22 +243,132 @@ LazyJavaPackageFragment@120['lang'] {
     classes('System': Name@146) = LazyJavaClassDescriptor@35['System'] // through LazyPackageFragmentScopeForJavaPackage@147
     classes('bar': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@147
     classes('foreach': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('hasNext': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('invoke': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('iterator': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('next': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('op': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('operation': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('println': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@147
+    classes('op': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@147
+    classes('operation': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@147
     deserializedPackageScope = Empty@143 // through LazyPackageFragmentScopeForJavaPackage@147
     functions('bar': Name@148) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
     functions('foreach': Name@149) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('hasNext': Name@150) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('invoke': Name@151) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('iterator': Name@152) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('next': Name@153) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('op': Name@154) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('operation': Name@155) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('println': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    memberIndex = computeMemberIndex$1@156 // through LazyPackageFragmentScopeForJavaPackage@147
+    functions('op': Name@150) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
+    functions('operation': Name@151) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
+    memberIndex = computeMemberIndex$1@152 // through LazyPackageFragmentScopeForJavaPackage@147
+}
+
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[10] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
+    <name not found> = ArrayList@158[10] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
+}
+
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+}
+
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+}
+
+ResolutionTaskHolder@167 {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+}
+
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+}
+
+ResolutionTaskHolder@175 {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@177 }
+}
+
+ResolutionTaskHolder@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
+}
+
+ResolutionTaskHolder@183 {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
+}
+
+ResolutionTaskHolder@187 {
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@189 }
+}
+
+ResolutionTaskHolder@191 {
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@193 }
+}
+
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
+}
+
+ResolutionTaskHolder@199 {
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@201 }
+}
+
+ResolutionTaskHolder@203 {
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
+}
+
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
+}
+
+ResolutionTaskHolder@211 {
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@213 }
+}
+
+ResolutionTaskHolder@215 {
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@217 }
+}
+
+ResolutionTaskHolder@219 {
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
+}
+
+ResolutionTaskHolder@223 {
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@225 }
+}
+
+ResolutionTaskHolder@227 {
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
+}
+
+ResolutionTaskHolder@231 {
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1571.lazy.log

@@ -45,18 +45,212 @@ LazyJavaPackageFragment@11['lang'] {
     classes('c1': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('c2': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('div': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('divAssign': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('equals': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('inc': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('times': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('timesAssign': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('timesAssign': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
     deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
     functions('A': Name@35) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     functions('div': Name@41) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('divAssign': Name@42) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@43) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('inc': Name@44) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('times': Name@45) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('timesAssign': Name@46) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('timesAssign': Name@42) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@36
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+    <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@51 {
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+    <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@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+    <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@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+}
+
+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> = 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]
+    <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@131 {
+    <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]
+    <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]
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1977.lazy.log

@@ -113,14 +113,14 @@ LazyJavaClassifierType@63['String'] {
 
 LazyJavaClassifierType@66['String'] {
     arguments = ArrayList@67[empty]
-    classifier = JavaClassImpl@61['String']
+    classifier = JavaClassImpl@65['String']
     nullable = 'true': Boolean@52
     typeConstructor = DeserializedClassTypeConstructor@62
 }
 
 LazyJavaClassifierType@68['String'] {
     arguments = ArrayList@69[empty]
-    classifier = JavaClassImpl@65['String']
+    classifier = JavaClassImpl@61['String']
     nullable = 'true': Boolean@52
     typeConstructor = DeserializedClassTypeConstructor@62
 }
@@ -182,3 +182,98 @@ LazyJavaPackageFragment@84['lang'] {
     functions('bar': Name@115) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@112
     memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@112
 }
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+}
+
+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[2] { ResolutionCandidate@139, ResolutionCandidate@140 }
+    <name not found> = ArrayList@141[2] { ResolutionCandidate@139, ResolutionCandidate@140 }
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[2] { ResolutionCandidate@144, ResolutionCandidate@145 }
+    <name not found> = ArrayList@146[2] { ResolutionCandidate@144, ResolutionCandidate@145 }
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[2] { ResolutionCandidate@149, ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[2] { ResolutionCandidate@149, ResolutionCandidate@150 }
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@152 {
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@153 {
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@154 {
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2166_kt2103.lazy.log

@@ -29,3 +29,12 @@ LazyJavaPackageFragment@11['lang'] {
     functions('bar': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
 }
+
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+    <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/diagnostics/tests/controlFlowAnalysis/kt2226.lazy.log

@@ -35,9 +35,17 @@ LazyJavaPackageFragment@15['java'] {
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
-LazyJavaPackageFragment@17['lang'] {
-    classes('foo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('foo': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+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 }
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2330.lazy.log

@@ -44,3 +44,235 @@ LazyJavaPackageFragment@16['lang'] {
     functions('p': Name@36) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+ResolutionTaskHolder@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+    <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]
+    <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]
+    <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@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+    <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]
+    <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]
+    <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@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+    <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@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+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> = 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]
+    <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]
+    <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]
+    <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]
+    <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]
+    <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]
+    <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]
+    <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]
+    <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]
+    <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@111 {
+    <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]
+    <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]
+    <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]
+    <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]
+    <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]
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.lazy.log

@@ -37,7 +37,7 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -51,7 +51,7 @@ LazyJavaClassifierType@27['String'] {
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -86,14 +86,14 @@ LazyJavaClassifierType@41['Throwable'] {
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -133,28 +133,57 @@ LazyJavaPackageFragment@51['<root>'] {
     classes('Int': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('String': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('doSmth': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('plus': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('Exception': Name@75) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('doSmth': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('plus': Name@79) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@73
+    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('Exception': Name@75) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('doSmth': Name@78) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
 LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('lang': Name@85) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('lang': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('lang': Name@84) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
 LazyJavaPackageFragment@59['lang'] {
-    classes('Exception': Name@75) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('doSmth': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('plus': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('Exception': Name@75) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('doSmth': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('plus': Name@79) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('Exception': Name@75) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('doSmth': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('Exception': Name@75) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('doSmth': Name@78) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@86
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+}
+
+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[4] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
+    <name not found> = ArrayList@105[5] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+}
+
+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/diagnostics/tests/controlFlowAnalysis/kt2845.lazy.log

@@ -117,9 +117,9 @@ LazyJavaClassifierType@67['E'] {
 
 LazyJavaClassifierType@69['E'] {
     arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@62['E']
+    classifier = JavaTypeParameterImpl@65['E']
     nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@71['E'] {
@@ -131,9 +131,9 @@ LazyJavaClassifierType@71['E'] {
 
 LazyJavaClassifierType@73['E'] {
     arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@65['E']
+    classifier = JavaTypeParameterImpl@62['E']
     nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@22['List<E>'] {
@@ -211,36 +211,72 @@ LazyJavaPackageFragment@100['java'] {
 
 LazyJavaPackageFragment@104['lang'] {
     classes('ArrayList': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('add': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('equals': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('equals': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@125
     deserializedPackageScope = Empty@119 // through LazyPackageFragmentScopeForJavaPackage@125
     functions('ArrayList': Name@124) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('add': Name@126) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('equals': Name@127) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('equals': Name@126) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@125
 }
 
 LazyJavaPackageFragment@108['util'] {
-    classes('ArrayList': Name@129) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@130
-    deserializedPackageScope = Empty@119 // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('ArrayList': Name@131) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    memberIndex = computeMemberIndex$1@132 // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('ArrayList': Name@128) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@129
+    deserializedPackageScope = Empty@119 // through LazyPackageFragmentScopeForJavaPackage@129
+    functions('ArrayList': Name@130) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@129
+    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@129
 }
 
 LazyJavaTypeParameterDescriptor@24['E'] {
-    defaultType = JetTypeImpl@133['E']
+    defaultType = JetTypeImpl@132['E']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-    upperBounds = LinkedHashSet@134[1] { NullableType@135 }
+    upperBounds = LinkedHashSet@133[1] { NullableType@134 }
 }
 
 LazyJavaTypeParameterDescriptor@19['E'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
-LazyJavaTypeParameterResolver@136 {
-    resolve(JavaTypeParameterImpl@137['E']) = LazyJavaTypeParameterDescriptor@19['E']
+LazyJavaTypeParameterResolver@135 {
+    resolve(JavaTypeParameterImpl@136['E']) = LazyJavaTypeParameterDescriptor@24['E']
 }
 
-LazyJavaTypeParameterResolver@138 {
-    resolve(JavaTypeParameterImpl@139['E']) = LazyJavaTypeParameterDescriptor@24['E']
+LazyJavaTypeParameterResolver@137 {
+    resolve(JavaTypeParameterImpl@138['E']) = LazyJavaTypeParameterDescriptor@19['E']
+}
+
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+    <name not found> = EmptyList@121[empty]
+    <name not found> = EmptyList@121[empty]
+}
+
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+}
+
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+}
+
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+}
+
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[2] { ResolutionCandidate@160, ResolutionCandidate@161 }
+    <name not found> = ArrayList@162[2] { ResolutionCandidate@160, ResolutionCandidate@161 }
+}
+
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[3] { ResolutionCandidate@165, ResolutionCandidate@166, ResolutionCandidate@167 }
+    <name not found> = ArrayList@168[3] { ResolutionCandidate@165, ResolutionCandidate@166, ResolutionCandidate@167 }
+    <name not found> = EmptyList@121[empty]
+    <name not found> = EmptyList@121[empty]
+    <name not found> = EmptyList@121[empty]
+    <name not found> = EmptyList@121[empty]
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.lazy.log

@@ -49,3 +49,120 @@ LazyJavaPackageFragment@24['lang'] {
     functions('doSmth': Name@39) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@37
 }
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+}
+
+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 }
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2972.lazy.log

@@ -6,173 +6,189 @@ LazyAnnotationDescriptor@0 {
 
 LazyJavaClassDescriptor@4['AutoCloseable'] {
     defaultType = JetTypeImpl@5['AutoCloseable']
-    functions('block': Name@6) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('clone': Name@9) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('close': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['close'] } // through LazyJavaClassMemberScope@8
-    functions('equals': Name@13) = ArrayList@14[1] { DeserializedSimpleFunctionDescriptor@15['equals'] } // through LazyJavaClassMemberScope@8
-    functions('finalize': Name@16) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('getClass': Name@17) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('hashCode': Name@18) = ArrayList@19[1] { DeserializedSimpleFunctionDescriptor@20['hashCode'] } // through LazyJavaClassMemberScope@8
-    functions('invoke': Name@21) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('not': Name@22) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('notify': Name@23) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('notifyAll': Name@24) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('toString': Name@25) = ArrayList@26[1] { DeserializedSimpleFunctionDescriptor@27['toString'] } // through LazyJavaClassMemberScope@8
-    functions('wait': Name@28) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    memberIndex = computeMemberIndex$1@29 // through LazyJavaClassMemberScope@8
-    properties('block': Name@6) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    properties('close': Name@30) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    properties('closed': Name@31) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    properties('e': Name@32) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    properties('not': Name@22) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@34['AutoCloseable']
+    functions('clone': Name@6) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    functions('close': Name@9) = ArrayList@10[1] { JavaMethodDescriptor@11['close'] } // through LazyJavaClassMemberScope@8
+    functions('equals': Name@12) = ArrayList@13[1] { DeserializedSimpleFunctionDescriptor@14['equals'] } // through LazyJavaClassMemberScope@8
+    functions('finalize': Name@15) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    functions('getClass': Name@16) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    functions('hashCode': Name@17) = ArrayList@18[1] { DeserializedSimpleFunctionDescriptor@19['hashCode'] } // through LazyJavaClassMemberScope@8
+    functions('notify': Name@20) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    functions('notifyAll': Name@21) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    functions('toString': Name@22) = ArrayList@23[1] { DeserializedSimpleFunctionDescriptor@24['toString'] } // through LazyJavaClassMemberScope@8
+    functions('wait': Name@25) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    memberIndex = computeMemberIndex$1@26 // through LazyJavaClassMemberScope@8
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@27['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@28['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@35['Closeable'] {
-    allDescriptors = ArrayList@36[4] { DeserializedSimpleFunctionDescriptor@37['hashCode'], JavaMethodDescriptor@38['close'], DeserializedSimpleFunctionDescriptor@39['toString'], ... } // through LazyJavaClassMemberScope@40
-    annotations = LazyJavaAnnotations@41
-    defaultType = JetTypeImpl@42['Closeable']
-    enumEntryIndex = LinkedHashMap@43 // through LazyJavaClassMemberScope@40
-    functionTypeForSamInterface = JetTypeImpl@44['Function0<1>']
-    functions('block': Name@6) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    functions('clone': Name@9) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    functions('close': Name@45) = ArrayList@46[1] { JavaMethodDescriptor@38['close'] } // through LazyJavaClassMemberScope@40
-    functions('equals': Name@13) = ArrayList@47[1] { DeserializedSimpleFunctionDescriptor@48['equals'] } // through LazyJavaClassMemberScope@40
-    functions('finalize': Name@16) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    functions('getClass': Name@17) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    functions('hashCode': Name@18) = ArrayList@49[1] { DeserializedSimpleFunctionDescriptor@37['hashCode'] } // through LazyJavaClassMemberScope@40
-    functions('invoke': Name@21) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    functions('not': Name@22) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    functions('notify': Name@23) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    functions('notifyAll': Name@24) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    functions('toString': Name@25) = ArrayList@50[1] { DeserializedSimpleFunctionDescriptor@39['toString'] } // through LazyJavaClassMemberScope@40
-    functions('wait': Name@28) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    memberIndex = computeMemberIndex$1@51 // through LazyJavaClassMemberScope@40
-    nestedClassIndex = LinkedHashMap@52 // through LazyJavaClassMemberScope@40
-    nestedClasses('block': Name@6) = null // through LazyJavaClassMemberScope@40
-    nestedClasses('close': Name@30) = null // through LazyJavaClassMemberScope@40
-    nestedClasses('closed': Name@31) = null // through LazyJavaClassMemberScope@40
-    nestedClasses('e': Name@32) = null // through LazyJavaClassMemberScope@40
-    properties('block': Name@6) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    properties('close': Name@30) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    properties('closed': Name@31) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    properties('e': Name@32) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    properties('not': Name@22) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@53['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@54['Closeable']
+LazyJavaClassDescriptor@29['Closeable'] {
+    allDescriptors = ArrayList@30[4] { DeserializedSimpleFunctionDescriptor@31['hashCode'], JavaMethodDescriptor@32['close'], DeserializedSimpleFunctionDescriptor@33['toString'], ... } // through LazyJavaClassMemberScope@34
+    annotations = LazyJavaAnnotations@35
+    defaultType = JetTypeImpl@36['Closeable']
+    enumEntryIndex = LinkedHashMap@37 // through LazyJavaClassMemberScope@34
+    functionTypeForSamInterface = JetTypeImpl@38['Function0<1>']
+    functions('clone': Name@6) = EmptyList@7[empty] // through LazyJavaClassMemberScope@34
+    functions('close': Name@39) = ArrayList@40[1] { JavaMethodDescriptor@32['close'] } // through LazyJavaClassMemberScope@34
+    functions('equals': Name@12) = ArrayList@41[1] { DeserializedSimpleFunctionDescriptor@42['equals'] } // through LazyJavaClassMemberScope@34
+    functions('finalize': Name@15) = EmptyList@7[empty] // through LazyJavaClassMemberScope@34
+    functions('getClass': Name@16) = EmptyList@7[empty] // through LazyJavaClassMemberScope@34
+    functions('hashCode': Name@17) = ArrayList@43[1] { DeserializedSimpleFunctionDescriptor@31['hashCode'] } // through LazyJavaClassMemberScope@34
+    functions('notify': Name@20) = EmptyList@7[empty] // through LazyJavaClassMemberScope@34
+    functions('notifyAll': Name@21) = EmptyList@7[empty] // through LazyJavaClassMemberScope@34
+    functions('toString': Name@22) = ArrayList@44[1] { DeserializedSimpleFunctionDescriptor@33['toString'] } // through LazyJavaClassMemberScope@34
+    functions('wait': Name@25) = EmptyList@7[empty] // through LazyJavaClassMemberScope@34
+    memberIndex = computeMemberIndex$1@45 // through LazyJavaClassMemberScope@34
+    nestedClassIndex = LinkedHashMap@46 // through LazyJavaClassMemberScope@34
+    nestedClasses('close': Name@47) = null // through LazyJavaClassMemberScope@34
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@48['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@49['Closeable']
 }
 
-LazyJavaClassDescriptor@55['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@56['Exception']
+LazyJavaClassDescriptor@50['Exception'] {
+    typeConstructor = LazyJavaClassTypeConstructor@51['Exception']
 }
 
-LazyJavaClassTypeConstructor@34['AutoCloseable'] {
-    parameters = ArrayList@57[empty]
-    supertypes = ArrayList@58[1] { JetTypeImpl@59['Any'] }
+LazyJavaClassTypeConstructor@28['AutoCloseable'] {
+    parameters = ArrayList@52[empty]
+    supertypes = ArrayList@53[1] { JetTypeImpl@54['Any'] }
 }
 
-LazyJavaClassTypeConstructor@54['Closeable'] {
-    parameters = ArrayList@60[empty]
-    supertypes = ArrayList@61[1] { LazyJavaClassifierType@62['AutoCloseable'] }
+LazyJavaClassTypeConstructor@49['Closeable'] {
+    parameters = ArrayList@55[empty]
+    supertypes = ArrayList@56[1] { LazyJavaClassifierType@57['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@56['Exception'] {
-    parameters = ArrayList@63[empty]
-    supertypes = ArrayList@64[1] { LazyJavaClassifierType@65['Throwable'] }
+LazyJavaClassTypeConstructor@51['Exception'] {
+    parameters = ArrayList@58[empty]
+    supertypes = ArrayList@59[1] { LazyJavaClassifierType@60['Throwable'] }
 }
 
-LazyJavaClassifierType@62['AutoCloseable'] {
-    arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@67['AutoCloseable']
+LazyJavaClassifierType@57['AutoCloseable'] {
+    arguments = ArrayList@61[empty]
+    classifier = JavaClassImpl@62['AutoCloseable']
     memberScope = LazyJavaClassMemberScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@34['AutoCloseable']
+    typeConstructor = LazyJavaClassTypeConstructor@28['AutoCloseable']
 }
 
-LazyJavaClassifierType@68['Object'] {
-    classifier = JavaClassImpl@69['Object']
-    typeConstructor = DeserializedClassTypeConstructor@70
+LazyJavaClassifierType@63['Object'] {
+    classifier = JavaClassImpl@64['Object']
+    typeConstructor = DeserializedClassTypeConstructor@65
 }
 
-LazyJavaClassifierType@65['Throwable'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaClassImpl@72['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@73
+LazyJavaClassifierType@60['Throwable'] {
+    arguments = ArrayList@66[empty]
+    classifier = JavaClassImpl@67['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@68
 }
 
-LazyJavaPackageFragmentProvider@74 {
-    packageFragments('<root>': FqName@75) = LazyJavaPackageFragment@76['<root>']
-    packageFragments('Closeable': FqName@77) = null
-    packageFragments('Exception': FqName@78) = null
-    packageFragments('R': FqName@79) = null
-    packageFragments('T': FqName@80) = null
-    packageFragments('inline': FqName@81) = null
-    packageFragments('java': FqName@82) = LazyJavaPackageFragment@83['java']
-    packageFragments('java.io': FqName@84) = LazyJavaPackageFragment@85['io']
-    packageFragments('java.io.Closeable': FqName@86) = null
-    packageFragments('java.lang': FqName@87) = LazyJavaPackageFragment@88['lang']
-    packageFragments('java.lang.Closeable': FqName@89) = null
-    packageFragments('java.lang.Exception': FqName@90) = null
-    packageFragments('java.lang.R': FqName@91) = null
-    packageFragments('java.lang.T': FqName@92) = null
-    packageFragments('java.lang.inline': FqName@93) = null
-    packageFragments('kotlin': FqName@94) = null
-    packageFragments('kotlin.Closeable': FqName@95) = null
-    packageFragments('kotlin.Exception': FqName@96) = null
-    packageFragments('kotlin.R': FqName@97) = null
-    packageFragments('kotlin.T': FqName@98) = null
-    packageFragments('kotlin.inline': FqName@99) = null
-    packageFragments('kotlin.io': FqName@100) = null
-    packageFragments('kotlin.jvm': FqName@101) = null
-    topLevelClasses(JavaClassImpl@67['AutoCloseable']) = LazyJavaClassDescriptor@4['AutoCloseable']
-    topLevelClasses(JavaClassImpl@102['Closeable']) = LazyJavaClassDescriptor@35['Closeable']
-    topLevelClasses(JavaClassImpl@103['Exception']) = LazyJavaClassDescriptor@55['Exception']
+LazyJavaPackageFragmentProvider@69 {
+    packageFragments('<root>': FqName@70) = LazyJavaPackageFragment@71['<root>']
+    packageFragments('Closeable': FqName@72) = null
+    packageFragments('Exception': FqName@73) = null
+    packageFragments('R': FqName@74) = null
+    packageFragments('T': FqName@75) = null
+    packageFragments('inline': FqName@76) = null
+    packageFragments('java': FqName@77) = LazyJavaPackageFragment@78['java']
+    packageFragments('java.io': FqName@79) = LazyJavaPackageFragment@80['io']
+    packageFragments('java.io.Closeable': FqName@81) = null
+    packageFragments('java.lang': FqName@82) = LazyJavaPackageFragment@83['lang']
+    packageFragments('java.lang.Closeable': FqName@84) = null
+    packageFragments('java.lang.Exception': FqName@85) = null
+    packageFragments('java.lang.R': FqName@86) = null
+    packageFragments('java.lang.T': FqName@87) = null
+    packageFragments('java.lang.inline': FqName@88) = null
+    packageFragments('kotlin': FqName@89) = null
+    packageFragments('kotlin.Closeable': FqName@90) = null
+    packageFragments('kotlin.Exception': FqName@91) = null
+    packageFragments('kotlin.R': FqName@92) = null
+    packageFragments('kotlin.T': FqName@93) = null
+    packageFragments('kotlin.inline': FqName@94) = null
+    packageFragments('kotlin.io': FqName@95) = null
+    packageFragments('kotlin.jvm': FqName@96) = null
+    topLevelClasses(JavaClassImpl@62['AutoCloseable']) = LazyJavaClassDescriptor@4['AutoCloseable']
+    topLevelClasses(JavaClassImpl@97['Closeable']) = LazyJavaClassDescriptor@29['Closeable']
+    topLevelClasses(JavaClassImpl@98['Exception']) = LazyJavaClassDescriptor@50['Exception']
 }
 
-LazyJavaPackageFragment@76['<root>'] {
-    classes('Closeable': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('Exception': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('block': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('close': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('inline': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('java': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('not': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('block': Name@6) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('close': Name@30) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('invoke': Name@21) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('java': Name@110) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('not': Name@22) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@105
+LazyJavaPackageFragment@71['<root>'] {
+    classes('Closeable': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('Exception': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('block': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('inline': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('java': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('block': Name@102) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('java': Name@106) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@100
 }
 
-LazyJavaPackageFragment@85['io'] {
-    classes('Closeable': Name@112) = LazyJavaClassDescriptor@35['Closeable'] // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('Closeable': Name@114) = ArrayList@115[1] { SamConstructorDescriptor@116['Closeable'] } // through LazyPackageFragmentScopeForJavaPackage@113
-    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@113
+LazyJavaPackageFragment@80['io'] {
+    classes('Closeable': Name@108) = LazyJavaClassDescriptor@29['Closeable'] // through LazyPackageFragmentScopeForJavaPackage@109
+    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@109
+    functions('Closeable': Name@110) = ArrayList@111[1] { SamConstructorDescriptor@112['Closeable'] } // through LazyPackageFragmentScopeForJavaPackage@109
+    memberIndex = computeMemberIndex$1@113 // through LazyPackageFragmentScopeForJavaPackage@109
 }
 
-LazyJavaPackageFragment@83['java'] {
-    classes('io': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('lang': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('io': Name@121) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('lang': Name@122) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@119
+LazyJavaPackageFragment@78['java'] {
+    classes('io': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('lang': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('io': Name@117) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('lang': Name@118) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@115
 }
 
-LazyJavaPackageFragment@88['lang'] {
-    classes('Exception': Name@106) = LazyJavaClassDescriptor@55['Exception'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('block': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('close': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('not': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('block': Name@6) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('close': Name@30) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('invoke': Name@21) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('not': Name@22) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    memberIndex = computeMemberIndex$1@125 // through LazyPackageFragmentScopeForJavaPackage@124
+LazyJavaPackageFragment@83['lang'] {
+    classes('Exception': Name@101) = LazyJavaClassDescriptor@50['Exception'] // through LazyPackageFragmentScopeForJavaPackage@120
+    classes('block': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@120
+    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@120
+    functions('block': Name@102) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@120
+    memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@120
+}
+
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+}
+
+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[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+}
+
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+}
+
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
+}
+
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+}
+
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+}
+
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+}
+
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3501.lazy.log

@@ -12,16 +12,16 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('String': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@17
+    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
-LazyJavaPackageFragment@7['lang'] {
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@21
+ResolutionTaskHolder@21 {
+    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt510.lazy.log

@@ -25,3 +25,15 @@ LazyJavaPackageFragment@7['lang'] {
     classes('field': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
     deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt607.lazy.log

@@ -27,6 +27,22 @@ LazyJavaPackageFragment@8['java'] {
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
-LazyJavaPackageFragment@10['lang'] {
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
+}
+
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+}
+
+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 }
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt609.lazy.log

@@ -28,3 +28,18 @@ LazyJavaPackageFragment@7['java'] {
     functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
 }
+
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+}
+
+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 }
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt610.lazy.log

@@ -14,3 +14,8 @@ LazyJavaPackageFragment@4['java'] {
     functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
     memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
 }
+
+ResolutionTaskHolder@17 {
+    <name not found> = ArrayList@18[1] { ResolutionCandidate@19 }
+    <name not found> = ArrayList@20[1] { ResolutionCandidate@19 }
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt776.lazy.log

@@ -20,12 +20,62 @@ LazyJavaPackageFragment@5['java'] {
 }
 
 LazyJavaPackageFragment@7['lang'] {
-    classes('compareTo': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('doSmth': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('inc': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('doSmth': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
     deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('compareTo': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('doSmth': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('inc': Name@24) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('doSmth': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
+}
+
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+}
+
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+}
+
+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> = 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, ... }
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt897.lazy.log

@@ -30,3 +30,24 @@ LazyJavaPackageFragment@9['lang'] {
     classes('k': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
     deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesOrderInPackage.lazy.log

@@ -31,3 +31,17 @@ LazyJavaPackageFragment@12['lang'] {
     classes('b': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
     deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+}
+
+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]
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/referenceToPropertyInitializer.lazy.log

@@ -48,18 +48,160 @@ LazyJavaPackageFragment@14['java'] {
 
 LazyJavaPackageFragment@16['lang'] {
     classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('invoke': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('minus': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('obj': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('obj1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('plus': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('sum': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('x': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('obj': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('obj1': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('sum': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('x': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@40
     deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@40
     functions('foo': Name@39) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('invoke': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('minus': Name@42) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('plus': Name@45) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('sum': Name@46) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('sum': Name@43) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@40
+}
+
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+}
+
+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[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, ... }
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/repeatUnitializedErrorOnlyForLocalVars.lazy.log

@@ -32,8 +32,77 @@ LazyJavaPackageFragment@11['java'] {
 LazyJavaPackageFragment@13['lang'] {
     classes('a': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('b': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
     deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('plus': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[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[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+    <name not found> = ArrayList@65[8] { 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, ... }
+}
+
+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/diagnostics/tests/controlFlowAnalysis/scopeOfAnonymousInitializer.lazy.log

@@ -28,3 +28,10 @@ LazyJavaPackageFragment@8['lang'] {
     classes('a': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@23
     deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedInLocalDeclarations.lazy.log

@@ -64,3 +64,106 @@ LazyJavaPackageFragment@20['lang'] {
     functions('doSmth': Name@38) = 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 }
+    <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@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+    <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@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+    <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@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+    <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@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 }
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/unmappedArgs.lazy.log

@@ -17,25 +17,64 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('plus': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('foo': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('plus': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('foo': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('plus': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('foo': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('plus': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('foo': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
+}
+
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+}
+
+ResolutionTaskHolder@31 {
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
+}
+
+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[8] { ResolutionCandidate@45, ResolutionCandidate@46, ResolutionCandidate@47, ... }
+    <name not found> = ArrayList@48[8] { ResolutionCandidate@45, ResolutionCandidate@46, ResolutionCandidate@47, ... }
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.lazy.log

@@ -28,38 +28,81 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Boolean': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('Collection': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('compareTo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('hasNext': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('iterator': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('next': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('use': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('compareTo': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('hasNext': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('iterator': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('next': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('use': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('use': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('use': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 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@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
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('compareTo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('hasNext': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('iterator': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('next': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('use': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('compareTo': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('hasNext': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('iterator': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('next': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('use': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('use': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('use': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+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> = ArrayList@52[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+}
+
+ResolutionTaskHolder@63 {
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+}
+
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = ArrayList@80[7] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
+    <name not found> = ArrayList@84[7] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
 }