[IR] Optimize a few hot spots to reduce total CPU time

^KT-61121
This commit is contained in:
Mark Mann
2023-08-09 18:35:45 +02:00
committed by Space Team
parent 83a70ddf8b
commit 8a31e2ed82
12 changed files with 53 additions and 30 deletions
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.library.KotlinLibrary
import org.jetbrains.kotlin.library.metadata.*
import org.jetbrains.kotlin.library.unresolvedDependencies
import org.jetbrains.kotlin.library.hasDependencies
import org.jetbrains.kotlin.name.NativeForwardDeclarationKind
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.name.parentOrNull
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.serialization.deserialization.*
import org.jetbrains.kotlin.storage.StorageManager
private val ModuleDescriptorImpl.isStdlibModule
get() = (this.klibModuleOrigin as? DeserializedKlibModuleOrigin)?.library?.unresolvedDependencies?.isEmpty() ?: false
get() = (this.klibModuleOrigin as? DeserializedKlibModuleOrigin)?.library?.let { !it.hasDependencies } ?: false
class KlibMetadataModuleDescriptorFactoryImpl(
override val descriptorFactory: KlibModuleDescriptorFactory,
@@ -91,18 +91,23 @@ class KlibResolvedModuleDescriptorsFactoryImpl(
)
// Set inter-dependencies between module descriptors, add forwarding declarations module.
val additionalDependencyModulesCopy = additionalDependencyModules.toSet()
val friendsForNonIncludedModule = additionalDependencyModulesCopy
val friendsForIncludedModule = buildSet<ModuleDescriptorImpl> {
this += friendsForNonIncludedModule
this += friendModuleDescriptors
this += refinesModuleDescriptors
}
val allDependencies = moduleDescriptors + additionalDependencyModulesCopy + forwardDeclarationsModule
for (module in moduleDescriptors) {
val friends = additionalDependencyModules.toMutableSet()
if (module in includedLibraryDescriptors) {
friends.addAll(friendModuleDescriptors)
friends.addAll(refinesModuleDescriptors)
val friends = if (module in includedLibraryDescriptors) {
friendsForIncludedModule
} else {
friendsForNonIncludedModule
}
module.setDependencies(
// Yes, just to all of them.
moduleDescriptors + additionalDependencyModules + forwardDeclarationsModule,
friends
)
// Yes, just to all of them.
module.setDependencies(allDependencies, friends)
}
return KotlinResolvedModuleDescriptors(