From db8bd8c197eec5dd77751903e06d247ee71ea8cb Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Wed, 17 Apr 2019 17:56:29 +0300 Subject: [PATCH] Fix check isCapturedTypeFromSubtyping to support KotlinTypeMarkers --- .../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 50b096a33f0..04b0570f08b 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 @@ -154,7 +154,7 @@ class ConstraintInjector(val constraintIncorporator: ConstraintIncorporator, val addConstraint(typeVariable, subType, LOWER) private fun isCapturedTypeFromSubtyping(type: KotlinTypeMarker) = - when ((type as? NewCapturedType)?.captureStatus) { + when ((type as? CapturedTypeMarker)?.captureStatus()) { null, CaptureStatus.FROM_EXPRESSION -> false CaptureStatus.FOR_SUBTYPING -> true CaptureStatus.FOR_INCORPORATION ->