[Native] Move KonanInteropModuleDeserializer to a separate file

2023-08-15 12:38:24 +02:00
parent 6d0b936639
commit 701dc72f70
2 changed files with 96 additions and 63 deletions
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.konan.serialization
+
+import org.jetbrains.kotlin.backend.common.serialization.DescriptorByIdSignatureFinderImpl
+import org.jetbrains.kotlin.backend.common.serialization.IrModuleDeserializer
+import org.jetbrains.kotlin.backend.common.serialization.IrModuleDeserializerKind
+import org.jetbrains.kotlin.backend.common.serialization.encodings.BinarySymbolData
+import org.jetbrains.kotlin.backend.konan.descriptors.findPackage
+import org.jetbrains.kotlin.backend.konan.descriptors.isInteropLibrary
+import org.jetbrains.kotlin.backend.konan.ir.interop.IrProviderForCEnumAndCStructStubs
+import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.descriptors.ModuleDescriptor
+import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
+import org.jetbrains.kotlin.ir.IrBuiltIns
+import org.jetbrains.kotlin.ir.declarations.IrFile
+import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
+import org.jetbrains.kotlin.ir.declarations.IrSymbolOwner
+import org.jetbrains.kotlin.ir.declarations.impl.IrFileImpl
+import org.jetbrains.kotlin.ir.declarations.impl.IrModuleFragmentImpl
+import org.jetbrains.kotlin.ir.symbols.IrSymbol
+import org.jetbrains.kotlin.ir.util.DeclarationStubGenerator
+import org.jetbrains.kotlin.ir.util.IdSignature
+import org.jetbrains.kotlin.ir.util.NaiveSourceBasedFileEntryImpl
+import org.jetbrains.kotlin.library.KotlinAbiVersion
+import org.jetbrains.kotlin.library.KotlinLibrary
+
+internal class KonanInteropModuleDeserializer(
+    moduleDescriptor: ModuleDescriptor,
+    override val klib: KotlinLibrary,
+    override val moduleDependencies: Collection<IrModuleDeserializer>,
+    private val isLibraryCached: Boolean,
+    private val cenumsProvider: IrProviderForCEnumAndCStructStubs,
+    private val stubGenerator: DeclarationStubGenerator,
+    private val builtIns: IrBuiltIns,
+) : IrModuleDeserializer(moduleDescriptor, klib.versions.abiVersion ?: KotlinAbiVersion.CURRENT) {
+    init {
+        require(klib.isInteropLibrary())
+    }
+
+    private val descriptorByIdSignatureFinder = DescriptorByIdSignatureFinderImpl(
+        moduleDescriptor, KonanManglerDesc,
+        DescriptorByIdSignatureFinderImpl.LookupMode.MODULE_ONLY
+    )
+
+    private fun IdSignature.isInteropSignature() = IdSignature.Flags.IS_NATIVE_INTEROP_LIBRARY.test()
+
+    override fun contains(idSig: IdSignature): Boolean {
+        if (idSig.isPubliclyVisible) {
+            if (idSig.isInteropSignature()) {
+                // TODO: add descriptor cache??
+                return descriptorByIdSignatureFinder.findDescriptorBySignature(idSig) != null
+            }
+        }
+
+        return false
+    }
+
+    private fun DeclarationDescriptor.isCEnumsOrCStruct(): Boolean = cenumsProvider.isCEnumOrCStruct(this)
+
+    private val fileMap = mutableMapOf<PackageFragmentDescriptor, IrFile>()
+
+    private fun getIrFile(packageFragment: PackageFragmentDescriptor): IrFile = fileMap.getOrPut(packageFragment) {
+        IrFileImpl(
+            NaiveSourceBasedFileEntryImpl(IrProviderForCEnumAndCStructStubs.cTypeDefinitionsFileName),
+            packageFragment,
+            moduleFragment
+        ).also {
+            moduleFragment.files.add(it)
+        }
+    }
+
+    private fun resolveCEnumsOrStruct(descriptor: DeclarationDescriptor, idSig: IdSignature, symbolKind: BinarySymbolData.SymbolKind): IrSymbol {
+        val file = getIrFile(descriptor.findPackage())
+        return cenumsProvider.getDeclaration(descriptor, idSig, file, symbolKind).symbol
+    }
+
+    override fun tryDeserializeIrSymbol(idSig: IdSignature, symbolKind: BinarySymbolData.SymbolKind): IrSymbol? {
+        val descriptor = descriptorByIdSignatureFinder.findDescriptorBySignature(idSig) ?: return null
+        // If library is cached we don't need to create an IrClass for struct or enum.
+        if (!isLibraryCached && descriptor.isCEnumsOrCStruct()) return resolveCEnumsOrStruct(descriptor, idSig, symbolKind)
+
+        val symbolOwner = stubGenerator.generateMemberStub(descriptor) as IrSymbolOwner
+
+        return symbolOwner.symbol
+    }
+
+    override fun deserializedSymbolNotFound(idSig: IdSignature): Nothing = error("No descriptor found for $idSig")
+
+    override val moduleFragment: IrModuleFragment = IrModuleFragmentImpl(moduleDescriptor, builtIns)
+
+    override val kind get() = IrModuleDeserializerKind.DESERIALIZED
+}
@@ -557,69 +557,6 @@ internal class KonanIrLinker(
        else -> error("Unknown package fragment kind ${packageFragment::class.java}")
    }

-    private class KonanInteropModuleDeserializer(
-            moduleDescriptor: ModuleDescriptor,
-            override val klib: KotlinLibrary,
-            override val moduleDependencies: Collection<IrModuleDeserializer>,
-            private val isLibraryCached: Boolean,
-            private val cenumsProvider: IrProviderForCEnumAndCStructStubs,
-            private val stubGenerator: DeclarationStubGenerator,
-            private val builtIns: IrBuiltIns,
-    ) : IrModuleDeserializer(moduleDescriptor, klib.versions.abiVersion ?: KotlinAbiVersion.CURRENT) {
-        init {
-            require(klib.isInteropLibrary())
-        }
-
-        private val descriptorByIdSignatureFinder = DescriptorByIdSignatureFinderImpl(
-                moduleDescriptor, KonanManglerDesc,
-                DescriptorByIdSignatureFinderImpl.LookupMode.MODULE_ONLY
-        )
-
-        private fun IdSignature.isInteropSignature() = IdSignature.Flags.IS_NATIVE_INTEROP_LIBRARY.test()
-
-        override fun contains(idSig: IdSignature): Boolean {
-            if (idSig.isPubliclyVisible) {
-                if (idSig.isInteropSignature()) {
-                    // TODO: add descriptor cache??
-                    return descriptorByIdSignatureFinder.findDescriptorBySignature(idSig) != null
-                }
-            }
-
-            return false
-        }
-
-        private fun DeclarationDescriptor.isCEnumsOrCStruct(): Boolean = cenumsProvider.isCEnumOrCStruct(this)
-
-        private val fileMap = mutableMapOf<PackageFragmentDescriptor, IrFile>()
-
-        private fun getIrFile(packageFragment: PackageFragmentDescriptor): IrFile = fileMap.getOrPut(packageFragment) {
-            IrFileImpl(NaiveSourceBasedFileEntryImpl(IrProviderForCEnumAndCStructStubs.cTypeDefinitionsFileName), packageFragment, moduleFragment).also {
-                moduleFragment.files.add(it)
-            }
-        }
-
-        private fun resolveCEnumsOrStruct(descriptor: DeclarationDescriptor, idSig: IdSignature, symbolKind: BinarySymbolData.SymbolKind): IrSymbol {
-            val file = getIrFile(descriptor.findPackage())
-            return cenumsProvider.getDeclaration(descriptor, idSig, file, symbolKind).symbol
-        }
-
-        override fun tryDeserializeIrSymbol(idSig: IdSignature, symbolKind: BinarySymbolData.SymbolKind): IrSymbol? {
-            val descriptor = descriptorByIdSignatureFinder.findDescriptorBySignature(idSig) ?: return null
-            // If library is cached we don't need to create an IrClass for struct or enum.
-            if (!isLibraryCached && descriptor.isCEnumsOrCStruct()) return resolveCEnumsOrStruct(descriptor, idSig, symbolKind)
-
-            val symbolOwner = stubGenerator.generateMemberStub(descriptor) as IrSymbolOwner
-
-            return symbolOwner.symbol
-        }
-
-        override fun deserializedSymbolNotFound(idSig: IdSignature): Nothing = error("No descriptor found for $idSig")
-
-        override val moduleFragment: IrModuleFragment = IrModuleFragmentImpl(moduleDescriptor, builtIns)
-
-        override val kind get() = IrModuleDeserializerKind.DESERIALIZED
-    }
-
    private inner class KonanForwardDeclarationModuleDeserializer(moduleDescriptor: ModuleDescriptor) : IrModuleDeserializer(moduleDescriptor, KotlinAbiVersion.CURRENT) {
        init {
            require(moduleDescriptor.isForwardDeclarationModule)