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

Cached symbolName building

Browse Source
This commit is contained in:
Igor Chevdar
2018-06-18 16:04:44 +03:00
parent 119e2ca37e
commit 3b8cb2a542
1 changed files with 7 additions and 4 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
+7 -4
View File
@@ -162,7 +162,7 @@ internal class ClassVtablesBuilder(val classDescriptor: ClassDescriptor, val con
filteredNewVtableSlots.forEach { println(" ${it.overriddenDescriptor.descriptor} -> ${it.descriptor.descriptor}") } filteredNewVtableSlots.forEach { println(" ${it.overriddenDescriptor.descriptor} -> ${it.descriptor.descriptor}") }
} }
inheritedVtableSlots + filteredNewVtableSlots.sortedBy { it.overriddenDescriptor.functionName.localHash.value } inheritedVtableSlots + filteredNewVtableSlots.sortedBy { it.overriddenDescriptor.uniqueId }
} }
fun vtableIndex(function: SimpleFunctionDescriptor): Int { fun vtableIndex(function: SimpleFunctionDescriptor): Int {
@@ -176,8 +176,8 @@ internal class ClassVtablesBuilder(val classDescriptor: ClassDescriptor, val con
classDescriptor.sortedOverridableOrOverridingMethods classDescriptor.sortedOverridableOrOverridingMethods
.flatMap { method -> method.allOverriddenDescriptors.map { OverriddenFunctionDescriptor(method, it) } } .flatMap { method -> method.allOverriddenDescriptors.map { OverriddenFunctionDescriptor(method, it) } }
.filter { it.canBeCalledVirtually } .filter { it.canBeCalledVirtually }
.distinctBy { Triple(it.overriddenDescriptor.functionName, it.descriptor, it.needBridge) } .distinctBy { Triple(it.overriddenDescriptor.uniqueId, it.descriptor, it.needBridge) }
.sortedBy { it.overriddenDescriptor.functionName.localHash.value } .sortedBy { it.overriddenDescriptor.uniqueId }
// TODO: probably method table should contain all accessible methods to improve binary compatibility // TODO: probably method table should contain all accessible methods to improve binary compatibility
} }
@@ -186,6 +186,9 @@ internal class ClassVtablesBuilder(val classDescriptor: ClassDescriptor, val con
this.simpleFunctions() this.simpleFunctions()
.filter { (it.isOverridable || it.overriddenSymbols.isNotEmpty()) .filter { (it.isOverridable || it.overriddenSymbols.isNotEmpty())
&& it.bridgeTarget == null } && it.bridgeTarget == null }
.sortedBy { it.functionName.localHash.value } .sortedBy { it.uniqueId }
private val functionIds = mutableMapOf<FunctionDescriptor, Long>()
private val FunctionDescriptor.uniqueId get() = functionIds.getOrPut(this) { functionName.localHash.value }
} }