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

[NI] Decrease priority of Integer Literal Types in type checking

Browse Source 
#KT-30446
This commit is contained in:
Dmitriy Novozhilov
2019-03-28 15:30:11 +03:00
parent 4a1b9dcc3c
commit 1ac3542036
5 changed files with 61 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ResultTypeResolver.kt
+13 -1
View File
@@ -25,6 +25,9 @@ import org.jetbrains.kotlin.resolve.calls.inference.model.checkConstraint
import org.jetbrains.kotlin.resolve.constants.IntegerLiteralTypeConstructor
import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.types.checker.intersectTypes
import org.jetbrains.kotlin.types.checker.isIntegerLiteralType
import org.jetbrains.kotlin.types.typeUtil.contains
import org.jetbrains.kotlin.utils.addToStdlib.safeAs
class ResultTypeResolver(
val typeApproximator: TypeApproximator,
@@ -87,7 +90,8 @@ class ResultTypeResolver(
private fun findSubType(c: Context, variableWithConstraints: VariableWithConstraints): UnwrappedType? {
val lowerConstraints = variableWithConstraints.constraints.filter { it.kind == ConstraintKind.LOWER && c.isProperType(it.type) }
if (lowerConstraints.isNotEmpty()) {
val commonSuperType = NewCommonSuperTypeCalculator.commonSuperType(lowerConstraints.map { it.type })
val types = sinkIntegerLiteralTypes(lowerConstraints.map { it.type })
val commonSuperType = NewCommonSuperTypeCalculator.commonSuperType(types)
/**
*
* fun <T> Array<out T>.intersect(other: Iterable<T>) {
@@ -115,6 +119,14 @@ class ResultTypeResolver(
return null
}
private fun sinkIntegerLiteralTypes(types: List<UnwrappedType>): List<UnwrappedType> {
return types.sortedBy { type ->
val containsILT = type.contains { it.unwrap().safeAs<SimpleType>()?.isIntegerLiteralType ?: false }
if (containsILT) 1 else 0
}
}
private fun findSuperType(c: Context, variableWithConstraints: VariableWithConstraints): UnwrappedType? {
val upperConstraints = variableWithConstraints.constraints.filter { it.kind == ConstraintKind.UPPER && c.isProperType(it.type) }
if (upperConstraints.isNotEmpty()) {