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

K2: introduce unwrapFlexibleAndDefinitelyNotNull

Browse Source
This commit is contained in:
Mikhail Glukhikh
2023-12-11 15:11:36 +01:00
committed by Space Team
parent b76452e15f
commit 37789cf7f5
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirCyclicTypeBoundsChecker.kt
+1 -1
View File
@@ -77,5 +77,5 @@ object FirCyclicTypeBoundsChecker : FirBasicDeclarationChecker() {
ref.unwrapBound().mapNotNull { extractTypeParamName(it.coneType) }.toSet()
private fun extractTypeParamName(type: ConeKotlinType): Name? =
(type.lowerBoundIfFlexible().unwrapDefinitelyNotNull() as? ConeTypeParameterType)?.lookupTag?.name
(type.unwrapFlexibleAndDefinitelyNotNull() as? ConeTypeParameterType)?.lookupTag?.name
}
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelTypeAliasChecker.kt
+1 -1
View File
@@ -24,7 +24,7 @@ object FirTopLevelTypeAliasChecker : FirTypeAliasChecker() {
}
fun containsTypeParameter(type: ConeKotlinType): Boolean {
val unwrapped = type.lowerBoundIfFlexible().unwrapDefinitelyNotNull()
val unwrapped = type.unwrapFlexibleAndDefinitelyNotNull()
if (unwrapped is ConeTypeParameterType) {
return true
compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt
+4
View File
@@ -118,6 +118,10 @@ fun ConeSimpleKotlinType.unwrapDefinitelyNotNull(): ConeSimpleKotlinType {
}
}
fun ConeKotlinType.unwrapFlexibleAndDefinitelyNotNull(): ConeKotlinType {
return lowerBoundIfFlexible().unwrapDefinitelyNotNull()
}
class ConeCapturedTypeConstructor(
val projection: ConeTypeProjection,
var supertypes: List<ConeKotlinType>? = null,