K/N counterpart for:

Got rid of duplicates in resolveFakeOverrides implementations

(cherry picked from commit 69c6d99b38d6ca6e845a1167e1f8146a48fc1006)

Author: alexander-gorshenev

backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/DescriptorUtils.kt

@@ -6,11 +6,14 @@
 package org.jetbrains.kotlin.backend.konan.descriptors
 
 import org.jetbrains.kotlin.backend.common.atMostOne
-import org.jetbrains.kotlin.backend.konan.*
-import org.jetbrains.kotlin.backend.konan.ir.*
-import org.jetbrains.kotlin.backend.konan.isObjCClass
+import org.jetbrains.kotlin.backend.konan.KonanFqNames
+import org.jetbrains.kotlin.backend.konan.RuntimeNames
+import org.jetbrains.kotlin.backend.konan.binaryTypeIsReference
+import org.jetbrains.kotlin.backend.konan.ir.getSuperClassNotAny
+import org.jetbrains.kotlin.backend.konan.ir.getSuperInterfaces
+import org.jetbrains.kotlin.backend.konan.isInlinedNative
 import org.jetbrains.kotlin.backend.konan.llvm.longName
-import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
@@ -39,50 +42,6 @@ internal val IrClass.implementedInterfaces: List<IrClass>
                 superInterfaces).distinct()
     }
 
-
-/**
- * Implementation of given method.
- *
- * TODO: this method is actually a part of resolve and probably duplicates another one
- */
-internal fun IrSimpleFunction.resolveFakeOverride(allowAbstract: Boolean = false): IrSimpleFunction {
-    if (this.isReal) {
-        return this
-    }
-
-    val visited = mutableSetOf<IrSimpleFunction>()
-    val realSupers = mutableSetOf<IrSimpleFunction>()
-
-    fun findRealSupers(function: IrSimpleFunction) {
-        if (function in visited) return
-        visited += function
-        if (function.isReal) {
-            realSupers += function
-        } else {
-            function.overriddenSymbols.forEach { findRealSupers(it.owner) }
-        }
-    }
-
-    findRealSupers(this)
-
-    if (realSupers.size > 1) {
-        visited.clear()
-
-        fun excludeOverridden(function: IrSimpleFunction) {
-            if (function in visited) return
-            visited += function
-            function.overriddenSymbols.forEach {
-                realSupers.remove(it.owner)
-                excludeOverridden(it.owner)
-            }
-        }
-
-        realSupers.toList().forEach { excludeOverridden(it) }
-    }
-
-    return realSupers.first { allowAbstract || it.modality != Modality.ABSTRACT }
-}
-
 internal val IrFunction.isTypedIntrinsic: Boolean
     get() = annotations.hasAnnotation(KonanFqNames.typedIntrinsic)
 
@@ -143,16 +102,6 @@ private fun IrFunction.needBridgeToAt(target: IrFunction, index: Int)
 internal fun IrFunction.needBridgeTo(target: IrFunction)
         = (0..this.valueParameters.size + 2).any { needBridgeToAt(target, it) }
 
-internal val IrSimpleFunction.target: IrSimpleFunction
-    get() = (if (modality == Modality.ABSTRACT) this else resolveFakeOverride())
-
-internal val IrFunction.target: IrFunction
-    get() = when (this) {
-    is IrSimpleFunction -> this.target
-    is IrConstructor -> this
-    else -> error(this)
-}
-
 internal enum class BridgeDirection {
     NOT_NEEDED,
     FROM_VALUE_TYPE,

backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt

@@ -872,7 +872,7 @@ internal class FunctionGenerationContext(val function: LLVMValueRef,
 
     private fun IrSimpleFunction.findOverriddenMethodOfAny(): IrSimpleFunction? {
         if (modality == Modality.ABSTRACT) return null
-        val resolved = resolveFakeOverride()
+        val resolved = resolveFakeOverride()!!
         if ((resolved.parent as IrClass).isAny()) {
             return resolved
         }

backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/IrSerializationUtil.kt

@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.backend.konan.serialization
 import org.jetbrains.kotlin.backend.konan.descriptors.resolveFakeOverride
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.ir.declarations.*
+import org.jetbrains.kotlin.ir.util.resolveFakeOverride
 import org.jetbrains.kotlin.resolve.OverridingUtil
 
 // TODO: move me somewhere
@@ -28,7 +29,7 @@ import org.jetbrains.kotlin.resolve.OverridingUtil
  *
  * TODO: this method is actually a part of resolve and probably duplicates another one
  */
-internal fun IrSimpleFunction.resolveFakeOverrideMaybeAbstract() = this.resolveFakeOverride(allowAbstract = true)
+internal fun IrSimpleFunction.resolveFakeOverrideMaybeAbstract() = this.resolveFakeOverride(allowAbstract = true)!!
 
 internal fun IrProperty.resolveFakeOverrideMaybeAbstract() =
         this.getter!!.resolveFakeOverrideMaybeAbstract().correspondingPropertySymbol!!.owner