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

[FIR] Fix raw type nullability computation

Browse Source 
Consider the nullability of the type arguments, not of the type.
This fixes a false positive ARGUMENT_TYPE_MISMATCH.

#KT-66294 Fixed
This commit is contained in:
Kirill Rakhman
2024-03-04 11:11:40 +01:00
committed by Space Team
parent df878918ee
commit 172df04c9b
9 changed files with 88 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/substitution/Substitutors.kt
+5 -2
View File
@@ -281,7 +281,7 @@ class ConeRawScopeSubstitutor(
return when {
type is ConeTypeParameterType -> {
substituteOrSelf(
listOf(type.lookupTag.symbol).getProjectionsForRawType(useSiteSession, makeNullable = type.isNullable)[0]
type.lookupTag.symbol.getProjectionForRawType(useSiteSession, makeNullable = type.isMarkedNullable)
)
}
type is ConeClassLikeType && type.typeArguments.isNotEmpty() -> {
@@ -295,8 +295,11 @@ class ConeRawScopeSubstitutor(
}
val firClass = type.fullyExpandedType(useSiteSession).lookupTag.toFirRegularClassSymbol(useSiteSession) ?: return null
val nullabilities = BooleanArray(type.typeArguments.size) { type.typeArguments[it].type?.isMarkedNullable == true }
ConeRawType.create(
type.withArguments(firClass.typeParameterSymbols.getProjectionsForRawType(useSiteSession, makeNullable = type.isNullable)),
type.withArguments(
firClass.typeParameterSymbols.getProjectionsForRawType(useSiteSession, nullabilities = nullabilities)
),
type.replaceArgumentsWithStarProjections()
)
}
compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/TypeUtils.kt
+21 -4
View File
@@ -689,15 +689,32 @@ fun List<FirTypeParameterSymbol>.eraseToUpperBoundsAssociated(
}
}
fun List<FirTypeParameterSymbol>.getProjectionsForRawType(session: FirSession, makeNullable: Boolean): Array<ConeKotlinType> {
fun List<FirTypeParameterSymbol>.getProjectionsForRawType(session: FirSession, nullabilities: BooleanArray?): Array<ConeKotlinType> {
val cache = mutableMapOf<FirTypeParameter, ConeKotlinType>()
return Array(size) { index ->
this[index].fir.eraseToUpperBound(
session, cache, mode = EraseUpperBoundMode.FOR_RAW_TYPE_ERASURE
).applyIf(makeNullable) { withNullability(ConeNullability.NULLABLE, session.typeContext) }
this[index].getProjectionForRawType(session, cache, nullabilities?.get(index) == true)
}
}
fun FirTypeParameterSymbol.getProjectionForRawType(
session: FirSession,
makeNullable: Boolean,
): ConeKotlinType {
return getProjectionForRawType(session, mutableMapOf(), makeNullable)
}
private fun FirTypeParameterSymbol.getProjectionForRawType(
session: FirSession,
cache: MutableMap<FirTypeParameter, ConeKotlinType>,
makeNullable: Boolean,
): ConeKotlinType {
return fir.eraseToUpperBound(session, cache, mode = EraseUpperBoundMode.FOR_RAW_TYPE_ERASURE)
.applyIf(makeNullable) {
withNullability(ConeNullability.NULLABLE, session.typeContext)
}
}
private enum class EraseUpperBoundMode {
FOR_RAW_TYPE_ERASURE,
FOR_EMPTY_INTERSECTION_CHECK