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

NI: return optimization for adding constraints in ConstraintInjector.kt

Browse Source
This commit is contained in:
Victor Petukhov
2020-05-28 14:14:52 +03:00
parent 6c1efbe812
commit e72f7d9a1d
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintInjector.kt
+12 -8
View File
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.types.checker.KotlinTypeRefiner import org.jetbrains.kotlin.types.checker.KotlinTypeRefiner
import org.jetbrains.kotlin.types.model.* import org.jetbrains.kotlin.types.model.*
import org.jetbrains.kotlin.types.refinement.TypeRefinement import org.jetbrains.kotlin.types.refinement.TypeRefinement
import org.jetbrains.kotlin.utils.SmartList
import kotlin.math.max import kotlin.math.max
class ConstraintInjector( class ConstraintInjector(
@@ -90,7 +91,7 @@ class ConstraintInjector(
var constraintsFromIsSubtype = true var constraintsFromIsSubtype = true
while (typeCheckerContext.hasConstraintsToProcess()) { while (typeCheckerContext.hasConstraintsToProcess()) {
for ((typeVariable, constraint) in typeCheckerContext.extractAllConstraints()) { for ((typeVariable, constraint) in typeCheckerContext.extractAllConstraints()!!) {
if (c.shouldWeSkipConstraint(typeVariable, constraint, constraintsFromIsSubtype)) continue if (c.shouldWeSkipConstraint(typeVariable, constraint, constraintsFromIsSubtype)) continue
val constraints = val constraints =
@@ -171,18 +172,21 @@ class ConstraintInjector(
private inner class TypeCheckerContext(val c: Context, val position: IncorporationConstraintPosition) : private inner class TypeCheckerContext(val c: Context, val position: IncorporationConstraintPosition) :
AbstractTypeCheckerContextForConstraintSystem(), ConstraintIncorporator.Context, TypeSystemInferenceExtensionContext by c { AbstractTypeCheckerContextForConstraintSystem(), ConstraintIncorporator.Context, TypeSystemInferenceExtensionContext by c {
private val newPossibleConstraints = mutableSetOf<Pair<TypeVariableMarker, Constraint>>() private var possibleNewConstraints: MutableList<Pair<TypeVariableMarker, Constraint>>? = null
private var baseLowerType = position.initialConstraint.a private var baseLowerType = position.initialConstraint.a
private var baseUpperType = position.initialConstraint.b private var baseUpperType = position.initialConstraint.b
fun extractAllConstraints(): Set<Pair<TypeVariableMarker, Constraint>> { fun extractAllConstraints() = possibleNewConstraints.also { possibleNewConstraints = null }
val newConstraintsSet = newPossibleConstraints.toSet()
newPossibleConstraints.clear() fun addPossibleNewConstraint(variable: TypeVariableMarker, constraint: Constraint) {
return newConstraintsSet if (possibleNewConstraints == null) {
possibleNewConstraints = SmartList()
}
possibleNewConstraints!!.add(variable to constraint)
} }
fun hasConstraintsToProcess() = newPossibleConstraints.isNotEmpty() fun hasConstraintsToProcess() = possibleNewConstraints != null
fun setConstrainingTypesToPrintDebugInfo(lowerType: KotlinTypeMarker, upperType: KotlinTypeMarker) { fun setConstrainingTypesToPrintDebugInfo(lowerType: KotlinTypeMarker, upperType: KotlinTypeMarker) {
baseLowerType = lowerType baseLowerType = lowerType
@@ -343,7 +347,7 @@ class ConstraintInjector(
inputTypePositionBeforeIncorporation = inputTypePosition inputTypePositionBeforeIncorporation = inputTypePosition
) )
newPossibleConstraints.add(typeVariable to newConstraint) addPossibleNewConstraint(typeVariable, newConstraint)
} }
override val allTypeVariablesWithConstraints: Collection<VariableWithConstraints> override val allTypeVariablesWithConstraints: Collection<VariableWithConstraints>