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

[FIR] Fix false positive TYPE_VARIANCE_CONFLICT in nested class ^KT-49078 Fixed

Browse Source
This commit is contained in:
Ivan Kochurkin
2021-10-04 18:31:13 +03:00
committed by TeamCityServer
parent 6c7c1a7a0d
commit cc4dac5bec
8 changed files with 74 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/DiagnosisCompilerTestFE10TestdataTestGenerated.java
Generated
+6
View File
@@ -11544,6 +11544,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
runTest("compiler/testData/diagnostics/tests/generics/innerClasses/kt6325.kt");
}
@Test
@TestMetadata("noTypeVarianceConflictInNestedClass.kt")
public void testNoTypeVarianceConflictInNestedClass() throws Exception {
runTest("compiler/testData/diagnostics/tests/generics/innerClasses/noTypeVarianceConflictInNestedClass.kt");
}
@Test
@TestMetadata("outerArgumentsRequired.kt")
public void testOuterArgumentsRequired() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -11544,6 +11544,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
runTest("compiler/testData/diagnostics/tests/generics/innerClasses/kt6325.kt");
}
@Test
@TestMetadata("noTypeVarianceConflictInNestedClass.kt")
public void testNoTypeVarianceConflictInNestedClass() throws Exception {
runTest("compiler/testData/diagnostics/tests/generics/innerClasses/noTypeVarianceConflictInNestedClass.kt");
}
@Test
@TestMetadata("outerArgumentsRequired.kt")
public void testOuterArgumentsRequired() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
Generated
+6
View File
@@ -11544,6 +11544,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
runTest("compiler/testData/diagnostics/tests/generics/innerClasses/kt6325.kt");
}
@Test
@TestMetadata("noTypeVarianceConflictInNestedClass.kt")
public void testNoTypeVarianceConflictInNestedClass() throws Exception {
runTest("compiler/testData/diagnostics/tests/generics/innerClasses/noTypeVarianceConflictInNestedClass.kt");
}
@Test
@TestMetadata("outerArgumentsRequired.kt")
public void testOuterArgumentsRequired() throws Exception {
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirClassVarianceChecker.kt
+1 -1
View File
@@ -36,7 +36,7 @@ object FirClassVarianceChecker : FirClassChecker() {
}
}
if (member is FirTypeParameterRefsOwner) {
if (member is FirTypeParameterRefsOwner && member !is FirClass) {
checkTypeParameters(member.typeParameters, Variance.IN_VARIANCE, context, reporter)
}
compiler/testData/diagnostics/tests/generics/innerClasses/noTypeVarianceConflictInNestedClass.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
// FIR_IDENTICAL
// KT-49078
class CidrMemoryData<T> {
interface Data<out T>
abstract class AbstractData<out T, E : Data<T>>
}
compiler/testData/diagnostics/tests/generics/innerClasses/noTypeVarianceConflictInNestedClass.txt
Vendored
+21
View File
@@ -0,0 +1,21 @@
package
public final class CidrMemoryData</*0*/ T> {
public constructor CidrMemoryData</*0*/ T>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract class AbstractData</*0*/ out T, /*1*/ E : CidrMemoryData.Data<T>> {
public constructor AbstractData</*0*/ out T, /*1*/ E : CidrMemoryData.Data<T>>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface Data</*0*/ out T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
compiler/testData/diagnostics/tests/generics/innerClasses/noTypeVarianceInNestedClass.txt
Vendored
+21
View File
@@ -0,0 +1,21 @@
package
public final class CidrMemoryData</*0*/ T> {
public constructor CidrMemoryData</*0*/ T>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract class AbstractData</*0*/ out T, /*1*/ E : CidrMemoryData.Data<T>> {
public constructor AbstractData</*0*/ out T, /*1*/ E : CidrMemoryData.Data<T>>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface Data</*0*/ out T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+6
View File
@@ -11550,6 +11550,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/generics/innerClasses/kt6325.kt");
}
@Test
@TestMetadata("noTypeVarianceConflictInNestedClass.kt")
public void testNoTypeVarianceConflictInNestedClass() throws Exception {
runTest("compiler/testData/diagnostics/tests/generics/innerClasses/noTypeVarianceConflictInNestedClass.kt");
}
@Test
@TestMetadata("outerArgumentsRequired.kt")
public void testOuterArgumentsRequired() throws Exception {