commit 03b812e2ec2a23802d0b531ecec3ac70fc0b32da
author Simon Ogorodnik <simon.ogorodnik@jetbrains.com> Sat Jan 15 12:24:12 2022 +0300
committer Simon Ogorodnik <simon.ogorodnik@jetbrains.com> Sat Jan 15 12:24:39 2022 +0300
tree cfc6a68154a0507af9628d3832522ec652923eb5
parent 475249bff6dbcaad36aacc7bec139f730ebbd9bd

Inference. Remove chain inference stubs from fixed variables constraints

compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/VariableFixationFinder.kt

diff --git a/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/VariableFixationFinder.kt b/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/VariableFixationFinder.kt
index 44dbc73..b9e30b9 100644
--- a/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/VariableFixationFinder.kt
+++ b/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/VariableFixationFinder.kt
@@ -207,11 +207,11 @@
 }
 
 fun TypeSystemInferenceExtensionContext.containsTypeVariable(type: KotlinTypeMarker, typeVariable: TypeConstructorMarker): Boolean {
-    if (type.contains { it.typeConstructor() == typeVariable }) return true
+    if (type.contains { it.typeConstructor().unwrapStubTypeVariableConstructor() == typeVariable }) return true
 
     val typeProjections = extractProjectionsForAllCapturedTypes(type)
 
     return typeProjections.any { typeProjectionsType ->
-        typeProjectionsType.contains { it.typeConstructor() == typeVariable }
+        typeProjectionsType.contains { it.typeConstructor().unwrapStubTypeVariableConstructor() == typeVariable }
     }
 }