Updated lazy log tests

compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.lazy.log

@@ -56,14 +56,14 @@ LazyJavaClassifierType@30['String'] {
 
 LazyJavaClassifierType@33['String'] {
     arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@32['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@29
 }
 
 LazyJavaClassifierType@36['String'] {
     arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@27['String']
+    classifier = JavaClassImpl@32['String']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@29
 }
@@ -154,15 +154,6 @@ LazyJavaPackageFragment@62['lang'] {
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[4] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
-    <name not found> = ArrayList@95[4] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
-    <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]
@@ -173,17 +164,8 @@ ResolutionTaskHolder@90 {
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[4] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-    <name not found> = ArrayList@101[4] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <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@95 {
+    <name not found> = ArrayList@96[4] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
     <name not found> = EmptyList@82[empty]
@@ -194,9 +176,30 @@ ResolutionTaskHolder@96 {
     <name not found> = EmptyList@82[empty]
 }
 
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = ArrayList@107[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[4] { ResolutionCandidate@102, ResolutionCandidate@103, 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]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+}
+
+null {
+    <name not found> = ArrayList@105[4] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
+    <name not found> = ArrayList@106[4] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
+    <name not found> = ArrayList@107[4] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
+    <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/multimodule/duplicateClass/differentGenericArguments.lazy.log

@@ -52,7 +52,7 @@ LazyJavaPackageFragment@20['<root>'] {
     memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@45
 }
 
-LazyJavaPackageFragment@35['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@52
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@52
     classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@52
@@ -63,7 +63,7 @@ LazyJavaPackageFragment@35['<root>'] {
     memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@35['<root>'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@54
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@54
     classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@54
@@ -81,14 +81,14 @@ LazyJavaPackageFragment@37['java'] {
     memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@57
 }
 
-LazyJavaPackageFragment@23['java'] {
+LazyJavaPackageFragment@6['java'] {
     classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@61
     functions('lang': Name@62) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@61
     memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
 }
 
-LazyJavaPackageFragment@6['java'] {
+LazyJavaPackageFragment@23['java'] {
     classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@65
     functions('lang': Name@66) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@65
@@ -126,10 +126,6 @@ LazyJavaPackageFragment@8['lang'] {
 
 ResolutionTaskHolder@75 {
     <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -147,17 +143,8 @@ ResolutionTaskHolder@75 {
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -168,16 +155,32 @@ ResolutionTaskHolder@79 {
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+}
+
+null {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@77 }
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
 }

compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.lazy.log

@@ -41,7 +41,7 @@ LazyJavaPackageFragmentProvider@34 {
     packageFragments('p': FqName@43) = null
 }
 
-LazyJavaPackageFragment@35['<root>'] {
+LazyJavaPackageFragment@21['<root>'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@45
@@ -52,7 +52,7 @@ LazyJavaPackageFragment@35['<root>'] {
     memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@45
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@35['<root>'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@52
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@52
     classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@52
@@ -63,7 +63,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
 }
 
-LazyJavaPackageFragment@21['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@54
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@54
     classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@54
@@ -81,14 +81,14 @@ LazyJavaPackageFragment@37['java'] {
     memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@57
 }
 
-LazyJavaPackageFragment@6['java'] {
+LazyJavaPackageFragment@24['java'] {
     classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@61
     functions('lang': Name@62) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@61
     memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
 }
 
-LazyJavaPackageFragment@24['java'] {
+LazyJavaPackageFragment@6['java'] {
     classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@65
     functions('lang': Name@66) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@65
@@ -106,7 +106,7 @@ LazyJavaPackageFragment@8['lang'] {
     memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@69
 }
 
-LazyJavaPackageFragment@26['lang'] {
+LazyJavaPackageFragment@39['lang'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@71
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@71
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@71
@@ -115,7 +115,7 @@ LazyJavaPackageFragment@26['lang'] {
     memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
-LazyJavaPackageFragment@39['lang'] {
+LazyJavaPackageFragment@26['lang'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@73
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@73
@@ -126,10 +126,6 @@ LazyJavaPackageFragment@39['lang'] {
 
 ResolutionTaskHolder@75 {
     <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -147,17 +143,8 @@ ResolutionTaskHolder@75 {
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -168,16 +155,32 @@ ResolutionTaskHolder@79 {
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+}
+
+null {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@77 }
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
 }

compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.lazy.log

@@ -53,7 +53,7 @@ LazyJavaPackageFragment@5['<root>'] {
     memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@44
 }
 
-LazyJavaPackageFragment@34['<root>'] {
+LazyJavaPackageFragment@20['<root>'] {
     classes('B': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@51
     classes('foo': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@51
     classes('p': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@51
@@ -64,7 +64,7 @@ LazyJavaPackageFragment@34['<root>'] {
     memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@51
 }
 
-LazyJavaPackageFragment@20['<root>'] {
+LazyJavaPackageFragment@34['<root>'] {
     classes('B': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@53
     classes('foo': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@53
     classes('p': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@53
@@ -75,7 +75,7 @@ LazyJavaPackageFragment@20['<root>'] {
     memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@53
 }
 
-LazyJavaPackageFragment@23['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
     deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@56
     functions('lang': Name@57) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@56
@@ -89,7 +89,7 @@ LazyJavaPackageFragment@36['java'] {
     memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@60
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@23['java'] {
     classes('lang': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
     deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@64
     functions('lang': Name@65) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@64
@@ -107,7 +107,7 @@ LazyJavaPackageFragment@10['lang'] {
     memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
 }
 
-LazyJavaPackageFragment@25['lang'] {
+LazyJavaPackageFragment@38['lang'] {
     classes('B': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@70
     classes('foo': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@70
     deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@70
@@ -116,7 +116,7 @@ LazyJavaPackageFragment@25['lang'] {
     memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
 }
 
-LazyJavaPackageFragment@38['lang'] {
+LazyJavaPackageFragment@25['lang'] {
     classes('B': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@72
     classes('foo': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@72
     deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@72
@@ -127,15 +127,6 @@ LazyJavaPackageFragment@38['lang'] {
 
 ResolutionTaskHolder@74 {
     <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
@@ -146,40 +137,52 @@ ResolutionTaskHolder@74 {
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
     <name not found> = EmptyList@48[empty]
     <name not found> = EmptyList@48[empty]
 }
 
+ResolutionTaskHolder@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+}
+
 ResolutionTaskHolder@86 {
     <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
 }
 
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
 }
 
-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[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-    <name not found> = ArrayList@103[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
+null {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@103[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
 }

compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.lazy.log

@@ -48,7 +48,7 @@ LazyJavaPackageFragmentProvider@34 {
     packageFragments('p.M1': FqName@18) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@20['<root>'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('a': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('b': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@45
@@ -92,7 +92,7 @@ LazyJavaPackageFragment@35['<root>'] {
     memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
 }
 
-LazyJavaPackageFragment@20['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@60
     classes('a': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@60
     classes('b': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@60
@@ -196,15 +196,6 @@ LazyJavaPackageFragment@39['lang'] {
 
 ResolutionTaskHolder@81 {
     <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -215,17 +206,8 @@ ResolutionTaskHolder@81 {
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -236,13 +218,16 @@ ResolutionTaskHolder@85 {
     <name not found> = EmptyList@55[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@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
@@ -251,236 +236,254 @@ ResolutionTaskHolder@89 {
 
 ResolutionTaskHolder@93 {
     <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@105 {
     <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@117 {
     <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
 ResolutionTaskHolder@129 {
     <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
     <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
     <name not found> = EmptyList@55[empty]
 }
 
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+}
+
 ResolutionTaskHolder@141 {
     <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
 }
 
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
+ResolutionTaskHolder@147 {
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
+}
+
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
 }
 
 ResolutionTaskHolder@153 {
     <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
+}
+
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
 }
 
 ResolutionTaskHolder@165 {
     <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
 }
 
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@171 }
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
 }
 
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
+}
+
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
 }
 
 ResolutionTaskHolder@177 {
     <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
 }
 
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
+ResolutionTaskHolder@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
 }
 
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
+ResolutionTaskHolder@183 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
 }
 
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@195 }
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@203 }
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@207 }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@215 }
-}
-
-ResolutionTaskHolder@217 {
+null {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@214[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@113 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]
     <name not found> = EmptyList@55[empty]

compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.lazy.log

@@ -41,7 +41,7 @@ LazyJavaPackageFragmentProvider@34 {
     packageFragments('p': FqName@43) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@35['<root>'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@45
@@ -52,7 +52,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@45
 }
 
-LazyJavaPackageFragment@35['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@52
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@52
     classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@52
@@ -106,7 +106,7 @@ LazyJavaPackageFragment@8['lang'] {
     memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@69
 }
 
-LazyJavaPackageFragment@26['lang'] {
+LazyJavaPackageFragment@39['lang'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@71
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@71
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@71
@@ -115,7 +115,7 @@ LazyJavaPackageFragment@26['lang'] {
     memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
-LazyJavaPackageFragment@39['lang'] {
+LazyJavaPackageFragment@26['lang'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@73
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@73
@@ -126,15 +126,6 @@ LazyJavaPackageFragment@39['lang'] {
 
 ResolutionTaskHolder@75 {
     <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
@@ -145,25 +136,37 @@ ResolutionTaskHolder@75 {
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@49[empty]
     <name not found> = EmptyList@49[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+}
+
+null {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@83 }
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
 }

compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.lazy.log

@@ -45,7 +45,7 @@ LazyJavaPackageFragmentProvider@38 {
     packageFragments('p': FqName@47) = null
 }
 
-LazyJavaPackageFragment@39['<root>'] {
+LazyJavaPackageFragment@21['<root>'] {
     classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
     classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@49
     classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@49
@@ -56,7 +56,7 @@ LazyJavaPackageFragment@39['<root>'] {
     memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@49
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@39['<root>'] {
     classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@56
     classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@56
     classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@56
@@ -67,7 +67,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
 }
 
-LazyJavaPackageFragment@21['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@58
     classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@58
     classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@58
@@ -78,7 +78,7 @@ LazyJavaPackageFragment@21['<root>'] {
     memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
 }
 
-LazyJavaPackageFragment@25['java'] {
+LazyJavaPackageFragment@6['java'] {
     classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
     deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@61
     functions('lang': Name@62) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@61
@@ -92,7 +92,7 @@ LazyJavaPackageFragment@41['java'] {
     memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
 }
 
-LazyJavaPackageFragment@6['java'] {
+LazyJavaPackageFragment@25['java'] {
     classes('lang': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
     deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@69
     functions('lang': Name@70) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@69
@@ -110,7 +110,7 @@ LazyJavaPackageFragment@8['lang'] {
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
-LazyJavaPackageFragment@27['lang'] {
+LazyJavaPackageFragment@43['lang'] {
     classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@75
     classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@75
     deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@75
@@ -119,7 +119,7 @@ LazyJavaPackageFragment@27['lang'] {
     memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
 }
 
-LazyJavaPackageFragment@43['lang'] {
+LazyJavaPackageFragment@27['lang'] {
     classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@77
     classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@77
     deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@77
@@ -130,15 +130,6 @@ LazyJavaPackageFragment@43['lang'] {
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -149,34 +140,46 @@ ResolutionTaskHolder@79 {
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[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@53[empty]
     <name not found> = EmptyList@53[empty]
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
 }
 
 ResolutionTaskHolder@91 {
     <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+null {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@90 }
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
 }

compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.lazy.log

@@ -146,7 +146,7 @@ LazyJavaPackageFragment@11['lang'] {
     memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@95
 }
 
-LazyJavaPackageFragment@41['lang'] {
+LazyJavaPackageFragment@63['lang'] {
     classes('M1': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@97
     classes('a': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@97
     classes('c': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@97
@@ -159,7 +159,7 @@ LazyJavaPackageFragment@41['lang'] {
     memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@97
 }
 
-LazyJavaPackageFragment@63['lang'] {
+LazyJavaPackageFragment@41['lang'] {
     classes('M1': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@99
     classes('a': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@99
     classes('c': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@99
@@ -174,10 +174,6 @@ LazyJavaPackageFragment@63['lang'] {
 
 ResolutionTaskHolder@101 {
     <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
-    <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]
@@ -195,12 +191,8 @@ ResolutionTaskHolder@101 {
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
@@ -218,15 +210,8 @@ ResolutionTaskHolder@105 {
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <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]
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
@@ -235,57 +220,75 @@ ResolutionTaskHolder@109 {
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
 ResolutionTaskHolder@113 {
     <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
-    <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@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
     <name not found> = EmptyList@75[empty]
     <name not found> = EmptyList@75[empty]
 }
 
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
+}
+
 ResolutionTaskHolder@125 {
     <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
-    <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@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
 }
 
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+null {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@118 }
+    <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]
+    <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]
+    <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]
+    <name not found> = EmptyList@75[empty]
 }

compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.lazy.log

@@ -59,15 +59,6 @@ LazyJavaPackageFragment@22['lang'] {
 
 ResolutionTaskHolder@46 {
     <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -78,26 +69,38 @@ ResolutionTaskHolder@46 {
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-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 }
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }

compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.lazy.log

@@ -24,14 +24,14 @@ LazyJavaPackageFragmentProvider@16 {
     packageFragments('p.A': FqName@26) = null
 }
 
-LazyJavaPackageFragment@19['java'] {
+LazyJavaPackageFragment@5['java'] {
     classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
     deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
     functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
-LazyJavaPackageFragment@5['java'] {
+LazyJavaPackageFragment@19['java'] {
     classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
     deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
     functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
@@ -60,15 +60,6 @@ LazyJavaPackageFragment@21['lang'] {
 
 ResolutionTaskHolder@44 {
     <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -79,32 +70,21 @@ ResolutionTaskHolder@44 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+ResolutionTaskHolder@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+}
+
+ResolutionTaskHolder@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
 }
 
 ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
@@ -131,7 +111,30 @@ ResolutionTaskHolder@60 {
     <name not found> = EmptyList@31[empty]
 }
 
-ResolutionTaskHolder@61 {
+ResolutionTaskHolder@57 {
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+null {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@55 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]
     <name not found> = EmptyList@31[empty]

compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.lazy.log

@@ -42,7 +42,7 @@ LazyJavaPackageFragmentProvider@31 {
     packageFragments('p.A': FqName@44) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@32['<root>'] {
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
     classes('M1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
     classes('M2': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
@@ -54,7 +54,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@46
 }
 
-LazyJavaPackageFragment@32['<root>'] {
+LazyJavaPackageFragment@17['<root>'] {
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@54
     classes('M1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@54
     classes('M2': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@54
@@ -66,7 +66,7 @@ LazyJavaPackageFragment@32['<root>'] {
     memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@54
 }
 
-LazyJavaPackageFragment@17['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@56
     classes('M1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@56
     classes('M2': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@56
@@ -132,15 +132,6 @@ LazyJavaPackageFragment@37['lang'] {
 
 ResolutionTaskHolder@78 {
     <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -151,17 +142,8 @@ ResolutionTaskHolder@78 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
@@ -172,50 +154,71 @@ ResolutionTaskHolder@82 {
     <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
     <name not found> = EmptyList@51[empty]
     <name not found> = EmptyList@51[empty]
 }
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
-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 }
+}
+
+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[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[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
+null {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@101 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
 }

compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.lazy.log

@@ -45,14 +45,14 @@ LazyJavaPackageFragment@17['<root>'] {
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
 }
 
-LazyJavaPackageFragment@20['java'] {
+LazyJavaPackageFragment@5['java'] {
     classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
     deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
     functions('lang': Name@41) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
     memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
 }
 
-LazyJavaPackageFragment@5['java'] {
+LazyJavaPackageFragment@20['java'] {
     classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
     deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@44
     functions('lang': Name@45) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@44
@@ -77,15 +77,6 @@ LazyJavaPackageFragment@22['lang'] {
 
 ResolutionTaskHolder@52 {
     <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
@@ -96,16 +87,28 @@ ResolutionTaskHolder@52 {
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
     <name not found> = EmptyList@34[empty]
     <name not found> = EmptyList@34[empty]
 }
 
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+}
+
+null {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@60 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }

compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.lazy.log

@@ -45,7 +45,7 @@ LazyJavaPackageFragmentProvider@38 {
     packageFragments('p': FqName@47) = null
 }
 
-LazyJavaPackageFragment@21['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
     classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@49
     classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@49
@@ -56,7 +56,7 @@ LazyJavaPackageFragment@21['<root>'] {
     memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@49
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@39['<root>'] {
     classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@56
     classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@56
     classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@56
@@ -67,7 +67,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
 }
 
-LazyJavaPackageFragment@39['<root>'] {
+LazyJavaPackageFragment@21['<root>'] {
     classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@58
     classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@58
     classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@58
@@ -130,15 +130,6 @@ LazyJavaPackageFragment@27['lang'] {
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
@@ -149,25 +140,37 @@ ResolutionTaskHolder@79 {
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
     <name not found> = EmptyList@53[empty]
     <name not found> = EmptyList@53[empty]
 }
 
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+}
+
+null {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@84 }
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
 }