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

FIR: Use NullableAny as a default bound

Browse Source
This commit is contained in:
Denis.Zharkov
2022-04-11 18:31:08 +03:00
committed by teamcity
parent 934b8c890e
commit 853b7ec078
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirJavaGenericVarianceViolationTypeChecker.kt
+1 -1
View File
@@ -176,7 +176,7 @@ object FirJavaGenericVarianceViolationTypeChecker : FirFunctionCallChecker() {
return when (this) { return when (this) {
is ConeKotlinTypeProjectionOut -> if (isCovariant) type else this is ConeKotlinTypeProjectionOut -> if (isCovariant) type else this
is ConeKotlinTypeProjectionIn -> ConeKotlinTypeProjectionIn(type.removeOutProjection(!isCovariant)) is ConeKotlinTypeProjectionIn -> ConeKotlinTypeProjectionIn(type.removeOutProjection(!isCovariant))
is ConeStarProjection -> if (isCovariant) StandardTypes.Any else this is ConeStarProjection -> if (isCovariant) StandardTypes.NullableAny else this
// Don't remove nested projections for types at invariant position. // Don't remove nested projections for types at invariant position.
is ConeKotlinTypeConflictingProjection, is ConeKotlinTypeConflictingProjection,
is ConeKotlinType -> this is ConeKotlinType -> this
compiler/fir/tree/src/org/jetbrains/kotlin/fir/Primitives.kt
+3 -2
View File
@@ -25,10 +25,11 @@ object StandardTypes {
val Double: ConeClassLikeType = StandardClassIds.Double.createType() val Double: ConeClassLikeType = StandardClassIds.Double.createType()
val Any: ConeClassLikeType = StandardClassIds.Any.createType() val Any: ConeClassLikeType = StandardClassIds.Any.createType()
val NullableAny: ConeClassLikeType = StandardClassIds.Any.createType(isNullable = true)
} }
private fun ClassId.createType(): ConeClassLikeType = private fun ClassId.createType(isNullable: Boolean = false): ConeClassLikeType =
ConeClassLikeTypeImpl(ConeClassLikeLookupTagImpl(this), emptyArray(), isNullable = false) ConeClassLikeTypeImpl(ConeClassLikeLookupTagImpl(this), emptyArray(), isNullable)
fun ConeClassLikeType.isDouble(): Boolean = lookupTag.classId == StandardClassIds.Double fun ConeClassLikeType.isDouble(): Boolean = lookupTag.classId == StandardClassIds.Double
fun ConeClassLikeType.isFloat(): Boolean = lookupTag.classId == StandardClassIds.Float fun ConeClassLikeType.isFloat(): Boolean = lookupTag.classId == StandardClassIds.Float