Support DNN types in approximator

Mostly, it's relevant to FIR since there we started loading
type parameter based types as (T & Any..T?)

analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java

@@ -18464,6 +18464,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
                 runTest("compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound3.kt");
             }
 
+            @Test
+            @TestMetadata("recursiveSelfTypes.kt")
+            public void testRecursiveSelfTypes() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/j+k/recursiveSelfTypes.kt");
+            }
+
             @Test
             @TestMetadata("safeCallDefinitelyNotNull.kt")
             public void testSafeCallDefinitelyNotNull() throws Exception {

compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java

@@ -18464,6 +18464,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
                 runTest("compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound3.kt");
             }
 
+            @Test
+            @TestMetadata("recursiveSelfTypes.kt")
+            public void testRecursiveSelfTypes() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/j+k/recursiveSelfTypes.kt");
+            }
+
             @Test
             @TestMetadata("safeCallDefinitelyNotNull.kt")
             public void testSafeCallDefinitelyNotNull() throws Exception {

compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java

@@ -18464,6 +18464,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
                 runTest("compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound3.kt");
             }
 
+            @Test
+            @TestMetadata("recursiveSelfTypes.kt")
+            public void testRecursiveSelfTypes() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/j+k/recursiveSelfTypes.kt");
+            }
+
             @Test
             @TestMetadata("safeCallDefinitelyNotNull.kt")
             public void testSafeCallDefinitelyNotNull() throws Exception {

compiler/resolution.common/src/org/jetbrains/kotlin/types/AbstractTypeApproximator.kt

@@ -414,7 +414,7 @@ abstract class AbstractTypeApproximator(
 
             val argumentType = newArguments[index]?.getType() ?: argument.getType()
 
-            val capturedType = argumentType.lowerBoundIfFlexible().asCapturedType()
+            val capturedType = argumentType.lowerBoundIfFlexible().originalIfDefinitelyNotNullable().asCapturedType()
             val capturedStarProjectionOrNull =
                 capturedType?.typeConstructorProjection()?.takeIf { it.isStarProjection() }
 

compiler/testData/diagnostics/tests/j+k/recursiveSelfTypes.kt

@@ -0,0 +1,31 @@
+// FIR_IDENTICAL
+// SKIP_TXT
+// FILE: TSFBuilder.java
+public abstract class TSFBuilder<F extends CharSequence, B extends TSFBuilder<F,B>> {
+    public B configure() { return null; }
+    public abstract F build();
+
+    public static TSFBuilder<?, ?> start() { return null; }
+}
+
+// FILE: test.kt
+
+fun foo(x: CharSequence?) {}
+
+fun main() {
+    foo(
+        TSFBuilder.start()
+            .configure()
+            .configure()
+            .configure()
+            .configure()
+            .configure()
+            .configure()
+            .configure()
+            .configure()
+            .configure()
+            .configure()
+            .configure()
+            .build()
+    )
+}

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java

@@ -18470,6 +18470,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 runTest("compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound3.kt");
             }
 
+            @Test
+            @TestMetadata("recursiveSelfTypes.kt")
+            public void testRecursiveSelfTypes() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/j+k/recursiveSelfTypes.kt");
+            }
+
             @Test
             @TestMetadata("safeCallDefinitelyNotNull.kt")
             public void testSafeCallDefinitelyNotNull() throws Exception {

core/compiler.common/src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt

@@ -584,6 +584,9 @@ interface TypeSystemContext : TypeSystemOptimizationContext {
 
     fun SimpleTypeMarker.asDefinitelyNotNullType(): DefinitelyNotNullTypeMarker?
     fun DefinitelyNotNullTypeMarker.original(): SimpleTypeMarker
+
+    fun SimpleTypeMarker.originalIfDefinitelyNotNullable(): SimpleTypeMarker = asDefinitelyNotNullType()?.original() ?: this
+
     fun KotlinTypeMarker.makeDefinitelyNotNullOrNotNull(): KotlinTypeMarker
     fun SimpleTypeMarker.makeSimpleTypeDefinitelyNotNullOrNotNull(): SimpleTypeMarker
     fun SimpleTypeMarker.isMarkedNullable(): Boolean