Discriminate overloading expect MemberDescriptors

Issue #KT-38298
2020-04-17 15:27:23 +07:00
parent 34ae35b2aa
commit 90e888a1b6
7 changed files with 56 additions and 23 deletions
@@ -125,11 +125,16 @@ fun findImplementationFromInterface(descriptor: CallableMemberDescriptor): Calla
 * The returned function should be called from TImpl-bridges generated for the given fake override.
 */
 fun firstSuperMethodFromKotlin(
-        descriptor: CallableMemberDescriptor,
-        implementation: CallableMemberDescriptor
+    descriptor: CallableMemberDescriptor,
+    implementation: CallableMemberDescriptor
 ): CallableMemberDescriptor? {
    return descriptor.overriddenDescriptors.firstOrNull { overridden ->
        overridden.modality != Modality.ABSTRACT &&
-        (overridden == implementation || OverridingUtil.overrides(overridden, implementation, overridden.module.isTypeRefinementEnabled()))
+                (overridden == implementation || OverridingUtil.overrides(
+                    overridden,
+                    implementation,
+                    overridden.module.isTypeRefinementEnabled(),
+                    true
+                ))
    }
 }