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

[FIR] KT-57195: Don't approximate ft when checking override return types

Browse Source 
Why does this check even exist? K1 doesn't do it.

^KT-57195 Fixed
This commit is contained in:
Nikolay Lunyak
2023-03-13 13:26:27 +02:00
committed by Space Team
parent b385d787cc
commit 5505fd207e
7 changed files with 73 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
Generated
+12
View File
@@ -657,6 +657,18 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/OverrideFunctionWithParamDefaultValue.kt");
}
@Test
@TestMetadata("overrideNotNull_Fail.kt")
public void testOverrideNotNull_Fail() throws Exception {
runTest("compiler/testData/diagnostics/tests/overrideNotNull_Fail.kt");
}
@Test
@TestMetadata("overrideNotNull_Ok.kt")
public void testOverrideNotNull_Ok() throws Exception {
runTest("compiler/testData/diagnostics/tests/overrideNotNull_Ok.kt");
}
@Test
@TestMetadata("OverridenFunctionAndSpecifiedTypeParameter.kt")
public void testOverridenFunctionAndSpecifiedTypeParameter() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
+12
View File
@@ -657,6 +657,18 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/OverrideFunctionWithParamDefaultValue.kt");
}
@Test
@TestMetadata("overrideNotNull_Fail.kt")
public void testOverrideNotNull_Fail() throws Exception {
runTest("compiler/testData/diagnostics/tests/overrideNotNull_Fail.kt");
}
@Test
@TestMetadata("overrideNotNull_Ok.kt")
public void testOverrideNotNull_Ok() throws Exception {
runTest("compiler/testData/diagnostics/tests/overrideNotNull_Ok.kt");
}
@Test
@TestMetadata("OverridenFunctionAndSpecifiedTypeParameter.kt")
public void testOverridenFunctionAndSpecifiedTypeParameter() throws Exception {
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirOverrideChecker.kt
+1 -1
View File
@@ -213,7 +213,7 @@ object FirOverrideChecker : FirClassChecker() {
return null
}
val bounds = overriddenSymbols.map { context.returnTypeCalculator.tryCalculateReturnType(it).coneType.upperBoundIfFlexible() }
val bounds = overriddenSymbols.map { context.returnTypeCalculator.tryCalculateReturnType(it).coneType }
for (it in bounds.indices) {
val overriddenDeclaration = overriddenSymbols[it]