From d1e52e76f9135b2bb4d8dec2c5e07095085de2e9 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Sun, 20 Aug 2017 01:12:25 +0300 Subject: [PATCH] [NI] Reduced allowed depth in incorporation We set it to 1 now, because otherwise there is examples where incorporation work too long. We will fix such cases in the future, but seems like 1 is also good depth delta for incorporation --- .../resolve/calls/inference/components/ConstraintInjector.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintInjector.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintInjector.kt index cc931fb460f..fe96adf62e1 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintInjector.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintInjector.kt @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.types.typeUtil.isNullableAny import java.util.* class ConstraintInjector(val constraintIncorporator: ConstraintIncorporator, val typeApproximator: TypeApproximator) { - private val ALLOWED_DEPTH_DELTA_FOR_INCORPORATION = 3 + private val ALLOWED_DEPTH_DELTA_FOR_INCORPORATION = 1 interface Context { val allTypeVariables: Map