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

[Commonizer] Speed-up serialization of commonized member scopes

Browse Source
This commit is contained in:
Dmitriy Dolovov
2020-06-10 16:01:47 +07:00
parent 974e01ec70
commit 84a4644490
1 changed files with 63 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedMemberScope.kt
+63 -26
View File
@@ -5,42 +5,74 @@
package org.jetbrains.kotlin.descriptors.commonizer.builder
import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.PropertyDescriptor
import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.incremental.components.LookupLocation
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.resolve.scopes.MemberScopeImpl
import org.jetbrains.kotlin.resolve.scopes.MemberScope
import org.jetbrains.kotlin.utils.Printer
class CommonizedMemberScope : MemberScopeImpl() {
private val members = ArrayList<DeclarationDescriptor>()
class CommonizedMemberScope : MemberScope {
private val functions = HashMap<Name, MutableList<SimpleFunctionDescriptor>>()
private val variables = HashMap<Name, MutableList<PropertyDescriptor>>()
private val classifiers = HashMap<Name, ClassifierDescriptorWithTypeParameters>()
operator fun plusAssign(member: DeclarationDescriptor) {
this.members += member
private fun addMember(member: DeclarationDescriptor) {
when (member) {
is SimpleFunctionDescriptor -> functions.computeIfAbsent(member.name) { ArrayList(INITIAL_CAPACITY_FOR_CALLABLES) } += member
is PropertyDescriptor -> variables.computeIfAbsent(member.name) { ArrayList(INITIAL_CAPACITY_FOR_CALLABLES) } += member
is ClassifierDescriptorWithTypeParameters -> classifiers[member.name] = member
else -> error("Unsupported member type: ${member::class.java}, $member")
}
}
override fun getContributedClassifier(name: Name, location: LookupLocation): ClassifierDescriptor? =
members.filteredBy<ClassifierDescriptor>(name).firstOrNull()
override fun getContributedVariables(name: Name, location: LookupLocation): Collection<PropertyDescriptor> =
members.filteredBy<PropertyDescriptor>(name).toList()
override fun getFunctionNames(): Set<Name> = functions.keys
override fun getVariableNames(): Set<Name> = variables.keys
override fun getClassifierNames(): Set<Name> = classifiers.keys
override fun getContributedFunctions(name: Name, location: LookupLocation): Collection<SimpleFunctionDescriptor> =
members.filteredBy<SimpleFunctionDescriptor>(name).toList()
functions[name].orEmpty()
override fun getContributedVariables(name: Name, location: LookupLocation): Collection<PropertyDescriptor> =
variables[name].orEmpty()
override fun getContributedClassifier(name: Name, location: LookupLocation): ClassifierDescriptor? =
classifiers[name]
override fun getContributedDescriptors(
kindFilter: DescriptorKindFilter,
nameFilter: (Name) -> Boolean
): Collection<DeclarationDescriptor> = members.filter { kindFilter.accepts(it) && nameFilter(it.name) }
): Collection<DeclarationDescriptor> {
val result = ArrayList<DeclarationDescriptor>(INITIAL_CAPACITY_FOR_CONTRIBUTED_DESCRIPTORS)
if (kindFilter.acceptsKinds(DescriptorKindFilter.CLASSIFIERS_MASK)) {
classifiers.values.filterTo(result) { nameFilter(it.name) }
}
if (kindFilter.acceptsKinds(DescriptorKindFilter.FUNCTIONS_MASK)) {
functions.forEach { (name, callables) ->
if (nameFilter(name))
result.addAll(callables)
}
}
if (kindFilter.acceptsKinds(DescriptorKindFilter.VARIABLES_MASK)) {
variables.forEach { (name, callables) ->
if (nameFilter(name))
result.addAll(callables)
}
}
return result
}
override fun printScopeStructure(p: Printer) {
p.println(this::class.java.simpleName, " {")
p.pushIndent()
p.println("declarations = $members")
p.println("functions = $functions")
p.println("variables = $variables")
p.println("classifiers = $classifiers")
p.popIndent()
p.println("}")
@@ -51,21 +83,26 @@ class CommonizedMemberScope : MemberScopeImpl() {
operator fun Array<CommonizedMemberScope>.plusAssign(members: List<DeclarationDescriptor?>) {
members.forEachIndexed { index, member ->
if (member != null) {
this[index] += member
}
if (member != null)
this[index].addMember(member)
}
}
operator fun List<CommonizedMemberScope?>.plusAssign(members: List<DeclarationDescriptor?>) {
members.forEachIndexed { index, member ->
if (member != null) {
this[index]?.run { this += member }
}
if (member != null)
this[index]?.addMember(member)
}
}
// Heuristic memory usage optimization. During commonization of ios_x64 and ios_arm64 only about 3% of functions are overloaded
// (and therefore have the same name in the same scope). For the remaining 97% the capacity of 1 is enough.
private const val INITIAL_CAPACITY_FOR_CALLABLES = 1
// Heuristic memory usage optimization. During commonization of ios_x64 and ios_arm64 the getContributedDescriptors() call
// returns empty list in 27% times and list of size 1 in 63% times. The default capacity of 0 looks reasonable.
private const val INITIAL_CAPACITY_FOR_CONTRIBUTED_DESCRIPTORS = 0
internal val STATS = HashMap<Int, Int>()
}
}
private inline fun <reified T : DeclarationDescriptor> List<*>.filteredBy(name: Name): Sequence<T> =
this.asSequence().filterIsInstance<T>().filter { it.name == name }