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

[NI] Get rid of KotlinType usages in MutableConstraintStorage.kt

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-08-28 10:29:47 +03:00
parent af0df35623
commit 068d21635e
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/model/MutableConstraintStorage.kt
+21 -15
View File
@@ -7,21 +7,21 @@ package org.jetbrains.kotlin.resolve.calls.inference.model
import org.jetbrains.kotlin.resolve.calls.inference.components.ConstraintSystemUtilContext
import org.jetbrains.kotlin.resolve.calls.tower.isSuccess
import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.types.model.KotlinTypeMarker
import org.jetbrains.kotlin.types.model.TypeConstructorMarker
import org.jetbrains.kotlin.types.model.TypeVariableMarker
import org.jetbrains.kotlin.types.model.*
import org.jetbrains.kotlin.utils.SmartList
import org.jetbrains.kotlin.utils.addToStdlib.trimToSize
private typealias Context = TypeSystemInferenceExtensionContext
class MutableVariableWithConstraints private constructor(
private val context: Context,
override val typeVariable: TypeVariableMarker,
constraints: List<Constraint>? // assume simplified and deduplicated
) : VariableWithConstraints {
constructor(typeVariable: TypeVariableMarker) : this(typeVariable, null)
constructor(context: Context, typeVariable: TypeVariableMarker) : this(context, typeVariable, null)
constructor(other: VariableWithConstraints) : this(other.typeVariable, other.constraints)
constructor(context: Context, other: VariableWithConstraints) : this(context, other.typeVariable, other.constraints)
override val constraints: List<Constraint>
get() {
@@ -152,20 +152,26 @@ class MutableVariableWithConstraints private constructor(
}
// Such constraint is applicable for simplification
private fun Constraint.isLowerAndFlexibleTypeWithDefNotNullLowerBound(): Boolean =
kind == ConstraintKind.LOWER && type is FlexibleType && type.lowerBound.isDefinitelyNotNullType
private fun Constraint.isLowerAndFlexibleTypeWithDefNotNullLowerBound(): Boolean {
return with(context) {
kind == ConstraintKind.LOWER && type.isFlexible() && type.lowerBoundIfFlexible().isDefinitelyNotNullType()
}
}
private fun Constraint.isStrongerThanLowerAndFlexibleTypeWithDefNotNullLowerBound(other: Constraint): Boolean {
if (this === other) return false
if (typeHashCode != other.typeHashCode || kind == ConstraintKind.UPPER) return false
if (type !is FlexibleType) return false
val otherFlexibleType = other.type as? FlexibleType ?: return false
val otherLowerBound = otherFlexibleType.lowerBound as? DefinitelyNotNullType ?: return false
val otherUpperBound = otherFlexibleType.upperBound
return type.lowerBound == otherLowerBound.original && type.upperBound == otherUpperBound
with(context) {
if (!type.isFlexible() || !other.type.isFlexible()) return false
val otherLowerBound = other.type.lowerBoundIfFlexible()
if (!otherLowerBound.isDefinitelyNotNullType()) return false
require(otherLowerBound is DefinitelyNotNullTypeMarker)
val thisLowerBound = type.lowerBoundIfFlexible()
val thisUpperBound = type.upperBoundIfFlexible()
val otherUpperBound = other.type.upperBoundIfFlexible()
return thisLowerBound == otherLowerBound.original() && thisUpperBound == otherUpperBound
}
}
private fun SmartList<Constraint>.simplifyEqualityConstraints(): SmartList<Constraint> {
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/model/NewConstraintSystemImpl.kt
+2 -2
View File
@@ -92,7 +92,7 @@ class NewConstraintSystemImpl(
transactionRegisterVariable(variable)
storage.allTypeVariables[variable.freshTypeConstructor()] = variable
notProperTypesCache.clear()
storage.notFixedTypeVariables[variable.freshTypeConstructor()] = MutableVariableWithConstraints(variable)
storage.notFixedTypeVariables[variable.freshTypeConstructor()] = MutableVariableWithConstraints(this, variable)
}
override fun markPostponedVariable(variable: TypeVariableMarker) {
@@ -200,7 +200,7 @@ class NewConstraintSystemImpl(
notProperTypesCache.clear()
}
for ((variable, constraints) in otherSystem.notFixedTypeVariables) {
notFixedTypeVariables[variable] = MutableVariableWithConstraints(constraints)
notFixedTypeVariables[variable] = MutableVariableWithConstraints(this, constraints)
}
storage.initialConstraints.addAll(otherSystem.initialConstraints)
storage.maxTypeDepthFromInitialConstraints =