From 481607df431a8b4634f6a664491b1f804f7381b0 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Mon, 20 Jun 2022 11:09:32 +0200
Subject: [PATCH] FIR: support proper argument mapping for substitution
 overrides

Related to KT-52762
---
 .../kotlin/fir/resolve/calls/FirArgumentsToParametersMapper.kt | 3 +--
 .../namedArguments/ambiguousNamedArgumentsWithGenerics3.fir.kt | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirArgumentsToParametersMapper.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirArgumentsToParametersMapper.kt
index 1191fee52c4..df0cc066c9d 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirArgumentsToParametersMapper.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirArgumentsToParametersMapper.kt
@@ -383,8 +383,7 @@ private class FirCallArgumentsProcessor(
                 addDiagnostic(NameNotFound(argument, function))
             }
         } else {
-            // TODO: should we check also substitution overrides? Performance!
-            if (symbol != null && function.isIntersectionOverride) {
+            if (symbol != null && function.isSubstitutionOrIntersectionOverride) {
                 matchedIndex = parameters.indexOfFirst { originalParameter ->
                     originalParameter.name == argument.name
                 }
diff --git a/compiler/testData/diagnostics/tests/namedArguments/ambiguousNamedArgumentsWithGenerics3.fir.kt b/compiler/testData/diagnostics/tests/namedArguments/ambiguousNamedArgumentsWithGenerics3.fir.kt
index 6741520e6b2..3aa1bcfcb20 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/ambiguousNamedArgumentsWithGenerics3.fir.kt
+++ b/compiler/testData/diagnostics/tests/namedArguments/ambiguousNamedArgumentsWithGenerics3.fir.kt
@@ -10,6 +10,6 @@ interface C<U> : A<U>, B<U> { // Warning here, this is correct
 }
 
 fun test(c: C<Int>) {
-    c.foo(a = 1)
+    c.foo(<!NAME_FOR_AMBIGUOUS_PARAMETER!>a<!> = 1)
     c.foo(<!NAME_FOR_AMBIGUOUS_PARAMETER!>b<!> = 1)
 }