[FE] Make OverloadChecker take CR into account

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

@@ -10600,6 +10600,18 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
                     runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.kt");
                 }
 
+                @Test
+                @TestMetadata("conflicting.kt")
+                public void testConflicting() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/conflicting.kt");
+                }
+
+                @Test
+                @TestMetadata("conflictingWithDifferentOrder.kt")
+                public void testConflictingWithDifferentOrder() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/conflictingWithDifferentOrder.kt");
+                }
+
                 @Test
                 @TestMetadata("contextKeywordWithElvis.kt")
                 public void testContextKeywordWithElvis() throws Exception {
@@ -10684,6 +10696,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
                     runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/noLabelsByClassName.kt");
                 }
 
+                @Test
+                @TestMetadata("nonConflicting.kt")
+                public void testNonConflicting() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/nonConflicting.kt");
+                }
+
                 @Test
                 @TestMetadata("outerClass.kt")
                 public void testOuterClass() throws Exception {

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

@@ -10600,6 +10600,18 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
                     runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.kt");
                 }
 
+                @Test
+                @TestMetadata("conflicting.kt")
+                public void testConflicting() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/conflicting.kt");
+                }
+
+                @Test
+                @TestMetadata("conflictingWithDifferentOrder.kt")
+                public void testConflictingWithDifferentOrder() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/conflictingWithDifferentOrder.kt");
+                }
+
                 @Test
                 @TestMetadata("contextKeywordWithElvis.kt")
                 public void testContextKeywordWithElvis() throws Exception {
@@ -10684,6 +10696,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
                     runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/noLabelsByClassName.kt");
                 }
 
+                @Test
+                @TestMetadata("nonConflicting.kt")
+                public void testNonConflicting() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/nonConflicting.kt");
+                }
+
                 @Test
                 @TestMetadata("outerClass.kt")
                 public void testOuterClass() throws Exception {

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

@@ -10600,6 +10600,18 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
                     runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.kt");
                 }
 
+                @Test
+                @TestMetadata("conflicting.kt")
+                public void testConflicting() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/conflicting.kt");
+                }
+
+                @Test
+                @TestMetadata("conflictingWithDifferentOrder.kt")
+                public void testConflictingWithDifferentOrder() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/conflictingWithDifferentOrder.kt");
+                }
+
                 @Test
                 @TestMetadata("contextKeywordWithElvis.kt")
                 public void testContextKeywordWithElvis() throws Exception {
@@ -10684,6 +10696,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
                     runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/noLabelsByClassName.kt");
                 }
 
+                @Test
+                @TestMetadata("nonConflicting.kt")
+                public void testNonConflicting() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/nonConflicting.kt");
+                }
+
                 @Test
                 @TestMetadata("outerClass.kt")
                 public void testOuterClass() throws Exception {

compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/results/FlatSignature.kt

@@ -66,11 +66,19 @@ private fun <T> SimpleConstraintSystem.isValueParameterTypeNotLessSpecific(
 ): Boolean {
     val typeParameters = general.typeParameters
     val typeSubstitutor = registerTypeVariables(typeParameters)
-    val valueParamsWithoutContextReceivers =
-        specific.valueParameterTypes.drop(specific.contextReceiverCount).map(typeKindSelector)
-            .zip(general.valueParameterTypes.drop(general.contextReceiverCount).map(typeKindSelector))
 
-    for ((specificType, generalType) in valueParamsWithoutContextReceivers) {
+    val specificContextReceiverCount = specific.contextReceiverCount
+    val generalContextReceiverCount = general.contextReceiverCount
+
+    var specificValueParameterTypes = specific.valueParameterTypes
+    var generalValueParameterTypes = general.valueParameterTypes
+    if (specificContextReceiverCount != generalContextReceiverCount) {
+        specificValueParameterTypes = specificValueParameterTypes.drop(specificContextReceiverCount)
+        generalValueParameterTypes = generalValueParameterTypes.drop(generalContextReceiverCount)
+    }
+    val valueParameters = specificValueParameterTypes.map(typeKindSelector).zip(generalValueParameterTypes.map(typeKindSelector))
+
+    for ((specificType, generalType) in valueParameters) {
         if (specificType == null || generalType == null) continue
 
         if (specificityComparator.isDefinitelyLessSpecific(specificType, generalType)) {

compiler/testData/diagnostics/tests/extensions/contextReceivers/conflicting.fir.kt

@@ -0,0 +1,18 @@
+// !LANGUAGE: +ContextReceivers
+
+interface A
+interface B
+
+<!CONFLICTING_OVERLOADS!>context(A, B)
+fun f(): Unit<!> = TODO()
+
+<!CONFLICTING_OVERLOADS!>context(A, B)
+fun f(): Unit<!> = TODO()
+
+fun test(a: A, b: B) {
+    with(a) {
+        with(b) {
+            f()
+        }
+    }
+}

compiler/testData/diagnostics/tests/extensions/contextReceivers/conflicting.kt

@@ -0,0 +1,18 @@
+// !LANGUAGE: +ContextReceivers
+
+interface A
+interface B
+
+<!CONFLICTING_OVERLOADS!>context(A, B)
+fun f(): Unit<!> = TODO()
+
+<!CONFLICTING_OVERLOADS!>context(A, B)
+fun f(): Unit<!> = TODO()
+
+fun test(a: A, b: B) {
+    with(a) {
+        with(b) {
+            <!OVERLOAD_RESOLUTION_AMBIGUITY!>f<!>()
+        }
+    }
+}

compiler/testData/diagnostics/tests/extensions/contextReceivers/conflicting.txt

@@ -0,0 +1,17 @@
+package
+
+context(A, B) public fun f(): kotlin.Unit
+context(A, B) public fun f(): kotlin.Unit
+public fun test(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
+
+public interface A {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public interface B {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/diagnostics/tests/extensions/contextReceivers/conflictingWithDifferentOrder.fir.kt

@@ -0,0 +1,18 @@
+// !LANGUAGE: +ContextReceivers
+
+interface A
+interface B
+
+<!CONFLICTING_OVERLOADS!>context(A, B)
+fun f(): Unit<!> = TODO()
+
+<!CONFLICTING_OVERLOADS!>context(B, A)
+fun f(): Unit<!> = TODO()
+
+fun test(a: A, b: B) {
+    with(a) {
+        with(b) {
+            f()
+        }
+    }
+}

compiler/testData/diagnostics/tests/extensions/contextReceivers/conflictingWithDifferentOrder.kt

@@ -0,0 +1,18 @@
+// !LANGUAGE: +ContextReceivers
+
+interface A
+interface B
+
+context(A, B)
+fun f(): Unit = TODO()
+
+context(B, A)
+fun f(): Unit = TODO()
+
+fun test(a: A, b: B) {
+    with(a) {
+        with(b) {
+            <!OVERLOAD_RESOLUTION_AMBIGUITY!>f<!>()
+        }
+    }
+}

compiler/testData/diagnostics/tests/extensions/contextReceivers/conflictingWithDifferentOrder.txt

@@ -0,0 +1,17 @@
+package
+
+context(A, B) public fun f(): kotlin.Unit
+context(B, A) public fun f(): kotlin.Unit
+public fun test(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
+
+public interface A {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public interface B {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/diagnostics/tests/extensions/contextReceivers/nonConflicting.fir.kt

@@ -0,0 +1,20 @@
+// !LANGUAGE: +ContextReceivers
+
+interface A
+interface B
+interface C
+interface D
+
+<!CONFLICTING_OVERLOADS!>context(A, B)
+fun f(): Unit<!> = TODO()
+
+<!CONFLICTING_OVERLOADS!>context(C, D)
+fun f(): Unit<!> = TODO()
+
+fun test(a: A, b: B) {
+    with(a) {
+        with(b) {
+            f()
+        }
+    }
+}

compiler/testData/diagnostics/tests/extensions/contextReceivers/nonConflicting.kt

@@ -0,0 +1,20 @@
+// !LANGUAGE: +ContextReceivers
+
+interface A
+interface B
+interface C
+interface D
+
+context(A, B)
+fun f(): Unit = TODO()
+
+context(C, D)
+fun f(): Unit = TODO()
+
+fun test(a: A, b: B) {
+    with(a) {
+        with(b) {
+            f()
+        }
+    }
+}

compiler/testData/diagnostics/tests/extensions/contextReceivers/nonConflicting.txt

@@ -0,0 +1,29 @@
+package
+
+context(A, B) public fun f(): kotlin.Unit
+context(C, D) public fun f(): kotlin.Unit
+public fun test(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
+
+public interface A {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public interface B {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public interface C {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public interface D {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

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

@@ -10606,6 +10606,18 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                     runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.kt");
                 }
 
+                @Test
+                @TestMetadata("conflicting.kt")
+                public void testConflicting() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/conflicting.kt");
+                }
+
+                @Test
+                @TestMetadata("conflictingWithDifferentOrder.kt")
+                public void testConflictingWithDifferentOrder() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/conflictingWithDifferentOrder.kt");
+                }
+
                 @Test
                 @TestMetadata("contextKeywordWithElvis.kt")
                 public void testContextKeywordWithElvis() throws Exception {
@@ -10690,6 +10702,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                     runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/noLabelsByClassName.kt");
                 }
 
+                @Test
+                @TestMetadata("nonConflicting.kt")
+                public void testNonConflicting() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/nonConflicting.kt");
+                }
+
                 @Test
                 @TestMetadata("outerClass.kt")
                 public void testOuterClass() throws Exception {