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

FIR: Use intersection of all upper bounds for parameterized types in

Browse Source 
ConeKotlinType.canBeNull.

^KT-45903 In progress
This commit is contained in:
Mark Punzalan
2021-04-05 23:08:18 +00:00
committed by TeamCityServer
parent ac85f9d983
commit 21a3a14289
25 changed files with 417 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeUtils.kt
+4 -3
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.types
import org.jetbrains.kotlin.builtins.functions.FunctionClassKind
import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
import org.jetbrains.kotlin.fir.render
import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol
import org.jetbrains.kotlin.name.StandardClassIds
import org.jetbrains.kotlin.fir.types.impl.FirImplicitBuiltinTypeRef
import org.jetbrains.kotlin.name.ClassId
@@ -165,8 +166,8 @@ val ConeKotlinType.canBeNull: Boolean
return when (this) {
is ConeFlexibleType -> upperBound.canBeNull
is ConeDefinitelyNotNullType -> false
is ConeTypeParameterType -> this.lookupTag.typeParameterSymbol.fir.bounds.any { it.canBeNull }
is ConeIntersectionType -> intersectedTypes.any { it.canBeNull }
is ConeTypeParameterType -> this.lookupTag.typeParameterSymbol.fir.bounds.all { it.coneType.canBeNull }
is ConeIntersectionType -> intersectedTypes.all { it.canBeNull }
else -> isNullable
}
}
@@ -180,4 +181,4 @@ val ConeKotlinType?.functionTypeKind: FunctionClassKind?
}
val FirResolvedTypeRef.functionTypeKind: FunctionClassKind?
get() = type.functionTypeKind
get() = type.functionTypeKind