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

[FIR] Elvis operator: flexible rhs type implies flexible type of whole elvis

Browse Source 
It's required for further removing of enhancement of final static fields

Also, it's k2-potential feature

^KT-62467 Fixed
This commit is contained in:
Ivan Kochurkin
2023-10-10 19:02:50 +02:00
committed by Space Team
parent 648330da50
commit 2d61b9a477
7 changed files with 122 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirControlFlowStatementsResolveTransformer.kt
+34 -6
View File
@@ -271,16 +271,44 @@ class FirControlFlowStatementsResolveTransformer(transformer: FirAbstractBodyRes
}
session.typeContext.run {
if (result.resolvedType.isNullableType() && !result.rhs.resolvedType.isNullableType()) {
// Sometimes return type for special call for elvis operator might be nullable,
// but result is not nullable if the right type is not nullable
result.replaceConeTypeOrNull(
result.resolvedType.makeConeTypeDefinitelyNotNullOrNotNull(session.typeContext)
)
if (result.resolvedType.isNullableType()) {
val rhsResolvedType = result.rhs.resolvedType
// This part of the code is a kind of workaround, and it probably will be resolved by KT-55692
if (!rhsResolvedType.isNullableType()) {
// It's definitely not a flexible with nullable bound
// Sometimes return type for special call for elvis operator might be nullable,
// but result is not nullable if the right type is not nullable
result.replaceConeTypeOrNull(result.resolvedType.makeConeTypeDefinitelyNotNullOrNotNull(session.typeContext))
} else if (rhsResolvedType is ConeFlexibleType && !rhsResolvedType.lowerBound.isNullableType()) {
result.replaceConeTypeOrNull(result.resultType.makeConeFlexibleTypeWithNotNullableLowerBound(session.typeContext))
}
}
}
dataFlowAnalyzer.exitElvis(elvisExpression, isLhsNotNull, data.forceFullCompletion)
return result
}
private fun ConeKotlinType.makeConeFlexibleTypeWithNotNullableLowerBound(typeContext: ConeTypeContext): ConeKotlinType {
with(typeContext) {
return when (this@makeConeFlexibleTypeWithNotNullableLowerBound) {
is ConeDefinitelyNotNullType ->
error("It can't happen because of the previous `isNullableType` check")
is ConeFlexibleType -> {
if (!lowerBound.isNullableType()) {
this@makeConeFlexibleTypeWithNotNullableLowerBound
} else {
ConeFlexibleType(lowerBound.makeConeTypeDefinitelyNotNullOrNotNull(typeContext) as ConeSimpleKotlinType, upperBound)
}
}
is ConeIntersectionType -> ConeIntersectionType(
intersectedTypes.map { it.makeConeFlexibleTypeWithNotNullableLowerBound(typeContext) }
)
is ConeSimpleKotlinType -> ConeFlexibleType(
makeConeTypeDefinitelyNotNullOrNotNull(typeContext) as ConeSimpleKotlinType,
this@makeConeFlexibleTypeWithNotNullableLowerBound
)
}
}
}
}