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

[FIR] Make return type of ConeTypeContext.captureFromExpression more precise

Browse Source
This commit is contained in:
Kirill Rakhman
2023-11-21 13:20:23 +01:00
committed by Space Team
parent 934253878b
commit ed4941d9f9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt
+1 -1
View File
@@ -383,7 +383,7 @@ interface ConeTypeContext : TypeSystemContext, TypeSystemOptimizationContext, Ty
fir.classKind != ClassKind.ANNOTATION_CLASS fir.classKind != ClassKind.ANNOTATION_CLASS
} }
override fun captureFromExpression(type: KotlinTypeMarker): KotlinTypeMarker? { override fun captureFromExpression(type: KotlinTypeMarker): ConeKotlinType? {
require(type is ConeKotlinType) require(type is ConeKotlinType)
return captureFromExpressionInternal(type) return captureFromExpressionInternal(type)
} }
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Arguments.kt
+1 -1
View File
@@ -695,7 +695,7 @@ internal fun captureFromTypeParameterUpperBoundIfNeeded(
val chosenSupertype = typeParameter.symbol.resolvedBounds.map { it.coneType } val chosenSupertype = typeParameter.symbol.resolvedBounds.map { it.coneType }
.singleOrNull { it.hasSupertypeWithGivenClassId(expectedTypeClassId, context) } ?: return argumentType .singleOrNull { it.hasSupertypeWithGivenClassId(expectedTypeClassId, context) } ?: return argumentType
val capturedType = context.captureFromExpression(chosenSupertype) as ConeKotlinType? ?: return argumentType val capturedType = context.captureFromExpression(chosenSupertype) ?: return argumentType
return if (argumentType is ConeDefinitelyNotNullType) { return if (argumentType is ConeDefinitelyNotNullType) {
ConeDefinitelyNotNullType.create(capturedType, session.typeContext) ?: capturedType ConeDefinitelyNotNullType.create(capturedType, session.typeContext) ?: capturedType
} else { } else {