FIR: Fix bare type case with flexible supertypes

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

@@ -3901,6 +3901,12 @@ public class DiagnosisCompilerFirTestdataTestGenerated extends AbstractDiagnosis
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/types"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
             }
 
+            @Test
+            @TestMetadata("bareWithFlexibleArg.kt")
+            public void testBareWithFlexibleArg() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/types/bareWithFlexibleArg.kt");
+            }
+
             @Test
             @TestMetadata("bareWithSubjectTypeAlias.kt")
             public void testBareWithSubjectTypeAlias() throws Exception {

compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/LazyBodyIsNotTouchedTilContractsPhaseTestGenerated.java

@@ -3496,6 +3496,11 @@ public class LazyBodyIsNotTouchedTilContractsPhaseTestGenerated extends Abstract
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/types"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
+        @TestMetadata("bareWithFlexibleArg.kt")
+        public void testBareWithFlexibleArg() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/types/bareWithFlexibleArg.kt");
+        }
+
         @TestMetadata("bareWithSubjectTypeAlias.kt")
         public void testBareWithSubjectTypeAlias() throws Exception {
             runTest("compiler/fir/analysis-tests/testData/resolve/types/bareWithSubjectTypeAlias.kt");

compiler/fir/analysis-tests/testData/resolve/types/bareWithFlexibleArg.fir.txt

@@ -0,0 +1,6 @@
+FILE: main.kt
+    public final fun foo(x: R|Promise<kotlin/String?>|): R|kotlin/Unit| {
+        R|/bar|((R|<local>/x| as R|CancellablePromise<kotlin/String?>|))
+    }
+    public final fun bar(x: R|CancellablePromise<kotlin/String?>|): R|kotlin/Unit| {
+    }

compiler/fir/analysis-tests/testData/resolve/types/bareWithFlexibleArg.kt

@@ -0,0 +1,15 @@
+// FIR_IDENTICAL
+// SKIP_TXT
+
+// FILE: Promise.java
+public interface Promise<T> {}
+
+// FILE: CancellablePromise.java
+public interface CancellablePromise<E> extends Promise<E> {}
+
+// FILE: main.kt
+fun foo(x: Promise<String?>) {
+    bar(x as CancellablePromise)
+}
+fun bar(x: CancellablePromise<String?>) {}
+

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

@@ -3901,6 +3901,12 @@ public class FirDiagnosticTestGenerated extends AbstractFirDiagnosticTest {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/types"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
             }
 
+            @Test
+            @TestMetadata("bareWithFlexibleArg.kt")
+            public void testBareWithFlexibleArg() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/types/bareWithFlexibleArg.kt");
+            }
+
             @Test
             @TestMetadata("bareWithSubjectTypeAlias.kt")
             public void testBareWithSubjectTypeAlias() throws Exception {

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

@@ -3901,6 +3901,12 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/types"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
             }
 
+            @Test
+            @TestMetadata("bareWithFlexibleArg.kt")
+            public void testBareWithFlexibleArg() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/types/bareWithFlexibleArg.kt");
+            }
+
             @Test
             @TestMetadata("bareWithSubjectTypeAlias.kt")
             public void testBareWithSubjectTypeAlias() throws Exception {

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/bareTypes.kt

@@ -97,7 +97,7 @@ private fun BodyResolveComponents.doUnify(
     }
 
     // Foo? ~ X?  =>  Foo ~ X
-    if (originalType?.nullability?.isNullable == true && typeWithParameters?.nullability?.isNullable == true) {
+    if (originalType?.nullability == ConeNullability.NULLABLE && typeWithParameters?.nullability == ConeNullability.NULLABLE) {
         return doUnify(
             originalTypeProjection.removeQuestionMark(session.typeContext),
             typeWithParametersProjection.removeQuestionMark(session.typeContext),
@@ -113,17 +113,14 @@ private fun BodyResolveComponents.doUnify(
 
     if (typeWithParameters is ConeFlexibleType) {
         return doUnify(
-            if (originalType?.nullability?.isNullable == true)
+            originalTypeProjection,
-                originalTypeProjection.removeQuestionMark(session.typeContext)
-            else
-                originalTypeProjection,
             typeWithParametersProjection.replaceType(typeWithParameters.lowerBound),
             targetTypeParameters, result,
         )
     }
 
     // Foo ~ X? => fail
-    if (originalType?.nullability?.isNullable != true && typeWithParameters?.nullability?.isNullable == true) {
+    if (originalType?.nullability != ConeNullability.NULLABLE && typeWithParameters?.nullability == ConeNullability.NULLABLE) {
         return true
     }