From 57357d1995b90a311bc432a8d62d16be0b320484 Mon Sep 17 00:00:00 2001 From: Ivan Kochurkin Date: Tue, 12 Sep 2023 20:23:43 +0200 Subject: [PATCH] [FIR] Simplify filterOutActualizedExpectCandidates --- .../fir/resolve/calls/ConeOverloadConflictResolver.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConeOverloadConflictResolver.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConeOverloadConflictResolver.kt index 716bf6cae18..4ee3e7433a9 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConeOverloadConflictResolver.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConeOverloadConflictResolver.kt @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.fir.resolve.calls import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration -import org.jetbrains.kotlin.fir.declarations.getSingleExpectForActualOrNull import org.jetbrains.kotlin.fir.declarations.getSingleCompatibleOrWeaklyIncompatibleExpectForActualOrNull import org.jetbrains.kotlin.fir.declarations.utils.isActual import org.jetbrains.kotlin.fir.declarations.utils.isExpect @@ -291,10 +290,7 @@ class ConeOverloadConflictResolver( val expectForActualSymbols = candidates .mapNotNullTo(mutableSetOf()) { val callableSymbol = it.symbol as? FirCallableSymbol<*> ?: return@mapNotNullTo null - runIf(callableSymbol.isActual) { - callableSymbol.getSingleExpectForActualOrNull() - ?: callableSymbol.getSingleCompatibleOrWeaklyIncompatibleExpectForActualOrNull() - } + runIf(callableSymbol.isActual) { callableSymbol.getSingleCompatibleOrWeaklyIncompatibleExpectForActualOrNull() } } return if (expectForActualSymbols.isEmpty()) {