From a52ae04aef0aed9ec99f09dec303eba0e1ef59de Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Tue, 6 Dec 2016 10:28:16 +0300
Subject: [PATCH] Fix fast-path check when selecting most specific members

Obviously 'overridableGroup' cannot be both empty and having the single element.
'conflictedHandles' that is what meant to be empty instead
---
 .../src/org/jetbrains/kotlin/resolve/overridingUtils.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/overridingUtils.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/overridingUtils.kt
index 089015cec2a..2ad26db6818 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/overridingUtils.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/overridingUtils.kt
@@ -61,7 +61,7 @@ fun <H : Any> Collection<H>.selectMostSpecificInEachOverridableGroup(
         val overridableGroup =
                 OverridingUtil.extractMembersOverridableInBothWays(nextHandle, queue, descriptorByHandle) { conflictedHandles.add(it) }
 
-        if (overridableGroup.size == 1 && overridableGroup.isEmpty()) {
+        if (overridableGroup.size == 1 && conflictedHandles.isEmpty()) {
             result.add(overridableGroup.single())
             continue
         }