From 9a151e1422516c1e41e85a5da67662f0213624ef Mon Sep 17 00:00:00 2001
From: pyos <pyos@google.com>
Date: Thu, 13 Oct 2022 12:44:56 +0200
Subject: [PATCH] Minor: remove unused FirOverrideService methods

---
 .../kotlin/fir/scopes/FirOverrideService.kt   | 50 -------------------
 1 file changed, 50 deletions(-)

diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/FirOverrideService.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/FirOverrideService.kt
index 6c8f039802c..416637fc997 100644
--- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/FirOverrideService.kt
+++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/FirOverrideService.kt
@@ -19,46 +19,9 @@ import org.jetbrains.kotlin.fir.types.ConeFlexibleType
 import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.typeContext
 import org.jetbrains.kotlin.types.AbstractTypeChecker
-import org.jetbrains.kotlin.utils.SmartSet
 import java.util.*
 
 class FirOverrideService(val session: FirSession) : FirSessionComponent {
-    fun <D : FirCallableSymbol<*>> selectMostSpecificInEachOverridableGroup(
-        members: Collection<MemberWithBaseScope<D>>,
-        overrideChecker: FirOverrideChecker,
-        returnTypeCalculator: ReturnTypeCalculator
-    ): Collection<MemberWithBaseScope<D>> {
-        if (members.size <= 1) return members
-        val queue = LinkedList(members)
-        val result = SmartSet.create<MemberWithBaseScope<D>>()
-
-        while (queue.isNotEmpty()) {
-            val nextHandle = queue.first()
-
-            val conflictedHandles = SmartSet.create<MemberWithBaseScope<D>>()
-
-            val overridableGroup = extractBothWaysOverridable(nextHandle, queue, overrideChecker)
-
-            if (overridableGroup.size == 1 && conflictedHandles.isEmpty()) {
-                result.add(overridableGroup.single())
-                continue
-            }
-
-            val mostSpecific = selectMostSpecificMember(overridableGroup, returnTypeCalculator)
-
-            overridableGroup.filterNotTo(conflictedHandles) {
-                isMoreSpecificOrEqual(mostSpecific, it, returnTypeCalculator)
-            }
-
-            if (conflictedHandles.isNotEmpty()) {
-                result.addAll(conflictedHandles)
-            }
-
-            result.add(mostSpecific)
-        }
-        return result
-    }
-
     fun <D : FirCallableSymbol<*>> createOverridableGroups(
         members: Collection<MemberWithBaseScope<D>>,
         overrideChecker: FirOverrideChecker
@@ -133,11 +96,6 @@ class FirOverrideService(val session: FirSession) : FirSessionComponent {
         return maximums.map { it.memberWithBaseScope }
     }
 
-    fun <D : FirCallableSymbol<*>> selectMostSpecificMember(
-        overridables: List<MemberWithBaseScope<D>>,
-        returnTypeCalculator: ReturnTypeCalculator
-    ): MemberWithBaseScope<D> = selectMostSpecificMembers(overridables, returnTypeCalculator).first()
-
     private fun <E> MutableList<E>.removeFlagged(flags: BooleanArray) {
         var dest = 0
         for (i in flags.indices) {
@@ -150,14 +108,6 @@ class FirOverrideService(val session: FirSession) : FirSessionComponent {
         }
     }
 
-    private fun isMoreSpecificOrEqual(
-        a: MemberWithBaseScope<*>,
-        b: MemberWithBaseScope<*>,
-        returnTypeCalculator: ReturnTypeCalculator
-    ) = MemberWithBaseScopeAndReturnType(a, returnTypeCalculator).compareTo(MemberWithBaseScopeAndReturnType(b, returnTypeCalculator)).let {
-        it != null && it >= 0
-    }
-
     private class MemberWithBaseScopeAndReturnType<out D : FirCallableSymbol<*>>(
         val memberWithBaseScope: MemberWithBaseScope<D>,
         returnTypeCalculator: ReturnTypeCalculator