azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

default implementation of interface methods support

Browse Source
This commit is contained in:
Igor Chevdar
2017-02-16 18:16:12 +03:00
parent 7470acaeba
commit 5d004c06bf
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/ClassVtablesBuilder.kt
+4 -2
View File
@@ -47,13 +47,15 @@ internal class ClassVtablesBuilder(val classDescriptor: ClassDescriptor, val con
} else { } else {
if (!superMethod.trivialOverride()) if (!superMethod.trivialOverride())
newVtableSlots.add(OverriddenFunctionDescriptor(overridingMethod, superMethod.descriptor)) newVtableSlots.add(OverriddenFunctionDescriptor(overridingMethod, superMethod.descriptor))
// Overriding method is defined in the current class and is not inherited - take it as is.
newVtableSlots.add(OverriddenFunctionDescriptor(overridingMethod, overridingMethod)) newVtableSlots.add(OverriddenFunctionDescriptor(overridingMethod, overridingMethod))
OverriddenFunctionDescriptor(overridingMethod, superMethod.overriddenDescriptor) OverriddenFunctionDescriptor(overridingMethod, superMethod.overriddenDescriptor)
} }
} }
methods.filterNot { method -> inheritedVtableSlots.any { it.descriptor == method } } // Find newly defined methods. methods.filterNot { method -> inheritedVtableSlots.any { it.descriptor == method } } // Find newly defined methods.
.mapTo(newVtableSlots) { OverriddenFunctionDescriptor(it, it) } // Select target because method might be taken from default implementation of interface.
.mapTo(newVtableSlots) { OverriddenFunctionDescriptor(it, it.target) }
val list = inheritedVtableSlots + newVtableSlots.filter { it.descriptor.isOverridable }.sortedBy { val list = inheritedVtableSlots + newVtableSlots.filter { it.descriptor.isOverridable }.sortedBy {
it.overriddenDescriptor.functionName.localHash.value it.overriddenDescriptor.functionName.localHash.value
@@ -64,7 +66,7 @@ internal class ClassVtablesBuilder(val classDescriptor: ClassDescriptor, val con
fun vtableIndex(function: FunctionDescriptor): Int { fun vtableIndex(function: FunctionDescriptor): Int {
val target = function.target val target = function.target
val index = vtableEntries.indexOfFirst { it.overriddenDescriptor == target } val index = vtableEntries.indexOfFirst { it.overriddenDescriptor == target }
if (index < 0) throw Error(function.toString() + " not in vtable of " + this.toString()) if (index < 0) throw Error(function.toString() + " not in vtable of " + classDescriptor.toString())
return index return index
} }