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

FIR: Simplify ConeTypeContext.captureArguments

Browse Source
This commit is contained in:
Denis.Zharkov
2021-12-28 18:26:47 +03:00
committed by teamcity
parent 9be4f818f4
commit a63351f5d1
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/TypeUtils.kt
+5 -6
View File
@@ -418,14 +418,13 @@ fun ConeTypeContext.captureArguments(type: ConeKotlinType, status: CaptureStatus
val typeConstructor = type.typeConstructor() val typeConstructor = type.typeConstructor()
if (argumentsCount != typeConstructor.parametersCount()) return null if (argumentsCount != typeConstructor.parametersCount()) return null
if (type.typeArguments.all { it !is ConeStarProjection && it.kind == ProjectionKind.INVARIANT }) return null if (type.typeArguments.all { it.kind == ProjectionKind.INVARIANT }) return null
val newArguments: Array<ConeKotlinType> = Array(argumentsCount) { index -> val newArguments: Array<ConeKotlinType> = Array(argumentsCount) { index ->
val argument = type.typeArguments[index] val argument = type.typeArguments[index]
if (argument !is ConeStarProjection && argument.kind == ProjectionKind.INVARIANT) if (argument.kind == ProjectionKind.INVARIANT) return@Array argument.type!!
return@Array argument.type!! // only star projection can return null, but it's guarded above
val lowerType = if (argument !is ConeStarProjection && argument.getVariance() == TypeVariance.IN) { val lowerType = if (argument.kind == ProjectionKind.IN) {
(argument as ConeKotlinTypeProjection).type (argument as ConeKotlinTypeProjection).type
} else { } else {
null null
@@ -443,7 +442,7 @@ fun ConeTypeContext.captureArguments(type: ConeKotlinType, status: CaptureStatus
val oldArgument = type.typeArguments[index] val oldArgument = type.typeArguments[index]
val newArgument = newArguments[index] val newArgument = newArguments[index]
if (oldArgument !is ConeStarProjection && oldArgument.kind == ProjectionKind.INVARIANT) continue if (oldArgument.kind == ProjectionKind.INVARIANT) continue
val parameter = typeConstructor.getParameter(index) val parameter = typeConstructor.getParameter(index)
val upperBounds = (0 until parameter.upperBoundCount()).mapTo(mutableListOf()) { paramIndex -> val upperBounds = (0 until parameter.upperBoundCount()).mapTo(mutableListOf()) { paramIndex ->
@@ -452,7 +451,7 @@ fun ConeTypeContext.captureArguments(type: ConeKotlinType, status: CaptureStatus
) )
} }
if (!oldArgument.isStarProjection() && oldArgument.getVariance() == TypeVariance.OUT) { if (oldArgument.kind == ProjectionKind.OUT) {
upperBounds += oldArgument.getType() upperBounds += oldArgument.getType()
} }