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

K2: Fix false-positive RETURN_TYPE_MISMATCH_ON_OVERRIDE

Browse Source 
The reason was that `substitutorByMap` ignored the difference between
`T` and `T?`

^KT-57001 Fixed
This commit is contained in:
Denis.Zharkov
2023-03-28 11:00:00 +02:00
committed by Space Team
parent ac8cbcafb4
commit d9ca77f716
7 changed files with 42 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
+6
View File
@@ -12564,6 +12564,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/generics/localClassTypeRefWithTypeParameterFromFunction.kt");
}
@Test
@TestMetadata("nullableTypeParameterScope.kt")
public void testNullableTypeParameterScope() throws Exception {
runTest("compiler/testData/diagnostics/tests/generics/nullableTypeParameterScope.kt");
}
@Test
@TestMetadata("outerTypeParametersInNestedClasses.kt")
public void testOuterTypeParametersInNestedClasses() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -12570,6 +12570,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/generics/localClassTypeRefWithTypeParameterFromFunction.kt");
}
@Test
@TestMetadata("nullableTypeParameterScope.kt")
public void testNullableTypeParameterScope() throws Exception {
runTest("compiler/testData/diagnostics/tests/generics/nullableTypeParameterScope.kt");
}
@Test
@TestMetadata("outerTypeParametersInNestedClasses.kt")
public void testOuterTypeParametersInNestedClasses() throws Exception {
compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/substitution/Substitutors.kt
+1 -1
View File
@@ -173,7 +173,7 @@ abstract class AbstractConeSubstitutor(protected val typeContext: ConeTypeContex
fun substitutorByMap(substitution: Map<FirTypeParameterSymbol, ConeKotlinType>, useSiteSession: FirSession): ConeSubstitutor {
// If all arguments match parameters, then substitutor isn't needed
if (substitution.all { (parameterSymbol, argumentType) ->
(argumentType as? ConeTypeParameterType)?.lookupTag?.typeParameterSymbol == parameterSymbol
(argumentType as? ConeTypeParameterType)?.lookupTag?.typeParameterSymbol == parameterSymbol && !argumentType.isMarkedNullable
}
) return ConeSubstitutor.Empty
return ConeSubstitutorByMap(substitution, useSiteSession)