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

[FE 1.0] Fix subtyping for captured integer literal types

Browse Source 
^KT-50877 Fixed
This commit is contained in:
Victor Petukhov
2022-01-20 12:46:46 +03:00
committed by teamcity
parent 7395f8e019
commit ec6ec20728
10 changed files with 118 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/compiler.common/src/org/jetbrains/kotlin/types/AbstractTypeChecker.kt
+9 -1
View File
@@ -313,8 +313,16 @@ object AbstractTypeChecker {
&& typeConstructor.supertypes().any { it.asSimpleType()?.isIntegerLiteralType() == true }
}
fun isCapturedIntegerLiteralType(type: SimpleTypeMarker): Boolean {
if (type !is CapturedTypeMarker) return false
val projection = type.typeConstructor().projection()
return !projection.isStarProjection() && projection.getType().upperBoundIfFlexible().isIntegerLiteralType()
}
fun isIntegerLiteralTypeOrCapturedOne(type: SimpleTypeMarker) = type.isIntegerLiteralType() || isCapturedIntegerLiteralType(type)
when {
subType.isIntegerLiteralType() && superType.isIntegerLiteralType() -> {
isIntegerLiteralTypeOrCapturedOne(subType) && isIntegerLiteralTypeOrCapturedOne(superType) -> {
return true
}