Updated lazy log tests

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@15['String']
+    classifier = JavaClassImpl@20['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@20['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@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
 }
@@ -157,21 +157,24 @@ LazyJavaPackageFragment@58['lang'] {
 
 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@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
-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, ... }
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[4] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}
+
+null {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@98[5] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
     <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

@@ -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@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -147,61 +147,64 @@ LazyJavaPackageFragment@62['lang'] {
 
 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]
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <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 }
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
     <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]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <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]
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
     <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, ... }
+null {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@113[5] { ResolutionCandidate@104, ResolutionCandidate@105, 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]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <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

@@ -39,21 +39,21 @@ LazyJavaClassifierType@23['String'] {
 
 LazyJavaClassifierType@26['String'] {
     arguments = ArrayList@27[empty]
-    classifier = JavaClassImpl@25['String']
+    classifier = JavaClassImpl@22['String']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@19
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@17['String']
+    classifier = JavaClassImpl@25['String']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@19
 }
 
 LazyJavaClassifierType@31['String'] {
     arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@22['String']
+    classifier = JavaClassImpl@17['String']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@19
 }
@@ -81,21 +81,21 @@ LazyJavaClassifierType@40['Throwable'] {
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@39['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@36
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@42['Throwable']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@36
 }
 
 LazyJavaClassifierType@47['Throwable'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@42['Throwable']
+    classifier = JavaClassImpl@39['Throwable']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@36
 }
@@ -155,44 +155,47 @@ LazyJavaPackageFragment@59['lang'] {
 
 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]
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
     <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 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@75[empty]
 }
 
 ResolutionTaskHolder@95 {
     <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[4] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
     <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, ... }
+null {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@108[5] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <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

@@ -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
 }
@@ -153,43 +153,46 @@ LazyJavaPackageFragment@57['lang'] {
 
 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]
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <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 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <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> = ArrayList@94[4] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
     <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, ... }
+null {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@102[5] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
+    <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/deadCodeDifferentExamples.lazy.log

@@ -52,21 +52,21 @@ LazyJavaClassifierType@28['String'] {
 
 LazyJavaClassifierType@31['String'] {
     arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@27['String']
+    classifier = JavaClassImpl@30['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@34['String'] {
     arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@22['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@36['String'] {
     arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@30['String']
+    classifier = JavaClassImpl@22['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
@@ -94,21 +94,21 @@ LazyJavaClassifierType@45['Throwable'] {
 
 LazyJavaClassifierType@48['Throwable'] {
     arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@44['Throwable']
+    classifier = JavaClassImpl@47['Throwable']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@41
 }
 
 LazyJavaClassifierType@50['Throwable'] {
     arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@47['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@41
 }
 
 LazyJavaClassifierType@52['Throwable'] {
     arguments = ArrayList@53[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@44['Throwable']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@41
 }
@@ -181,168 +181,129 @@ LazyJavaPackageFragment@67['lang'] {
 
 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> = ArrayList@104[1] { ResolutionCandidate@105 }
+    <name not found> = EmptyList@92[empty]
+}
+
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
     <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]
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
     <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@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
 }
 
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+}
+
+ResolutionTaskHolder@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
 }
 
 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@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
+}
+
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
 }
 
 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@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
 }
 
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
 }
 
 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@151 {
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
 }
 
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
+}
+
+ResolutionTaskHolder@157 {
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
 }
 
 ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@161[4] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
+    <name not found> = EmptyList@92[empty]
+    <name not found> = EmptyList@92[empty]
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[7] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
 }
 
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[7] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
 }
 
-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@175 {
+    <name not found> = ArrayList@176[7] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
 }
 
 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]
+    <name not found> = ArrayList@181[7] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
 }
 
-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@185 {
+    <name not found> = ArrayList@186[7] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189, ... }
 }
 
-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@190 {
+    <name not found> = ArrayList@191[7] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
 }
 
-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@195 {
+    <name not found> = ArrayList@196[7] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
 }
 
-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@200 {
+    <name not found> = ArrayList@201[7] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
+}
+
+ResolutionTaskHolder@205 {
+    <name not found> = ArrayList@206[7] { ResolutionCandidate@207, ResolutionCandidate@208, ResolutionCandidate@209, ... }
 }
 
 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]
@@ -353,7 +314,49 @@ ResolutionTaskHolder@240 {
     <name not found> = EmptyList@92[empty]
 }
 
-ResolutionTaskHolder@241 {
+ResolutionTaskHolder@211 {
+    <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]
+}
+
+null {
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@135 }
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@153 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@226[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@232[5] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
+    <name not found> = ArrayList@233[7] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
+    <name not found> = ArrayList@234[7] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
+    <name not found> = ArrayList@235[7] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189, ... }
+    <name not found> = ArrayList@236[7] { ResolutionCandidate@207, ResolutionCandidate@208, ResolutionCandidate@209, ... }
+    <name not found> = ArrayList@237[7] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
+    <name not found> = ArrayList@238[7] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
+    <name not found> = ArrayList@239[7] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
+    <name not found> = ArrayList@240[7] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
+    <name not found> = ArrayList@241[7] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
+    <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

@@ -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
 }
@@ -141,59 +141,62 @@ LazyJavaPackageFragment@60['lang'] {
 
 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]
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <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@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
 }
 
 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@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
 ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@104[4] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
+    <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]
 }
 
-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]
+null {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@116[5] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
     <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@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@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -93,7 +93,7 @@ LazyJavaClassifierType@43['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -177,12 +177,6 @@ LazyJavaPackageFragment@60['lang'] {
 
 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]
@@ -208,185 +202,194 @@ ResolutionTaskHolder@96 {
     <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]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <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 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
     <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]
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
     <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 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
     <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]
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
     <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 }
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
     <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]
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
     <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]
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
     <name not found> = EmptyList@88[empty]
     <name not found> = EmptyList@88[empty]
 }
 
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
+}
+
 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@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
 }
 
-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@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
+}
+
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
 }
 
 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@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
 }
 
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
+}
+
+ResolutionTaskHolder@165 {
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
 }
 
 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@171 {
+    <name not found> = ArrayList@172[4] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
 }
 
-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, ... }
+null {
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@201[5] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
+    <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]
+    <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]

compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInAssignment.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
 }
@@ -149,69 +149,72 @@ LazyJavaPackageFragment@56['lang'] {
 
 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]
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <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 }
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
+}
+
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
     <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]
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[4] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
     <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@103 {
+    <name not found> = ArrayList@104[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
 }
 
-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, ... }
+null {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@115[5] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+    <name not found> = ArrayList@116[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
     <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,14 +37,14 @@ 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@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -161,118 +161,121 @@ LazyJavaPackageFragment@58['lang'] {
 
 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]
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
     <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 }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
     <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]
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
     <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 }
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
     <name not found> = EmptyList@78[empty]
     <name not found> = EmptyList@78[empty]
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
     <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@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
 }
 
-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@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+}
+
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
 }
 
 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@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
 }
 
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[4] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
 }
 
-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, ... }
+null {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@151[5] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <name not found> = EmptyList@78[empty]
+    <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@20['String']
+    classifier = JavaClassImpl@15['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@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -86,14 +86,14 @@ LazyJavaClassifierType@41['Throwable'] {
 
 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@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -165,42 +165,45 @@ LazyJavaPackageFragment@59['lang'] {
 
 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]
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
     <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]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
     <name not found> = EmptyList@82[empty]
 }
 
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+}
+
 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@105 {
+    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
 }
 
-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, ... }
+null {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@115[5] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <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]

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

@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['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
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['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@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@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -153,62 +153,65 @@ LazyJavaPackageFragment@57['lang'] {
 
 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]
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <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 }
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@73[empty]
     <name not found> = EmptyList@73[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <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]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
     <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, ... }
+null {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@114[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <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/deadCodeInIf.lazy.log

@@ -37,7 +37,7 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -51,7 +51,7 @@ LazyJavaClassifierType@27['String'] {
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@15['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
 }
@@ -149,49 +149,52 @@ LazyJavaPackageFragment@56['lang'] {
 
 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]
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <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@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
 }
 
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+}
+
 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@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[4] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
 }
 
-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, ... }
+null {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@106[5] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <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

@@ -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,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@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -165,61 +165,38 @@ LazyJavaPackageFragment@59['lang'] {
 
 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]
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
     <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 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <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@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
 }
 
-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]
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
@@ -230,9 +207,35 @@ ResolutionTaskHolder@114 {
     <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, ... }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[4] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+null {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@124[5] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
+    <name not found> = ArrayList@125[5] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+    <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]
     <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@25['String']
+    classifier = JavaClassImpl@30['String']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@27
 }
 
 LazyJavaClassifierType@37['String'] {
     arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@30['String']
+    classifier = JavaClassImpl@33['String']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@27
 }
 
 LazyJavaClassifierType@39['String'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@33['String']
+    classifier = JavaClassImpl@25['String']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@27
 }
@@ -103,21 +103,21 @@ LazyJavaClassifierType@48['Throwable'] {
 
 LazyJavaClassifierType@51['Throwable'] {
     arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@50['Throwable']
+    classifier = JavaClassImpl@43['Throwable']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaClassifierType@53['Throwable'] {
     arguments = ArrayList@54[empty]
-    classifier = JavaClassImpl@43['Throwable']
+    classifier = JavaClassImpl@47['Throwable']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaClassifierType@55['Throwable'] {
     arguments = ArrayList@56[empty]
-    classifier = JavaClassImpl@47['Throwable']
+    classifier = JavaClassImpl@50['Throwable']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@44
 }
@@ -180,95 +180,98 @@ LazyJavaPackageFragment@68['lang'] {
 
 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]
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
     <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 }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
+}
+
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
     <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]
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
     <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]
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
     <name not found> = EmptyList@86[empty]
     <name not found> = EmptyList@86[empty]
 }
 
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
+}
+
 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@121 {
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
 }
 
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
+}
+
+ResolutionTaskHolder@127 {
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
 }
 
 ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@131[4] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
 }
 
-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, ... }
+null {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@129 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@147[5] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <name not found> = EmptyList@86[empty]
+    <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

@@ -45,14 +45,14 @@ LazyJavaClassifierType@25['String'] {
 
 LazyJavaClassifierType@28['String'] {
     arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@24['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@30['String'] {
     arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@24['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -80,21 +80,21 @@ LazyJavaClassifierType@39['Throwable'] {
 
 LazyJavaClassifierType@42['Throwable'] {
     arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@41['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@44['Throwable'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@34['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@46['Throwable'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@34['Throwable']
+    classifier = JavaClassImpl@41['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
@@ -154,74 +154,77 @@ LazyJavaPackageFragment@57['lang'] {
 
 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]
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <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 }
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@71[empty]
     <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <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@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
 }
 
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
 }
 
 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> = ArrayList@104[4] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
     <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, ... }
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[7] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+}
+
+null {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@121[5] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
+    <name not found> = ArrayList@122[7] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
 }

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

@@ -37,21 +37,21 @@ LazyJavaClassifierType@21['String'] {
 
 LazyJavaClassifierType@24['String'] {
     arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['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
 }
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@15['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@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -93,7 +93,7 @@ LazyJavaClassifierType@43['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -141,16 +141,19 @@ LazyJavaPackageFragment@55['lang'] {
 
 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, ... }
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[4] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+}
+
+null {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@81[5] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
     <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

@@ -37,7 +37,7 @@ 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
 }
@@ -51,7 +51,7 @@ LazyJavaClassifierType@27['String'] {
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -79,21 +79,21 @@ LazyJavaClassifierType@38['Throwable'] {
 
 LazyJavaClassifierType@41['Throwable'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@37['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
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -157,53 +157,56 @@ LazyJavaPackageFragment@57['lang'] {
 
 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]
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <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 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@74[empty]
     <name not found> = EmptyList@74[empty]
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
     <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]
+}
+
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+}
+
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[4] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
     <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, ... }
+null {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@111[5] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <name not found> = EmptyList@74[empty]
+    <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

@@ -46,87 +46,90 @@ LazyJavaPackageFragment@9['lang'] {
 
 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]
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
     <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]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@26[empty]
     <name not found> = EmptyList@26[empty]
 }
 
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
 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@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
 }
 
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
 }
 
 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@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
 }
 
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[7] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
 }
 
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[7] { ResolutionCandidate@74, ResolutionCandidate@75, 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@77 {
+    <name not found> = ArrayList@78[7] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
 }
 
-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@82 {
+    <name not found> = ArrayList@83[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
 }
 
-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, ... }
+null {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@98[7] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
+    <name not found> = ArrayList@99[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
+    <name not found> = ArrayList@100[7] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
+    <name not found> = ArrayList@101[7] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
+    <name not found> = EmptyList@26[empty]
 }

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

@@ -49,21 +49,24 @@ LazyJavaPackageFragment@10['lang'] {
 
 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]
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
     <name not found> = EmptyList@29[empty]
 }
 
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+ResolutionTaskHolder@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+}
+
+null {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@45 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
 }

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

@@ -55,14 +55,14 @@ LazyJavaClassifierType@29['String'] {
 
 LazyJavaClassifierType@32['String'] {
     arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@28['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@31
     typeConstructor = DeserializedClassTypeConstructor@22
 }
 
 LazyJavaClassifierType@34['String'] {
     arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@28['String']
     nullable = 'true': Boolean@31
     typeConstructor = DeserializedClassTypeConstructor@22
 }
@@ -90,7 +90,7 @@ LazyJavaClassifierType@43['Throwable'] {
 
 LazyJavaClassifierType@46['Throwable'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@42['Throwable']
     nullable = 'true': Boolean@31
     typeConstructor = DeserializedClassTypeConstructor@39
 }
@@ -104,7 +104,7 @@ LazyJavaClassifierType@48['Throwable'] {
 
 LazyJavaClassifierType@50['Throwable'] {
     arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@42['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@31
     typeConstructor = DeserializedClassTypeConstructor@39
 }
@@ -158,14 +158,17 @@ LazyJavaPackageFragment@62['lang'] {
 
 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]
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[4] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}
+
+null {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@94[5] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
     <name not found> = EmptyList@77[empty]
     <name not found> = EmptyList@77[empty]
 }

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

@@ -52,14 +52,14 @@ LazyJavaClassifierType@28['String'] {
 
 LazyJavaClassifierType@31['String'] {
     arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@27['String']
+    classifier = JavaClassImpl@30['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@34['String'] {
     arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@30['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
@@ -162,25 +162,28 @@ LazyJavaPackageFragment@63['lang'] {
 
 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]
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[4] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
     <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, ... }
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[4] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = EmptyList@76[empty]
+    <name not found> = EmptyList@76[empty]
+}
+
+null {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@98[5] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
+    <name not found> = ArrayList@99[5] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = EmptyList@76[empty]
+    <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,14 +73,14 @@ LazyJavaClassifierType@41['String'] {
 
 LazyJavaClassifierType@44['String'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@40['String']
+    classifier = JavaClassImpl@43['String']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@47['String'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@43['String']
+    classifier = JavaClassImpl@32['String']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -94,7 +94,7 @@ LazyJavaClassifierType@49['String'] {
 
 LazyJavaClassifierType@51['String'] {
     arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@32['String']
+    classifier = JavaClassImpl@40['String']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -122,21 +122,21 @@ LazyJavaClassifierType@60['Throwable'] {
 
 LazyJavaClassifierType@63['Throwable'] {
     arguments = ArrayList@64[empty]
-    classifier = JavaClassImpl@62['Throwable']
+    classifier = JavaClassImpl@55['Throwable']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@56
 }
 
 LazyJavaClassifierType@65['Throwable'] {
     arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@55['Throwable']
+    classifier = JavaClassImpl@59['Throwable']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@56
 }
 
 LazyJavaClassifierType@67['Throwable'] {
     arguments = ArrayList@68[empty]
-    classifier = JavaClassImpl@59['Throwable']
+    classifier = JavaClassImpl@62['Throwable']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@56
 }
@@ -190,16 +190,19 @@ LazyJavaPackageFragment@78['lang'] {
 
 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, ... }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+}
+
+null {
+    <name not found> = ArrayList@107[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
+    <name not found> = ArrayList@108[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
     <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

@@ -47,10 +47,13 @@ LazyJavaPackageFragment@16['lang'] {
 
 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@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+}
+
+null {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@37 }
 }

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

@@ -125,57 +125,60 @@ LazyJavaPackageFragment@50['lang'] {
 
 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]
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <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]
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
     <name not found> = EmptyList@69[empty]
 }
 
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+}
+
 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@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+}
+
+ResolutionTaskHolder@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
 }
 
 ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@102[2] { ResolutionCandidate@103, ResolutionCandidate@104 }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
 }
 
-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 }
+null {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@113[2] { ResolutionCandidate@103, ResolutionCandidate@104 }
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
+    <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]
     <name not found> = EmptyList@69[empty]