[NI] Do not incorporate constraints that are needed only for nullability

compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestGenerated.java

@@ -10841,6 +10841,11 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirOldFronte
                 runTest("compiler/testData/diagnostics/tests/inference/nothingType/discriminatedNothingAndSmartCast.kt");
             }
 
+            @TestMetadata("discriminatedNothingInsideComplexNestedCall.kt")
+            public void testDiscriminatedNothingInsideComplexNestedCall() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/inference/nothingType/discriminatedNothingInsideComplexNestedCall.kt");
+            }
+
             @TestMetadata("generateConstraintWithInnerNothingType.kt")
             public void testGenerateConstraintWithInnerNothingType() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/inference/nothingType/generateConstraintWithInnerNothingType.kt");

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

@@ -82,7 +82,9 @@ class ConstraintInjector(
 
             // it is important, that we add constraint here(not inside TypeCheckerContext), because inside incorporation we read constraints
             constraints.addConstraint(constraint)?.let {
-                constraintIncorporator.incorporate(typeCheckerContext, typeVariable, it)
+                if (!constraint.isNullabilityConstraint) {
+                    constraintIncorporator.incorporate(typeCheckerContext, typeVariable, it)
+                }
             }
         }
     }

compiler/testData/diagnostics/tests/inference/nothingType/discriminatedNothingInsideComplexNestedCall.fir.kt

@@ -0,0 +1,12 @@
+// !LANGUAGE: +NewInference
+// !DIAGNOSTICS: -UNUSED_PARAMETER
+
+fun expanded(maxCapacity: Int, newCapacity: Int, buffer: Array<Any?>) {
+    select(buffer.copyOf(newCapacity), toArray(arrayOfNulls(newCapacity)))
+}
+
+fun <K> select(x: K, y: K): K = x
+
+fun <T> Array<T>.copyOf(newSize: Int): Array<T?> = TODO()
+inline fun <reified V> arrayOfNulls(size: Int): Array<V?> = TODO()
+fun <S> toArray(array: Array<S>): Array<S> = TODO()

compiler/testData/diagnostics/tests/inference/nothingType/discriminatedNothingInsideComplexNestedCall.kt

@@ -0,0 +1,12 @@
+// !LANGUAGE: +NewInference
+// !DIAGNOSTICS: -UNUSED_PARAMETER
+
+fun expanded(maxCapacity: Int, newCapacity: Int, buffer: Array<Any?>) {
+    select(buffer.copyOf(newCapacity), toArray(arrayOfNulls(newCapacity)))
+}
+
+fun <K> select(x: K, y: K): K = x
+
+fun <T> Array<T>.copyOf(newSize: Int): Array<T?> = TODO()
+inline fun <reified V> arrayOfNulls(size: Int): Array<V?> = TODO()
+fun <S> toArray(array: Array<S>): Array<S> = TODO()

compiler/testData/diagnostics/tests/inference/nothingType/discriminatedNothingInsideComplexNestedCall.txt

@@ -0,0 +1,7 @@
+package
+
+public inline fun </*0*/ reified V> arrayOfNulls(/*0*/ size: kotlin.Int): kotlin.Array<V?>
+public fun expanded(/*0*/ maxCapacity: kotlin.Int, /*1*/ newCapacity: kotlin.Int, /*2*/ buffer: kotlin.Array<kotlin.Any?>): kotlin.Unit
+public fun </*0*/ K> select(/*0*/ x: K, /*1*/ y: K): K
+public fun </*0*/ S> toArray(/*0*/ array: kotlin.Array<S>): kotlin.Array<S>
+public fun </*0*/ T> kotlin.Array<T>.copyOf(/*0*/ newSize: kotlin.Int): kotlin.Array<T?>

compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java

@@ -10848,6 +10848,11 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                     runTest("compiler/testData/diagnostics/tests/inference/nothingType/discriminatedNothingAndSmartCast.kt");
                 }
 
+                @TestMetadata("discriminatedNothingInsideComplexNestedCall.kt")
+                public void testDiscriminatedNothingInsideComplexNestedCall() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/nothingType/discriminatedNothingInsideComplexNestedCall.kt");
+                }
+
                 @TestMetadata("generateConstraintWithInnerNothingType.kt")
                 public void testGenerateConstraintWithInnerNothingType() throws Exception {
                     runTest("compiler/testData/diagnostics/tests/inference/nothingType/generateConstraintWithInnerNothingType.kt");

compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java

@@ -10843,6 +10843,11 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                     runTest("compiler/testData/diagnostics/tests/inference/nothingType/discriminatedNothingAndSmartCast.kt");
                 }
 
+                @TestMetadata("discriminatedNothingInsideComplexNestedCall.kt")
+                public void testDiscriminatedNothingInsideComplexNestedCall() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/nothingType/discriminatedNothingInsideComplexNestedCall.kt");
+                }
+
                 @TestMetadata("generateConstraintWithInnerNothingType.kt")
                 public void testGenerateConstraintWithInnerNothingType() throws Exception {
                     runTest("compiler/testData/diagnostics/tests/inference/nothingType/generateConstraintWithInnerNothingType.kt");