Updated lazy log tests

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.lazy.log

@@ -95,7 +95,7 @@ LazyJavaPackageFragmentProvider@57 {
     packageFragments('p.X': FqName@45) = null
 }
 
-LazyJavaPackageFragment@28['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
@@ -105,7 +105,7 @@ LazyJavaPackageFragment@28['<root>'] {
     memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@28['<root>'] {
     classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@81
@@ -125,14 +125,14 @@ LazyJavaPackageFragment@47['<root>'] {
     memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
-LazyJavaPackageFragment@32['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
     deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@86
     functions('lang': Name@87) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@86
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@32['java'] {
     classes('lang': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@90
     deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@90
     functions('lang': Name@91) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@90
@@ -155,15 +155,18 @@ LazyJavaPackageFragment@61['java'] {
 
 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@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[3] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[3] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[3] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111 }
+}
+
+null {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@114[3] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111 }
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.lazy.log

@@ -95,7 +95,7 @@ LazyJavaPackageFragmentProvider@61 {
     packageFragments('p.X': FqName@49) = null
 }
 
-LazyJavaPackageFragment@51['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
     classes('C': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@77
     classes('Tr': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@77
@@ -105,7 +105,7 @@ LazyJavaPackageFragment@51['<root>'] {
     memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@77
 }
 
-LazyJavaPackageFragment@28['<root>'] {
+LazyJavaPackageFragment@51['<root>'] {
     classes('B': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@85
     classes('C': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@85
     classes('Tr': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@85
@@ -115,7 +115,7 @@ LazyJavaPackageFragment@28['<root>'] {
     memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@28['<root>'] {
     classes('B': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('C': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('Tr': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@87
@@ -125,28 +125,28 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@33['java'] {
     classes('lang': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@90
     deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@90
     functions('lang': Name@91) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@90
     memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@90
 }
 
-LazyJavaPackageFragment@53['java'] {
+LazyJavaPackageFragment@65['java'] {
     classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
     deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@94
     functions('lang': Name@95) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@94
     memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
 }
 
-LazyJavaPackageFragment@65['java'] {
+LazyJavaPackageFragment@53['java'] {
     classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
     deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@98
     functions('lang': Name@99) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@98
     memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@98
 }
 
-LazyJavaPackageFragment@33['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@102
     deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@102
     functions('lang': Name@103) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@102
@@ -155,15 +155,18 @@ LazyJavaPackageFragment@33['java'] {
 
 ResolutionTaskHolder@105 {
     <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[3] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[3] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[3] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115 }
+}
+
+null {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@118[3] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115 }
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.lazy.log

@@ -115,7 +115,7 @@ LazyJavaPackageFragmentProvider@65 {
     packageFragments('p._': FqName@53) = null
 }
 
-LazyJavaPackageFragment@55['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@81
@@ -124,7 +124,7 @@ LazyJavaPackageFragment@55['<root>'] {
     memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@55['<root>'] {
     classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
     classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@88
     classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@88
@@ -142,28 +142,28 @@ LazyJavaPackageFragment@32['<root>'] {
     memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@90
 }
 
-LazyJavaPackageFragment@9['java'] {
+LazyJavaPackageFragment@37['java'] {
     classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
     deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@93
     functions('lang': Name@94) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@93
     memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
 }
 
-LazyJavaPackageFragment@57['java'] {
+LazyJavaPackageFragment@69['java'] {
     classes('lang': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@97
     deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@97
     functions('lang': Name@98) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@97
     memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@97
 }
 
-LazyJavaPackageFragment@69['java'] {
+LazyJavaPackageFragment@9['java'] {
     classes('lang': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@101
     deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@101
     functions('lang': Name@102) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@101
     memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@101
 }
 
-LazyJavaPackageFragment@37['java'] {
+LazyJavaPackageFragment@57['java'] {
     classes('lang': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
     deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@105
     functions('lang': Name@106) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@105
@@ -172,15 +172,18 @@ LazyJavaPackageFragment@37['java'] {
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
 }
 
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[3] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[3] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120 }
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[3] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118 }
+}
+
+null {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@121[3] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118 }
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.lazy.log

@@ -95,7 +95,7 @@ LazyJavaPackageFragmentProvider@57 {
     packageFragments('p.X': FqName@45) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@47['<root>'] {
     classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('p': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
@@ -104,7 +104,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
-LazyJavaPackageFragment@47['<root>'] {
+LazyJavaPackageFragment@28['<root>'] {
     classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@80
     classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@80
     classes('p': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@80
@@ -113,7 +113,7 @@ LazyJavaPackageFragment@47['<root>'] {
     memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
 }
 
-LazyJavaPackageFragment@28['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@82
     classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@82
     classes('p': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@82
@@ -122,14 +122,14 @@ LazyJavaPackageFragment@28['<root>'] {
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
 }
 
-LazyJavaPackageFragment@61['java'] {
+LazyJavaPackageFragment@32['java'] {
     classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
     deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@85
     functions('lang': Name@86) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@85
     memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
-LazyJavaPackageFragment@49['java'] {
+LazyJavaPackageFragment@61['java'] {
     classes('lang': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@89
     deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@89
     functions('lang': Name@90) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@89
@@ -143,7 +143,7 @@ LazyJavaPackageFragment@8['java'] {
     memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
 }
 
-LazyJavaPackageFragment@32['java'] {
+LazyJavaPackageFragment@49['java'] {
     classes('lang': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@97
     deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@97
     functions('lang': Name@98) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@97
@@ -152,20 +152,23 @@ LazyJavaPackageFragment@32['java'] {
 
 ResolutionTaskHolder@100 {
     <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
+ResolutionTaskHolder@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+ResolutionTaskHolder@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[3] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[3] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116 }
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[3] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113 }
+}
+
+null {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@117[3] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113 }
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.lazy.log

@@ -95,7 +95,7 @@ LazyJavaPackageFragmentProvider@57 {
     packageFragments('p.X': FqName@45) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@47['<root>'] {
     classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
@@ -115,7 +115,7 @@ LazyJavaPackageFragment@28['<root>'] {
     memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
-LazyJavaPackageFragment@47['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@83
     classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@83
     classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@83
@@ -132,21 +132,21 @@ LazyJavaPackageFragment@49['java'] {
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
 }
 
-LazyJavaPackageFragment@32['java'] {
+LazyJavaPackageFragment@61['java'] {
     classes('lang': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@90
     deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@90
     functions('lang': Name@91) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@90
     memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@90
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@32['java'] {
     classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
     deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@94
     functions('lang': Name@95) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@94
     memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
 }
 
-LazyJavaPackageFragment@61['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
     deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@98
     functions('lang': Name@99) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@98
@@ -155,15 +155,18 @@ LazyJavaPackageFragment@61['java'] {
 
 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@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[3] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[3] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[3] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111 }
+}
+
+null {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@114[3] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111 }
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.lazy.log

@@ -95,7 +95,7 @@ LazyJavaPackageFragmentProvider@69 {
     packageFragments('p.C': FqName@66) = null
 }
 
-LazyJavaPackageFragment@70['<root>'] {
+LazyJavaPackageFragment@47['<root>'] {
     classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@81
@@ -104,7 +104,7 @@ LazyJavaPackageFragment@70['<root>'] {
     memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
-LazyJavaPackageFragment@47['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
     classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@88
     classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@88
@@ -113,7 +113,7 @@ LazyJavaPackageFragment@47['<root>'] {
     memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@70['<root>'] {
     classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@90
     classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@90
     classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@90
@@ -122,7 +122,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@90
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@72['java'] {
     classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
     deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@93
     functions('lang': Name@94) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@93
@@ -136,14 +136,14 @@ LazyJavaPackageFragment@32['java'] {
     memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@97
 }
 
-LazyJavaPackageFragment@52['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@101
     deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@101
     functions('lang': Name@102) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@101
     memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@101
 }
 
-LazyJavaPackageFragment@72['java'] {
+LazyJavaPackageFragment@52['java'] {
     classes('lang': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
     deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@105
     functions('lang': Name@106) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@105
@@ -152,35 +152,38 @@ LazyJavaPackageFragment@72['java'] {
 
 ResolutionTaskHolder@108 {
     <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
 }
 
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+ResolutionTaskHolder@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
 }
 
-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 }
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
 ResolutionTaskHolder@120 {
     <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
 }
 
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
 }
 
-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[3] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130 }
 }
 
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[3] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136 }
-    <name not found> = ArrayList@137[3] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136 }
+null {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@122 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@137[3] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130 }
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.lazy.log

@@ -22,38 +22,38 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragmentProvider@23 {
     packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@24['<root>']
-    packageFragments('B': FqName@4) = null
+    packageFragments('B': FqName@25) = null
     packageFragments('C': FqName@5) = null
-    packageFragments('java': FqName@25) = LazyJavaPackageFragment@26['java']
-    packageFragments('java.lang': FqName@27) = LazyJavaPackageFragment@28['lang']
-    packageFragments('java.lang.B': FqName@11) = null
+    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
+    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
+    packageFragments('java.lang.B': FqName@30) = null
     packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('kotlin': FqName@29) = null
-    packageFragments('kotlin.B': FqName@15) = null
+    packageFragments('kotlin': FqName@31) = null
+    packageFragments('kotlin.B': FqName@32) = null
     packageFragments('kotlin.C': FqName@16) = null
-    packageFragments('kotlin.io': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = null
-    packageFragments('p': FqName@32) = null
-    packageFragments('p.B': FqName@33) = null
-    packageFragments('p.C': FqName@22) = null
+    packageFragments('kotlin.io': FqName@33) = null
+    packageFragments('kotlin.jvm': FqName@34) = null
+    packageFragments('p': FqName@35) = null
+    packageFragments('p.B': FqName@36) = null
+    packageFragments('p.C': FqName@37) = null
 }
 
-LazyJavaPackageFragmentProvider@34 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@35['<root>']
-    packageFragments('B': FqName@36) = null
+LazyJavaPackageFragmentProvider@38 {
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@39['<root>']
+    packageFragments('B': FqName@4) = null
     packageFragments('C': FqName@5) = null
-    packageFragments('java': FqName@37) = LazyJavaPackageFragment@38['java']
-    packageFragments('java.lang': FqName@39) = LazyJavaPackageFragment@40['lang']
-    packageFragments('java.lang.B': FqName@41) = null
+    packageFragments('java': FqName@40) = LazyJavaPackageFragment@41['java']
+    packageFragments('java.lang': FqName@42) = LazyJavaPackageFragment@43['lang']
+    packageFragments('java.lang.B': FqName@11) = null
     packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('kotlin': FqName@42) = null
-    packageFragments('kotlin.B': FqName@43) = null
+    packageFragments('kotlin': FqName@44) = null
+    packageFragments('kotlin.B': FqName@15) = null
     packageFragments('kotlin.C': FqName@16) = null
-    packageFragments('kotlin.io': FqName@44) = null
-    packageFragments('kotlin.jvm': FqName@45) = null
-    packageFragments('p': FqName@46) = null
-    packageFragments('p.B': FqName@47) = null
-    packageFragments('p.C': FqName@48) = null
+    packageFragments('kotlin.io': FqName@45) = null
+    packageFragments('kotlin.jvm': FqName@46) = null
+    packageFragments('p': FqName@47) = null
+    packageFragments('p.B': FqName@48) = null
+    packageFragments('p.C': FqName@22) = null
 }
 
 LazyJavaPackageFragmentProvider@49 {
@@ -68,7 +68,7 @@ LazyJavaPackageFragmentProvider@49 {
     packageFragments('kotlin.jvm': FqName@60) = null
     packageFragments('p': FqName@61) = null
     packageFragments('p.B': FqName@62) = null
-    packageFragments('p.C': FqName@48) = null
+    packageFragments('p.C': FqName@37) = null
 }
 
 LazyJavaPackageFragment@24['<root>'] {
@@ -80,7 +80,7 @@ LazyJavaPackageFragment@24['<root>'] {
     memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
-LazyJavaPackageFragment@35['<root>'] {
+LazyJavaPackageFragment@39['<root>'] {
     classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@71
     classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@71
     classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@71
@@ -98,28 +98,28 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
-LazyJavaPackageFragment@26['java'] {
+LazyJavaPackageFragment@41['java'] {
     classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
     deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@76
     functions('lang': Name@77) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@76
     memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
-LazyJavaPackageFragment@38['java'] {
+LazyJavaPackageFragment@53['java'] {
     classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
     deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@80
     functions('lang': Name@81) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
 }
 
-LazyJavaPackageFragment@7['java'] {
+LazyJavaPackageFragment@27['java'] {
     classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
     deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@84
     functions('lang': Name@85) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@84
     memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
 }
 
-LazyJavaPackageFragment@53['java'] {
+LazyJavaPackageFragment@7['java'] {
     classes('lang': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@88
     deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@88
     functions('lang': Name@89) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@88
@@ -128,15 +128,18 @@ LazyJavaPackageFragment@53['java'] {
 
 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[3] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[3] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[3] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101 }
+}
+
+null {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@104[3] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101 }
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.lazy.log

@@ -65,7 +65,7 @@ LazyJavaPackageFragmentProvider@50 {
     packageFragments('kotlin.jvm': FqName@61) = null
     packageFragments('p': FqName@62) = null
     packageFragments('p.B': FqName@63) = null
-    packageFragments('p.C': FqName@47) = null
+    packageFragments('p.C': FqName@24) = null
 }
 
 LazyJavaPackageFragmentProvider@64 {
@@ -86,12 +86,12 @@ LazyJavaPackageFragmentProvider@64 {
     packageFragments('kotlin.jvm': FqName@81) = null
     packageFragments('p': FqName@82) = null
     packageFragments('p.B': FqName@83) = null
-    packageFragments('p.C': FqName@24) = null
+    packageFragments('p.C': FqName@47) = null
     packageFragments('p.Int': FqName@84) = null
     packageFragments('p.String': FqName@85) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@51['<root>'] {
     classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
@@ -100,7 +100,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
-LazyJavaPackageFragment@28['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@94
     classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@94
     classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@94
@@ -109,7 +109,7 @@ LazyJavaPackageFragment@28['<root>'] {
     memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
 }
 
-LazyJavaPackageFragment@51['<root>'] {
+LazyJavaPackageFragment@28['<root>'] {
     classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@96
     classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@96
     classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@96
@@ -118,28 +118,28 @@ LazyJavaPackageFragment@51['<root>'] {
     memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
-LazyJavaPackageFragment@33['java'] {
+LazyJavaPackageFragment@70['java'] {
     classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@99
     functions('lang': Name@100) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@99
     memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
 }
 
-LazyJavaPackageFragment@54['java'] {
+LazyJavaPackageFragment@33['java'] {
     classes('lang': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@103
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@103
     functions('lang': Name@104) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@103
     memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@103
 }
 
-LazyJavaPackageFragment@70['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@107
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@107
     functions('lang': Name@108) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@107
     memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@54['java'] {
     classes('lang': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@111
     functions('lang': Name@112) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@111
@@ -148,15 +148,18 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@114 {
     <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[3] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[3] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126 }
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[3] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124 }
+}
+
+null {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@127[3] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124 }
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.lazy.log

@@ -162,7 +162,7 @@ LazyJavaPackageFragment@40['<root>'] {
     memberIndex = computeMemberIndex$1@126 // through LazyPackageFragmentScopeForJavaPackage@120
 }
 
-LazyJavaPackageFragment@67['<root>'] {
+LazyJavaPackageFragment@97['<root>'] {
     classes('B': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@127
     classes('C': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@127
     classes('p': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@127
@@ -171,7 +171,7 @@ LazyJavaPackageFragment@67['<root>'] {
     memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@127
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@67['<root>'] {
     classes('B': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@129
     classes('C': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@129
     classes('p': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@129
@@ -180,7 +180,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@129
 }
 
-LazyJavaPackageFragment@97['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@131
     classes('C': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@131
     classes('p': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@131
@@ -189,28 +189,28 @@ LazyJavaPackageFragment@97['<root>'] {
     memberIndex = computeMemberIndex$1@132 // through LazyPackageFragmentScopeForJavaPackage@131
 }
 
-LazyJavaPackageFragment@74['java'] {
+LazyJavaPackageFragment@99['java'] {
     classes('lang': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@134
     deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@134
     functions('lang': Name@135) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@134
     memberIndex = computeMemberIndex$1@136 // through LazyPackageFragmentScopeForJavaPackage@134
 }
 
-LazyJavaPackageFragment@99['java'] {
+LazyJavaPackageFragment@11['java'] {
     classes('lang': Name@137) = null // through LazyPackageFragmentScopeForJavaPackage@138
     deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@138
     functions('lang': Name@139) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@138
     memberIndex = computeMemberIndex$1@140 // through LazyPackageFragmentScopeForJavaPackage@138
 }
 
-LazyJavaPackageFragment@46['java'] {
+LazyJavaPackageFragment@74['java'] {
     classes('lang': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@142
     deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@142
     functions('lang': Name@143) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@142
     memberIndex = computeMemberIndex$1@144 // through LazyPackageFragmentScopeForJavaPackage@142
 }
 
-LazyJavaPackageFragment@11['java'] {
+LazyJavaPackageFragment@46['java'] {
     classes('lang': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@146
     deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@146
     functions('lang': Name@147) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@146
@@ -226,15 +226,18 @@ LazyJavaPackageFragment@110['java'] {
 
 ResolutionTaskHolder@153 {
     <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
 }
 
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
 }
 
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[3] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[3] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165 }
+ResolutionTaskHolder@159 {
+    <name not found> = ArrayList@160[3] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163 }
+}
+
+null {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@166[3] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163 }
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.lazy.log

@@ -65,7 +65,7 @@ LazyJavaPackageFragmentProvider@50 {
     packageFragments('kotlin.jvm': FqName@61) = null
     packageFragments('p': FqName@62) = null
     packageFragments('p.B': FqName@63) = null
-    packageFragments('p.C': FqName@47) = null
+    packageFragments('p.C': FqName@24) = null
 }
 
 LazyJavaPackageFragmentProvider@64 {
@@ -86,12 +86,12 @@ LazyJavaPackageFragmentProvider@64 {
     packageFragments('kotlin.jvm': FqName@81) = null
     packageFragments('p': FqName@82) = null
     packageFragments('p.B': FqName@83) = null
-    packageFragments('p.C': FqName@24) = null
+    packageFragments('p.C': FqName@47) = null
     packageFragments('p.Int': FqName@84) = null
     packageFragments('p.String': FqName@85) = null
 }
 
-LazyJavaPackageFragment@28['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
@@ -100,7 +100,7 @@ LazyJavaPackageFragment@28['<root>'] {
     memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@51['<root>'] {
     classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@94
     classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@94
     classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@94
@@ -109,7 +109,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
 }
 
-LazyJavaPackageFragment@51['<root>'] {
+LazyJavaPackageFragment@28['<root>'] {
     classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@96
     classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@96
     classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@96
@@ -118,28 +118,28 @@ LazyJavaPackageFragment@51['<root>'] {
     memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@70['java'] {
     classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@99
     functions('lang': Name@100) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@99
     memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
 }
 
-LazyJavaPackageFragment@54['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@103
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@103
     functions('lang': Name@104) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@103
     memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@103
 }
 
-LazyJavaPackageFragment@70['java'] {
+LazyJavaPackageFragment@33['java'] {
     classes('lang': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@107
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@107
     functions('lang': Name@108) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@107
     memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
 }
 
-LazyJavaPackageFragment@33['java'] {
+LazyJavaPackageFragment@54['java'] {
     classes('lang': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@111
     functions('lang': Name@112) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@111
@@ -148,15 +148,18 @@ LazyJavaPackageFragment@33['java'] {
 
 ResolutionTaskHolder@114 {
     <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[3] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[3] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126 }
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[3] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124 }
+}
+
+null {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@127[3] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124 }
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.lazy.log

@@ -71,7 +71,7 @@ LazyJavaPackageFragmentProvider@49 {
     packageFragments('p.C': FqName@37) = null
 }
 
-LazyJavaPackageFragment@39['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
     classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
     classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
@@ -80,7 +80,7 @@ LazyJavaPackageFragment@39['<root>'] {
     memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@24['<root>'] {
     classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@71
     classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@71
     classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@71
@@ -89,7 +89,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
-LazyJavaPackageFragment@24['<root>'] {
+LazyJavaPackageFragment@39['<root>'] {
     classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@73
@@ -98,21 +98,21 @@ LazyJavaPackageFragment@24['<root>'] {
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
-LazyJavaPackageFragment@27['java'] {
+LazyJavaPackageFragment@41['java'] {
     classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
     deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@76
     functions('lang': Name@77) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@76
     memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
-LazyJavaPackageFragment@53['java'] {
+LazyJavaPackageFragment@27['java'] {
     classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
     deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@80
     functions('lang': Name@81) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
 }
 
-LazyJavaPackageFragment@41['java'] {
+LazyJavaPackageFragment@53['java'] {
     classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
     deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@84
     functions('lang': Name@85) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@84
@@ -128,15 +128,18 @@ LazyJavaPackageFragment@7['java'] {
 
 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[3] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[3] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103 }
+ResolutionTaskHolder@97 {
+    <name not found> = ArrayList@98[3] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101 }
+}
+
+null {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@104[3] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101 }
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.lazy.log

@@ -57,7 +57,7 @@ LazyJavaPackageFragmentProvider@42 {
     packageFragments('kotlin.jvm': FqName@53) = null
     packageFragments('p': FqName@54) = null
     packageFragments('p.B': FqName@55) = null
-    packageFragments('p.C': FqName@21) = null
+    packageFragments('p.C': FqName@40) = null
 }
 
 LazyJavaPackageFragmentProvider@56 {
@@ -75,11 +75,11 @@ LazyJavaPackageFragmentProvider@56 {
     packageFragments('kotlin.jvm': FqName@70) = null
     packageFragments('p': FqName@71) = null
     packageFragments('p.B': FqName@72) = null
-    packageFragments('p.C': FqName@40) = null
+    packageFragments('p.C': FqName@21) = null
     packageFragments('p.String': FqName@73) = null
 }
 
-LazyJavaPackageFragment@24['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@75
     classes('C': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@75
     classes('p': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@75
@@ -88,7 +88,7 @@ LazyJavaPackageFragment@24['<root>'] {
     memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@75
 }
 
-LazyJavaPackageFragment@43['<root>'] {
+LazyJavaPackageFragment@24['<root>'] {
     classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@82
     classes('C': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@82
     classes('p': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@82
@@ -97,7 +97,7 @@ LazyJavaPackageFragment@43['<root>'] {
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@43['<root>'] {
     classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@84
     classes('C': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@84
     classes('p': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@84
@@ -106,21 +106,21 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
 }
 
-LazyJavaPackageFragment@28['java'] {
+LazyJavaPackageFragment@46['java'] {
     classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
     deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@87
     functions('lang': Name@88) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@87
     memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
-LazyJavaPackageFragment@7['java'] {
+LazyJavaPackageFragment@28['java'] {
     classes('lang': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
     deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@91
     functions('lang': Name@92) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@91
     memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@91
 }
 
-LazyJavaPackageFragment@46['java'] {
+LazyJavaPackageFragment@7['java'] {
     classes('lang': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@95
     deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@95
     functions('lang': Name@96) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@95
@@ -136,9 +136,12 @@ LazyJavaPackageFragment@61['java'] {
 
 ResolutionTaskHolder@102 {
     <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+}
+
+null {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
     <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.lazy.log

@@ -68,7 +68,7 @@ LazyJavaPackageFragmentProvider@46 {
     packageFragments('kotlin.jvm': FqName@57) = null
     packageFragments('p': FqName@58) = null
     packageFragments('p.B': FqName@59) = null
-    packageFragments('p.C': FqName@44) = null
+    packageFragments('p.C': FqName@24) = null
     packageFragments('p.String': FqName@25) = null
 }
 
@@ -87,11 +87,11 @@ LazyJavaPackageFragmentProvider@60 {
     packageFragments('kotlin.jvm': FqName@74) = null
     packageFragments('p': FqName@75) = null
     packageFragments('p.B': FqName@76) = null
-    packageFragments('p.C': FqName@24) = null
+    packageFragments('p.C': FqName@44) = null
     packageFragments('p.T': FqName@77) = null
 }
 
-LazyJavaPackageFragment@28['<root>'] {
+LazyJavaPackageFragment@47['<root>'] {
     classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
     classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@79
     classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@79
@@ -101,7 +101,7 @@ LazyJavaPackageFragment@28['<root>'] {
     memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-LazyJavaPackageFragment@47['<root>'] {
+LazyJavaPackageFragment@28['<root>'] {
     classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@87
@@ -121,21 +121,21 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@65['java'] {
     classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@92
     functions('lang': Name@93) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@92
     memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
 }
 
-LazyJavaPackageFragment@65['java'] {
+LazyJavaPackageFragment@32['java'] {
     classes('lang': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@96
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@96
     functions('lang': Name@97) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@96
     memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
-LazyJavaPackageFragment@32['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@100
     functions('lang': Name@101) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@100
@@ -151,30 +151,33 @@ LazyJavaPackageFragment@50['java'] {
 
 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[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
 }
 
 ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@120[3] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123 }
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[3] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[3] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127 }
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[3] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128 }
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[3] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[3] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133 }
+null {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@133[3] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128 }
+    <name not found> = ArrayList@134[3] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123 }
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.lazy.log

@@ -116,28 +116,28 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@50['java'] {
     classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@92
     functions('lang': Name@93) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@92
     memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
 }
 
-LazyJavaPackageFragment@65['java'] {
+LazyJavaPackageFragment@32['java'] {
     classes('lang': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@96
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@96
     functions('lang': Name@97) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@96
     memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
-LazyJavaPackageFragment@50['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@100
     functions('lang': Name@101) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@100
     memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
 }
 
-LazyJavaPackageFragment@32['java'] {
+LazyJavaPackageFragment@65['java'] {
     classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@104
     functions('lang': Name@105) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@104
@@ -151,14 +151,14 @@ LazyJavaPackageFragment@52['lang'] {
     memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@107
 }
 
-LazyJavaPackageFragment@34['lang'] {
+LazyJavaPackageFragment@10['lang'] {
     classes('foo': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@109
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@109
     functions('foo': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@109
     memberIndex = computeMemberIndex$1@110 // through LazyPackageFragmentScopeForJavaPackage@109
 }
 
-LazyJavaPackageFragment@10['lang'] {
+LazyJavaPackageFragment@34['lang'] {
     classes('foo': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@111
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@111
     functions('foo': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@111
@@ -167,22 +167,14 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@113 {
     <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[3] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[3] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[3] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123 }
     <name not found> = EmptyList@84[empty]
     <name not found> = EmptyList@84[empty]
     <name not found> = EmptyList@84[empty]
@@ -207,3 +199,14 @@ ResolutionTaskHolder@121 {
     <name not found> = EmptyList@84[empty]
     <name not found> = EmptyList@84[empty]
 }
+
+null {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@126[3] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123 }
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
+    <name not found> = EmptyList@84[empty]
+}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.lazy.log

@@ -80,7 +80,7 @@ LazyJavaPackageFragmentProvider@56 {
     packageFragments('p.T': FqName@73) = null
 }
 
-LazyJavaPackageFragment@43['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@75
     classes('String': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@75
     classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@75
@@ -91,7 +91,7 @@ LazyJavaPackageFragment@43['<root>'] {
     memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@75
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@43['<root>'] {
     classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@83
     classes('String': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@83
     classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@83
@@ -113,14 +113,14 @@ LazyJavaPackageFragment@25['<root>'] {
     memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
-LazyJavaPackageFragment@7['java'] {
+LazyJavaPackageFragment@29['java'] {
     classes('lang': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@88
     deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@88
     functions('lang': Name@89) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@88
     memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@88
 }
 
-LazyJavaPackageFragment@29['java'] {
+LazyJavaPackageFragment@46['java'] {
     classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
     deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@92
     functions('lang': Name@93) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@92
@@ -134,7 +134,7 @@ LazyJavaPackageFragment@61['java'] {
     memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
-LazyJavaPackageFragment@46['java'] {
+LazyJavaPackageFragment@7['java'] {
     classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
     deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@100
     functions('lang': Name@101) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@100
@@ -164,96 +164,99 @@ LazyJavaPackageFragment@9['lang'] {
 
 ResolutionTaskHolder@109 {
     <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@80[empty]
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
     <name not found> = EmptyList@80[empty]
 }
 
-ResolutionTaskHolder@116 {
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
     <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+    <name not found> = EmptyList@80[empty]
+}
+
+ResolutionTaskHolder@119 {
     <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@80[empty]
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
     <name not found> = EmptyList@80[empty]
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
     <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@80[empty]
     <name not found> = EmptyList@80[empty]
 }
 
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
 }
 
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@139 }
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+}
+
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
+}
+
+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 }
 }
 
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+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 }
+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> = ArrayList@154[2] { ResolutionCandidate@155, ResolutionCandidate@156 }
 }
 
 ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@158[2] { ResolutionCandidate@159, ResolutionCandidate@160 }
 }
 
 ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@162[2] { ResolutionCandidate@163, ResolutionCandidate@164 }
 }
 
 ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@167 }
+    <name not found> = ArrayList@166[2] { ResolutionCandidate@167, ResolutionCandidate@168 }
 }
 
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[2] { ResolutionCandidate@171, ResolutionCandidate@172 }
-    <name not found> = ArrayList@173[2] { ResolutionCandidate@171, ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[2] { ResolutionCandidate@176, ResolutionCandidate@177 }
-    <name not found> = ArrayList@178[2] { ResolutionCandidate@176, ResolutionCandidate@177 }
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[2] { ResolutionCandidate@181, ResolutionCandidate@182 }
-    <name not found> = ArrayList@183[2] { ResolutionCandidate@181, ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[2] { ResolutionCandidate@186, ResolutionCandidate@187 }
-    <name not found> = ArrayList@188[2] { ResolutionCandidate@186, ResolutionCandidate@187 }
+null {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@123 }
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@149 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@126 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@185[2] { ResolutionCandidate@167, ResolutionCandidate@168 }
+    <name not found> = ArrayList@186[2] { ResolutionCandidate@155, ResolutionCandidate@156 }
+    <name not found> = ArrayList@187[2] { ResolutionCandidate@163, ResolutionCandidate@164 }
+    <name not found> = ArrayList@188[2] { ResolutionCandidate@159, ResolutionCandidate@160 }
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
+    <name not found> = EmptyList@80[empty]
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.lazy.log

@@ -68,7 +68,7 @@ LazyJavaPackageFragmentProvider@46 {
     packageFragments('kotlin.jvm': FqName@57) = null
     packageFragments('p': FqName@58) = null
     packageFragments('p.B': FqName@59) = null
-    packageFragments('p.C': FqName@24) = null
+    packageFragments('p.C': FqName@44) = null
     packageFragments('p.String': FqName@25) = null
 }
 
@@ -87,7 +87,7 @@ LazyJavaPackageFragmentProvider@60 {
     packageFragments('kotlin.jvm': FqName@74) = null
     packageFragments('p': FqName@75) = null
     packageFragments('p.B': FqName@76) = null
-    packageFragments('p.C': FqName@44) = null
+    packageFragments('p.C': FqName@24) = null
     packageFragments('p.T': FqName@77) = null
 }
 
@@ -101,7 +101,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-LazyJavaPackageFragment@47['<root>'] {
+LazyJavaPackageFragment@28['<root>'] {
     classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@87
@@ -111,7 +111,7 @@ LazyJavaPackageFragment@47['<root>'] {
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
-LazyJavaPackageFragment@28['<root>'] {
+LazyJavaPackageFragment@47['<root>'] {
     classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@89
     classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@89
     classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@89
@@ -121,21 +121,21 @@ LazyJavaPackageFragment@28['<root>'] {
     memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
 }
 
-LazyJavaPackageFragment@65['java'] {
+LazyJavaPackageFragment@32['java'] {
     classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@92
     functions('lang': Name@93) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@92
     memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@65['java'] {
     classes('lang': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@96
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@96
     functions('lang': Name@97) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@96
     memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
-LazyJavaPackageFragment@32['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@100
     functions('lang': Name@101) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@100
@@ -151,30 +151,33 @@ LazyJavaPackageFragment@50['java'] {
 
 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[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+ResolutionTaskHolder@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
 }
 
 ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@120[3] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123 }
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[3] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[3] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127 }
+ResolutionTaskHolder@124 {
+    <name not found> = ArrayList@125[3] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128 }
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[3] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[3] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133 }
+null {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@133[3] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123 }
+    <name not found> = ArrayList@134[3] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128 }
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.lazy.log

@@ -103,7 +103,7 @@ LazyJavaPackageFragmentProvider@65 {
     packageFragments('p.T': FqName@83) = null
 }
 
-LazyJavaPackageFragment@32['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
     classes('C': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@85
     classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@85
@@ -113,7 +113,7 @@ LazyJavaPackageFragment@32['<root>'] {
     memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@55['<root>'] {
     classes('B': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@93
     classes('C': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@93
     classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@93
@@ -123,7 +123,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@93
 }
 
-LazyJavaPackageFragment@55['<root>'] {
+LazyJavaPackageFragment@32['<root>'] {
     classes('B': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@95
     classes('C': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@95
     classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@95
@@ -133,28 +133,28 @@ LazyJavaPackageFragment@55['<root>'] {
     memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@95
 }
 
-LazyJavaPackageFragment@57['java'] {
+LazyJavaPackageFragment@9['java'] {
     classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
     deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@98
     functions('lang': Name@99) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@98
     memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@98
 }
 
-LazyJavaPackageFragment@70['java'] {
+LazyJavaPackageFragment@57['java'] {
     classes('lang': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@102
     deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@102
     functions('lang': Name@103) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@102
     memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@102
 }
 
-LazyJavaPackageFragment@9['java'] {
+LazyJavaPackageFragment@37['java'] {
     classes('lang': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@106
     deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@106
     functions('lang': Name@107) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@106
     memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@106
 }
 
-LazyJavaPackageFragment@37['java'] {
+LazyJavaPackageFragment@70['java'] {
     classes('lang': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
     deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@110
     functions('lang': Name@111) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@110
@@ -163,30 +163,33 @@ LazyJavaPackageFragment@37['java'] {
 
 ResolutionTaskHolder@113 {
     <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
 }
 
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
+}
+
+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> = ArrayList@126[3] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129 }
 }
 
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[3] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[3] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133 }
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[3] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134 }
 }
 
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[3] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139 }
-    <name not found> = ArrayList@140[3] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139 }
+null {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@139[3] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129 }
+    <name not found> = ArrayList@140[3] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134 }
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.lazy.log

@@ -91,7 +91,7 @@ LazyJavaPackageFragmentProvider@57 {
     packageFragments('p.T': FqName@71) = null
 }
 
-LazyJavaPackageFragment@47['<root>'] {
+LazyJavaPackageFragment@28['<root>'] {
     classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
@@ -101,7 +101,7 @@ LazyJavaPackageFragment@47['<root>'] {
     memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
-LazyJavaPackageFragment@28['<root>'] {
+LazyJavaPackageFragment@47['<root>'] {
     classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@81
@@ -128,7 +128,7 @@ LazyJavaPackageFragment@61['java'] {
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@49['java'] {
     classes('lang': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@90
     deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@90
     functions('lang': Name@91) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@90
@@ -142,7 +142,7 @@ LazyJavaPackageFragment@32['java'] {
     memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
 }
 
-LazyJavaPackageFragment@49['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
     deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@98
     functions('lang': Name@99) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@98
@@ -151,30 +151,33 @@ LazyJavaPackageFragment@49['java'] {
 
 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@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
 }
 
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+}
+
+ResolutionTaskHolder@110 {
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
 }
 
 ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@114[3] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117 }
 }
 
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[3] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[3] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121 }
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[3] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122 }
 }
 
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[3] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127 }
-    <name not found> = ArrayList@128[3] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127 }
+null {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@127[3] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117 }
+    <name not found> = ArrayList@128[3] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122 }
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.lazy.log

@@ -65,7 +65,7 @@ LazyJavaPackageFragmentProvider@50 {
     packageFragments('kotlin.jvm': FqName@61) = null
     packageFragments('p': FqName@62) = null
     packageFragments('p.B': FqName@63) = null
-    packageFragments('p.C': FqName@24) = null
+    packageFragments('p.C': FqName@47) = null
 }
 
 LazyJavaPackageFragmentProvider@64 {
@@ -86,12 +86,12 @@ LazyJavaPackageFragmentProvider@64 {
     packageFragments('kotlin.jvm': FqName@81) = null
     packageFragments('p': FqName@82) = null
     packageFragments('p.B': FqName@83) = null
-    packageFragments('p.C': FqName@47) = null
+    packageFragments('p.C': FqName@24) = null
     packageFragments('p.Int': FqName@84) = null
     packageFragments('p.String': FqName@85) = null
 }
 
-LazyJavaPackageFragment@51['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
@@ -109,7 +109,7 @@ LazyJavaPackageFragment@28['<root>'] {
     memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@51['<root>'] {
     classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@96
     classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@96
     classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@96
@@ -118,28 +118,28 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
-LazyJavaPackageFragment@33['java'] {
+LazyJavaPackageFragment@8['java'] {
     classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@99
     functions('lang': Name@100) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@99
     memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
 }
 
-LazyJavaPackageFragment@54['java'] {
+LazyJavaPackageFragment@70['java'] {
     classes('lang': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@103
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@103
     functions('lang': Name@104) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@103
     memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@103
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@33['java'] {
     classes('lang': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@107
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@107
     functions('lang': Name@108) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@107
     memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
 }
 
-LazyJavaPackageFragment@70['java'] {
+LazyJavaPackageFragment@54['java'] {
     classes('lang': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@111
     functions('lang': Name@112) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@111
@@ -148,15 +148,18 @@ LazyJavaPackageFragment@70['java'] {
 
 ResolutionTaskHolder@114 {
     <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
 }
 
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
 }
 
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[3] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[3] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126 }
+ResolutionTaskHolder@120 {
+    <name not found> = ArrayList@121[3] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124 }
+}
+
+null {
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@127[3] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124 }
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.lazy.log

@@ -67,7 +67,7 @@ LazyJavaPackageFragmentProvider@48 {
     packageFragments('p.C': FqName@18) = null
 }
 
-LazyJavaPackageFragment@20['<root>'] {
+LazyJavaPackageFragment@35['<root>'] {
     classes('B': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
     classes('C': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@63
     classes('p': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@63
@@ -76,7 +76,7 @@ LazyJavaPackageFragment@20['<root>'] {
     memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@63
 }
 
-LazyJavaPackageFragment@35['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@70
     classes('C': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@70
     classes('p': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@70
@@ -85,7 +85,7 @@ LazyJavaPackageFragment@35['<root>'] {
     memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@20['<root>'] {
     classes('B': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@72
     classes('C': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@72
     classes('p': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@72
@@ -94,28 +94,28 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@72
 }
 
-LazyJavaPackageFragment@6['java'] {
+LazyJavaPackageFragment@38['java'] {
     classes('lang': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@75
     deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@75
     functions('lang': Name@76) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@75
     memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@75
 }
 
-LazyJavaPackageFragment@23['java'] {
+LazyJavaPackageFragment@6['java'] {
     classes('lang': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
     deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@79
     functions('lang': Name@80) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@79
     memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-LazyJavaPackageFragment@38['java'] {
+LazyJavaPackageFragment@52['java'] {
     classes('lang': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@83
     deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@83
     functions('lang': Name@84) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@83
     memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
-LazyJavaPackageFragment@52['java'] {
+LazyJavaPackageFragment@23['java'] {
     classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
     deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@87
     functions('lang': Name@88) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@87
@@ -124,15 +124,18 @@ LazyJavaPackageFragment@52['java'] {
 
 ResolutionTaskHolder@90 {
     <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
 }
 
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
 }
 
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[3] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[3] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102 }
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[3] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100 }
+}
+
+null {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@103[3] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100 }
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.lazy.log

@@ -93,7 +93,7 @@ LazyJavaPackageFragmentProvider@66 {
     packageFragments('kotlin.jvm': FqName@89) = null
     packageFragments('p': FqName@90) = null
     packageFragments('p.B': FqName@91) = null
-    packageFragments('p.C': FqName@30) = null
+    packageFragments('p.C': FqName@61) = null
     packageFragments('p.G1': FqName@92) = null
     packageFragments('p.G2': FqName@93) = null
     packageFragments('p.Int': FqName@94) = null
@@ -127,7 +127,7 @@ LazyJavaPackageFragmentProvider@96 {
     packageFragments('kotlin.jvm': FqName@119) = null
     packageFragments('p': FqName@120) = null
     packageFragments('p.B': FqName@121) = null
-    packageFragments('p.C': FqName@61) = null
+    packageFragments('p.C': FqName@30) = null
     packageFragments('p.G1': FqName@122) = null
     packageFragments('p.G2': FqName@123) = null
     packageFragments('p.Int': FqName@124) = null
@@ -158,7 +158,7 @@ LazyJavaPackageFragmentProvider@126 {
     packageFragments('kotlin.jvm': FqName@134) = null
     packageFragments('p': FqName@135) = null
     packageFragments('p.B': FqName@121) = null
-    packageFragments('p.C': FqName@61) = null
+    packageFragments('p.C': FqName@30) = null
     packageFragments('p.G1': FqName@136) = null
     packageFragments('p.G2': FqName@137) = null
     packageFragments('p.Int': FqName@124) = null
@@ -217,7 +217,7 @@ LazyJavaPackageFragment@97['<root>'] {
     memberIndex = computeMemberIndex$1@155 // through LazyPackageFragmentScopeForJavaPackage@154
 }
 
-LazyJavaPackageFragment@129['java'] {
+LazyJavaPackageFragment@10['java'] {
     classes('lang': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@157
     deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@157
     functions('lang': Name@158) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@157
@@ -231,21 +231,21 @@ LazyJavaPackageFragment@43['java'] {
     memberIndex = computeMemberIndex$1@163 // through LazyPackageFragmentScopeForJavaPackage@161
 }
 
-LazyJavaPackageFragment@104['java'] {
+LazyJavaPackageFragment@129['java'] {
     classes('lang': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@165
     deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@165
     functions('lang': Name@166) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@165
     memberIndex = computeMemberIndex$1@167 // through LazyPackageFragmentScopeForJavaPackage@165
 }
 
-LazyJavaPackageFragment@74['java'] {
+LazyJavaPackageFragment@104['java'] {
     classes('lang': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@169
     deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@169
     functions('lang': Name@170) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@169
     memberIndex = computeMemberIndex$1@171 // through LazyPackageFragmentScopeForJavaPackage@169
 }
 
-LazyJavaPackageFragment@10['java'] {
+LazyJavaPackageFragment@74['java'] {
     classes('lang': Name@172) = null // through LazyPackageFragmentScopeForJavaPackage@173
     deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@173
     functions('lang': Name@174) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@173
@@ -254,25 +254,28 @@ LazyJavaPackageFragment@10['java'] {
 
 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@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
 }
 
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@186 }
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
+}
+
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
 }
 
 ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@189[3] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192 }
 }
 
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[3] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196 }
-    <name not found> = ArrayList@197[3] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196 }
+null {
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@197[3] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192 }
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.lazy.log

@@ -60,8 +60,8 @@ LazyJavaPackageFragmentProvider@39 {
     packageFragments('kotlin.jvm': FqName@50) = null
     packageFragments('p': FqName@51) = null
     packageFragments('p.B': FqName@52) = null
-    packageFragments('p.C': FqName@37) = null
-    packageFragments('p.D': FqName@22) = null
+    packageFragments('p.C': FqName@21) = null
+    packageFragments('p.D': FqName@38) = null
 }
 
 LazyJavaPackageFragmentProvider@53 {
@@ -76,7 +76,7 @@ LazyJavaPackageFragmentProvider@53 {
     packageFragments('kotlin.jvm': FqName@64) = null
     packageFragments('p': FqName@65) = null
     packageFragments('p.B': FqName@66) = null
-    packageFragments('p.C': FqName@21) = null
+    packageFragments('p.C': FqName@37) = null
 }
 
 LazyJavaPackageFragment@2['<root>'] {
@@ -89,7 +89,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@68
 }
 
-LazyJavaPackageFragment@40['<root>'] {
+LazyJavaPackageFragment@24['<root>'] {
     classes('B': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@76
     classes('C': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@76
     classes('D': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@76
@@ -99,7 +99,7 @@ LazyJavaPackageFragment@40['<root>'] {
     memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
-LazyJavaPackageFragment@24['<root>'] {
+LazyJavaPackageFragment@40['<root>'] {
     classes('B': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@78
     classes('C': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@78
     classes('D': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@78
@@ -109,28 +109,28 @@ LazyJavaPackageFragment@24['<root>'] {
     memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@78
 }
 
-LazyJavaPackageFragment@57['java'] {
+LazyJavaPackageFragment@43['java'] {
     classes('lang': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
     deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@81
     functions('lang': Name@82) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@81
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
-LazyJavaPackageFragment@43['java'] {
+LazyJavaPackageFragment@27['java'] {
     classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
     deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@85
     functions('lang': Name@86) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@85
     memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
-LazyJavaPackageFragment@7['java'] {
+LazyJavaPackageFragment@57['java'] {
     classes('lang': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@89
     deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@89
     functions('lang': Name@90) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@89
     memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@89
 }
 
-LazyJavaPackageFragment@27['java'] {
+LazyJavaPackageFragment@7['java'] {
     classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
     deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@93
     functions('lang': Name@94) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@93
@@ -139,20 +139,23 @@ LazyJavaPackageFragment@27['java'] {
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
-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 }
 }
 
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = ArrayList@113[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+}
+
+null {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@104 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@113[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
 }

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.lazy.log

@@ -83,7 +83,7 @@ LazyJavaPackageFragmentProvider@53 {
     packageFragments('p.T': FqName@67) = null
 }
 
-LazyJavaPackageFragment@24['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
     classes('C': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@69
     classes('p': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
@@ -92,7 +92,7 @@ LazyJavaPackageFragment@24['<root>'] {
     memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@69
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@24['<root>'] {
     classes('B': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@76
     classes('C': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@76
     classes('p': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@76
@@ -110,28 +110,28 @@ LazyJavaPackageFragment@43['<root>'] {
     memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@78
 }
 
-LazyJavaPackageFragment@28['java'] {
+LazyJavaPackageFragment@7['java'] {
     classes('lang': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
     deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@81
     functions('lang': Name@82) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@81
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
-LazyJavaPackageFragment@45['java'] {
+LazyJavaPackageFragment@57['java'] {
     classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
     deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@85
     functions('lang': Name@86) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@85
     memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
-LazyJavaPackageFragment@57['java'] {
+LazyJavaPackageFragment@45['java'] {
     classes('lang': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@89
     deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@89
     functions('lang': Name@90) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@89
     memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@89
 }
 
-LazyJavaPackageFragment@7['java'] {
+LazyJavaPackageFragment@28['java'] {
     classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
     deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@93
     functions('lang': Name@94) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@93
@@ -140,15 +140,18 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@96 {
     <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
 }
 
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
 }
 
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[3] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[3] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108 }
+ResolutionTaskHolder@102 {
+    <name not found> = ArrayList@103[3] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106 }
+}
+
+null {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@109[3] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106 }
 }