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

[Native] Move FORWARD_DECLARATION_ORIGIN into KonanForwardDeclarationModuleDeserializer

Browse Source
This commit is contained in:
Ivan Kylchik
2023-08-15 12:53:24 +02:00
committed by Space Team
parent cc906ad6d5
commit 66b9c2f260
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanForwardDeclarationModuleDeserializer.kt
+6 -1
View File
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.descriptors.findClassAcrossModuleDependencies import org.jetbrains.kotlin.descriptors.findClassAcrossModuleDependencies
import org.jetbrains.kotlin.ir.declarations.IrClass import org.jetbrains.kotlin.ir.declarations.IrClass
import org.jetbrains.kotlin.ir.declarations.IrDeclarationOriginImpl
import org.jetbrains.kotlin.ir.declarations.IrModuleFragment import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
import org.jetbrains.kotlin.ir.declarations.impl.IrModuleFragmentImpl import org.jetbrains.kotlin.ir.declarations.impl.IrModuleFragmentImpl
import org.jetbrains.kotlin.ir.symbols.IrSymbol import org.jetbrains.kotlin.ir.symbols.IrSymbol
@@ -34,6 +35,10 @@ internal class KonanForwardDeclarationModuleDeserializer(
require(moduleDescriptor.isForwardDeclarationModule) require(moduleDescriptor.isForwardDeclarationModule)
} }
companion object {
private val FORWARD_DECLARATION_ORIGIN = object : IrDeclarationOriginImpl("FORWARD_DECLARATION_ORIGIN") {}
}
private val declaredDeclaration = mutableMapOf<IdSignature, IrClass>() private val declaredDeclaration = mutableMapOf<IdSignature, IrClass>()
private fun IdSignature.isForwardDeclarationSignature(): Boolean { private fun IdSignature.isForwardDeclarationSignature(): Boolean {
@@ -54,7 +59,7 @@ internal class KonanForwardDeclarationModuleDeserializer(
private fun buildForwardDeclarationStub(descriptor: ClassDescriptor): IrClass { private fun buildForwardDeclarationStub(descriptor: ClassDescriptor): IrClass {
return stubGenerator.generateClassStub(descriptor).also { return stubGenerator.generateClassStub(descriptor).also {
it.origin = KonanIrLinker.FORWARD_DECLARATION_ORIGIN it.origin = FORWARD_DECLARATION_ORIGIN
} }
} }
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrLinker.kt
-5
View File
@@ -452,11 +452,6 @@ internal class KonanIrLinker(
private val libraryBeingCached: PartialCacheInfo?, private val libraryBeingCached: PartialCacheInfo?,
override val userVisibleIrModulesSupport: UserVisibleIrModulesSupport override val userVisibleIrModulesSupport: UserVisibleIrModulesSupport
) : KotlinIrLinker(currentModule, messageLogger, builtIns, symbolTable, exportedDependencies) { ) : KotlinIrLinker(currentModule, messageLogger, builtIns, symbolTable, exportedDependencies) {
companion object {
val FORWARD_DECLARATION_ORIGIN = object : IrDeclarationOriginImpl("FORWARD_DECLARATION_ORIGIN") {}
}
override fun isBuiltInModule(moduleDescriptor: ModuleDescriptor): Boolean = moduleDescriptor.isNativeStdlib() override fun isBuiltInModule(moduleDescriptor: ModuleDescriptor): Boolean = moduleDescriptor.isNativeStdlib()
private val forwardDeclarationDeserializer = forwardModuleDescriptor?.let { private val forwardDeclarationDeserializer = forwardModuleDescriptor?.let {