azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Fix flattening of substitution overrides of intersection overrides for subsumed check

Browse Source 
#KT-65555 Fixed
This commit is contained in:
Kirill Rakhman
2024-02-14 11:49:36 +01:00
committed by Space Team
parent 3994e3f63a
commit 879cdd5952
7 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
Generated
+6
View File
@@ -29157,6 +29157,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt13355viaJava.kt");
}
@Test
@TestMetadata("kt65555.kt")
public void testKt65555() throws Exception {
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt65555.kt");
}
@Test
@TestMetadata("kt9550.kt")
public void testKt9550() throws Exception {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
Generated
+6
View File
@@ -29157,6 +29157,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt13355viaJava.kt");
}
@Test
@TestMetadata("kt65555.kt")
public void testKt65555() throws Exception {
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt65555.kt");
}
@Test
@TestMetadata("kt9550.kt")
public void testKt9550() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -26903,6 +26903,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt13355viaJava.kt");
}
@Test
@TestMetadata("kt65555.kt")
public void testKt65555() throws Exception {
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt65555.kt");
}
@Test
@TestMetadata("kt9550.kt")
public void testKt9550() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -26909,6 +26909,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt13355viaJava.kt");
}
@Test
@TestMetadata("kt65555.kt")
public void testKt65555() throws Exception {
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt65555.kt");
}
@Test
@TestMetadata("kt9550.kt")
public void testKt9550() throws Exception {
compiler/fir/providers/src/org/jetbrains/kotlin/fir/declarations/declarationUtils.kt
+1 -1
View File
@@ -171,7 +171,7 @@ fun FirCallableSymbol<*>.dispatchReceiverScope(session: FirSession, scopeSession
}
fun MemberWithBaseScope<FirCallableSymbol<*>>.flattenIntersectionsRecursively(): List<MemberWithBaseScope<FirCallableSymbol<*>>> {
if (member.origin != FirDeclarationOrigin.IntersectionOverride) return listOf(this)
if (member.unwrapSubstitutionOverrides<FirCallableSymbol<*>>().origin != FirDeclarationOrigin.IntersectionOverride) return listOf(this)
return baseScope.getDirectOverriddenMembersWithBaseScope(member).flatMap { it.flattenIntersectionsRecursively() }
}
compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt65555.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// FIR_IDENTICAL
// FULL_JDK
// WITH_STDLIB
// ISSUE: KT-65555
interface MyCollection<E> : Collection<E>
interface MyList<E> : MyCollection<E>, List<E>
interface MyMutableList<E> : MyList<E>, MutableList<E>
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+6
View File
@@ -29157,6 +29157,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt13355viaJava.kt");
}
@Test
@TestMetadata("kt65555.kt")
public void testKt65555() throws Exception {
runTest("compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt65555.kt");
}
@Test
@TestMetadata("kt9550.kt")
public void testKt9550() throws Exception {