Optimize memory allocation.

Author: FilipDolnik

SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/kir/descriptor/cache/ExposedDescriptorsCache.kt

@@ -31,6 +31,7 @@ import org.jetbrains.kotlin.resolve.constants.ArrayValue
 import org.jetbrains.kotlin.resolve.constants.KClassValue
 import org.jetbrains.kotlin.resolve.descriptorUtil.firstArgument
 import org.jetbrains.kotlin.resolve.descriptorUtil.module
+import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
 
 // Based on ObjCExportTranslatorImpl and ObjCExportHeaderGenerator
 internal class ExposedDescriptorsCache(
@@ -79,18 +80,22 @@ internal class ExposedDescriptorsCache(
     }
 
     private fun exposePackageFragment(packageFragment: PackageFragmentDescriptor) {
-        val contributedDescriptors = packageFragment.getMemberScope().getContributedDescriptors()
+        val memberScope = packageFragment.getMemberScope()
 
-        contributedDescriptors
-            .filterIsInstance<CallableMemberDescriptor>()
+        memberScope
+            .getContributedDescriptors(kindFilter = DescriptorKindFilter.CALLABLES)
             .forEach {
-                exposeGlobalMemberOrExtension(it)
+                if (it is CallableMemberDescriptor) {
+                    exposeGlobalMemberOrExtension(it)
+                }
             }
 
-        contributedDescriptors
-            .filterIsInstance<ClassDescriptor>()
+        memberScope
+            .getContributedDescriptors(kindFilter = DescriptorKindFilter.CLASSIFIERS)
             .forEach {
-                exposeClassIncludingNestedClasses(it)
+                if (it is ClassDescriptor) {
+                    exposeClassIncludingNestedClasses(it)
+                }
             }
     }
 
@@ -139,9 +144,12 @@ internal class ExposedDescriptorsCache(
         exposeClass(classDescriptor)
 
         classDescriptor.unsubstitutedMemberScope
-            .getContributedDescriptors()
-            .filterIsInstance<ClassDescriptor>()
-            .forEach(::exposeClassIncludingNestedClasses)
+            .getContributedDescriptors(kindFilter = DescriptorKindFilter.CLASSIFIERS)
+            .forEach {
+                if (it is ClassDescriptor) {
+                    exposeClassIncludingNestedClasses(it)
+                }
+            }
     }
 
     private fun exposeClass(classDescriptor: ClassDescriptor) {
@@ -191,10 +199,11 @@ internal class ExposedDescriptorsCache(
         }
 
         classDescriptor.unsubstitutedMemberScope
-            .getContributedDescriptors()
-            .filterIsInstance<CallableMemberDescriptor>()
+            .getContributedDescriptors(kindFilter = DescriptorKindFilter.CALLABLES)
             .forEach {
-                exposeCallableMember(it, typeParameterScope)
+                if (it is CallableMemberDescriptor) {
+                    exposeCallableMember(it, typeParameterScope)
+                }
             }
 
         if (classDescriptor.kind.isEnumClass) {

SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/kir/util/FindAnnotationExtension.kt

@@ -10,24 +10,21 @@ import org.jetbrains.kotlin.resolve.constants.ArrayValue
 import org.jetbrains.kotlin.resolve.constants.ConstantValue
 import org.jetbrains.kotlin.resolve.constants.EnumValue
 import org.jetbrains.kotlin.resolve.constants.KClassValue
+import org.jetbrains.kotlin.resolve.descriptorUtil.annotationClass
 import kotlin.reflect.KClass
 import kotlin.reflect.KParameter
 
 inline fun <reified T : Annotation> Annotated.hasAnnotation(): Boolean =
     hasAnnotation(T::class)
 
-fun <T : Annotation> Annotated.hasAnnotation(annotation: KClass<T>): Boolean {
-    val annotationName = FqName(annotation.qualifiedName!!)
-
-    return this.annotations.hasAnnotation(annotationName)
-}
+fun <T : Annotation> Annotated.hasAnnotation(annotation: KClass<T>): Boolean =
+    this.annotations.any { it.fqName?.asString() == annotation.qualifiedName }
 
 inline fun <reified T : Annotation> Annotated.findAnnotation(): T? =
     findAnnotation(T::class)
 
 fun <T : Annotation> Annotated.findAnnotation(annotationClass: KClass<T>): T? {
-    val annotationName = FqName(annotationClass.qualifiedName!!)
-    val annotation = this.annotations.findAnnotation(annotationName) ?: return null
+    val annotation = this.annotations.firstOrNull { it.fqName?.asString() == annotationClass.qualifiedName } ?: return null
 
     val constructor = annotationClass.constructors.first()
 

SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/SkiePhaseScheduler.kt

@@ -176,7 +176,7 @@ class SkiePhaseScheduler {
             SwiftRuntimeGenerator,
             LoadCustomSwiftSourceFilesPhase,
 
-            RenameConflictingCallableDeclarationsPhase,
+            RenameConflictingCallableDeclarationsPhase(),
 
             // Features
 
@@ -209,7 +209,7 @@ class SkiePhaseScheduler {
             RenameTypesConflictsWithOtherTypesPhase,
             RenameCallableDeclarationsConflictingWithTypeDeclarationsPhase,
             RenameParametersNamedSelfPhase,
-            RenameConflictingCallableDeclarationsPhase,
+            RenameConflictingCallableDeclarationsPhase(),
             FixDuplicatedOverriddenFunctionsPhase,
             TemporarilyRenameTypesConflictingWithExternalModulesPhase,
             FixOirFunctionSignaturesForApiNotesPhase(context),

SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/memberconflicts/RenameConflictingCallableDeclarationsPhase.kt

@@ -18,7 +18,10 @@ import co.touchlab.skie.sir.element.module
 import co.touchlab.skie.sir.element.receiverDeclaration
 import co.touchlab.skie.sir.element.resolveAsSirClass
 
-object RenameConflictingCallableDeclarationsPhase : SirPhase {
+class RenameConflictingCallableDeclarationsPhase : SirPhase {
+
+    private val highestDistanceToInheritanceHierarchyRootCache = mutableMapOf<SirClass, Int>()
+    private val containerFqNameCache = mutableMapOf<SirDeclarationParent, String>()
 
     context(SirPhase.Context)
     override suspend fun execute() {
@@ -100,7 +103,7 @@ object RenameConflictingCallableDeclarationsPhase : SirPhase {
         get() = module is SirModule.Kotlin
 
     private val SirClass.highestDistanceToInheritanceHierarchyRoot: Int
-        get() {
+        get() = highestDistanceToInheritanceHierarchyRootCache.getOrPut(this) {
             val maxFromSuperTypes = superTypes.maxOfOrNull {
                 it.resolveAsSirClass()?.highestDistanceToInheritanceHierarchyRoot ?: Int.MAX_VALUE
             }
@@ -114,7 +117,9 @@ object RenameConflictingCallableDeclarationsPhase : SirPhase {
 
     @Suppress("RecursivePropertyAccessor")
     private val SirDeclarationParent.containerFqName: String
-        get() = (this.parent?.containerFqName ?: "") + this.toString()
+        get() = containerFqNameCache.getOrPut(this) {
+            (this.parent?.containerFqName ?: "") + this.toString()
+        }
 
     context(SirPhase.Context)
     private fun UniqueSignatureSet.addEnumCases(enumCases: List<SirEnumCase>) {

SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/sir/type/translation/SirTypeTranslator.kt

@@ -98,11 +98,14 @@ class SirTypeTranslator(
             isEscaping = isEscaping,
         )
 
+    // Optimization - prevents re-creating the lambda type argument mapper for every invocation
+    private val cachedMapTypeArgument = ::mapTypeArgument
+
     private fun mapType(oirType: DeclaredOirType): SirType =
         OirDeclaredSirType(
             declaration = oirType.declaration,
             typeArguments = oirType.typeArguments,
-            mapTypeArgument = ::mapTypeArgument,
+            mapTypeArgument = cachedMapTypeArgument,
         )
 
     private fun mapType(