[FIR] Fix inference based on recursive upper bound

#KT-59012 Fixed

compiler/testData/diagnostics/tests/inference/capturedTypes/capturedInTypeInference.kt

@@ -0,0 +1,16 @@
+// FIR_IDENTICAL
+class Key<T>
+class Box<T>
+
+fun <T : Any> get(key: Key<in T>): T? = null
+fun <T> acceptBox(box: Box<T>) {}
+
+fun <V> test(key: Key<in Box<V>>) {
+    // CS of get:
+    // Key<CapturedType(in Box<V>)> <: Key<in TypeVariable(T)>
+    // If the type is not approximated to subtype before fixation, the type of the lambda parameter `it` becomes Any?
+    get(key)?.let { acceptBox(it) }
+
+    val x = get(key)
+    x?.let { acceptBox(it) }
+}

compiler/testData/diagnostics/tests/inference/capturedTypes/memberScopeOfCaptured.fir.kt

@@ -8,6 +8,6 @@ fun <E> A<E>.bar(): A<in E> = this
 
 fun baz(x: A<out CharSequence>) {
     x.bar() checkType { _<A<*>>() }
-    <!DEBUG_INFO_EXPRESSION_TYPE("CapturedType(in CapturedType(out kotlin.CharSequence))")!>x.bar().foo()<!> checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><Any?>() } // See KT-10448
-    <!DEBUG_INFO_EXPRESSION_TYPE("CapturedType(in CapturedType(out kotlin.CharSequence))")!>x.bar().foo()<!> checkType { _<CharSequence>() } // Inference change in K2
+    <!DEBUG_INFO_EXPRESSION_TYPE("CapturedType(in CapturedType(out kotlin.CharSequence))")!>x.bar().foo()<!> checkType { _<Any?>() } // See KT-10448
+    <!DEBUG_INFO_EXPRESSION_TYPE("CapturedType(in CapturedType(out kotlin.CharSequence))")!>x.bar().foo()<!> checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><CharSequence>() } // Inference change in K2
 }

compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/enabledInferenceOnSelfTypes/basicInferenceForImplicitSelfType.fir.kt

@@ -13,14 +13,21 @@ class Builder<B : Builder<B>> {
     fun <T : B> test(): T = TODO()
 
     fun foo() {}
+    fun bar(block: () -> Out<B>) {}
 }
 
+class Out<out T>
+
 fun testStar(builder: Builder<*>) {
-    <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Cannot infer argument for type parameter T")!>builder.<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test<!>()<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("CapturedType(*)")!>builder.test()<!>
 
     builder
-        .<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test<!>()
-        .<!UNRESOLVED_REFERENCE!>foo<!>()
+        .test()
+        .foo()
+
+    builder
+        .test()
+        .bar { Out() }
 }
 
 fun <K : Builder<K>> testTypeParam(builder: Builder<K>) {
@@ -29,14 +36,18 @@ fun <K : Builder<K>> testTypeParam(builder: Builder<K>) {
     builder
         .test()
         .foo()
+
+    builder
+        .test()
+        .bar { Out() }
 }
 
 fun testStarJava(builder: JavaBuilder<*>) {
-    <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Cannot infer argument for type parameter T")!>builder.<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test<!>()<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("CapturedType(*)!!..CapturedType(*)?!")!>builder.test()<!>
 
     builder
-        .<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test<!>()
-        .<!UNRESOLVED_REFERENCE!>foo<!>()
+        .test()
+        .foo()
 }
 
 fun <K : JavaBuilder<K>> testTypeParamJava(builder: JavaBuilder<K>) {

compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/enabledInferenceOnSelfTypes/basicInferenceForImplicitSelfType.kt

@@ -13,14 +13,21 @@ class Builder<B : Builder<B>> {
     fun <T : B> test(): T = TODO()
 
     fun foo() {}
+    fun bar(block: () -> Out<B>) {}
 }
 
+class Out<out T>
+
 fun testStar(builder: Builder<*>) {
     <!DEBUG_INFO_EXPRESSION_TYPE("Builder<*>")!>builder.test()<!>
 
     builder
         .test()
         .foo()
+
+    builder
+        .test()
+        .bar { Out() }
 }
 
 fun <K : Builder<K>> testTypeParam(builder: Builder<K>) {
@@ -29,6 +36,10 @@ fun <K : Builder<K>> testTypeParam(builder: Builder<K>) {
     builder
         .test()
         .foo()
+
+    builder
+        .test()
+        .bar { Out() }
 }
 
 fun testStarJava(builder: JavaBuilder<*>) {

compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/enabledInferenceOnSelfTypes/basicInferenceForImplicitSelfType.txt

@@ -1,25 +0,0 @@
-package
-
-public fun testStar(/*0*/ builder: Builder<*>): kotlin.Unit
-public fun testStarJava(/*0*/ builder: JavaBuilder<*>): kotlin.Unit
-public fun </*0*/ K : Builder<K>> testTypeParam(/*0*/ builder: Builder<K>): kotlin.Unit
-public fun </*0*/ K : JavaBuilder<K>> testTypeParamJava(/*0*/ builder: JavaBuilder<K>): kotlin.Unit
-
-public final class Builder</*0*/ B : Builder<B>> {
-    public constructor Builder</*0*/ B : Builder<B>>()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun </*0*/ T : B> test(): T
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public open class JavaBuilder</*0*/ B : JavaBuilder<B!>!> {
-    public constructor JavaBuilder</*0*/ B : JavaBuilder<B!>!>()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public/*package*/ open fun foo(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public/*package*/ open fun </*0*/ T : B!> test(): T!
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-

compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/enabledInferenceOnSelfTypes/recursiveTypeWithTwoTypeParams.fir.kt

@@ -13,11 +13,11 @@ interface BodySpec<B, S : BodySpec<B, S>> {
 }
 
 fun test(b: BodySpec<String, *>) {
-    val x = b.<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>isEqualTo<!>("")
-    <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Cannot infer argument for type parameter T")!>x<!>
+    val x = b.isEqualTo("")
+    <!DEBUG_INFO_EXPRESSION_TYPE("BodySpec<kotlin.String, *>")!>x<!>
 }
 
 fun testJava(b: JavaBodySpec<String, *>) {
-    val x = b.<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>isEqualTo<!>("")
-    <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Cannot infer argument for type parameter T")!>x<!>
+    val x = b.isEqualTo("")
+    <!DEBUG_INFO_EXPRESSION_TYPE("JavaBodySpec<kotlin.String..kotlin.String?!, *>..JavaBodySpec<kotlin.String..kotlin.String?!, *>?!")!>x<!>
 }