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

[IR] IrModuleDeserializerKind API cleanup

Browse Source 
Related to #KT-50591
This commit is contained in:
Dmitriy Dolovov
2022-01-11 22:24:04 +03:00
parent 54cca88279
commit 99300bd885
8 changed files with 17 additions and 17 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/KonanIrlinker.kt
+3 -3
View File
@@ -611,7 +611,7 @@ internal class KonanIrLinker(
override val moduleFragment: IrModuleFragment = KonanIrModuleFragmentImpl(moduleDescriptor, builtIns)
override val moduleDependencies: Collection<IrModuleDeserializer> = listOfNotNull(forwardDeclarationDeserializer)
override val origin get() = IrModuleOrigin.DESERIALIZED
override val kind get() = IrModuleDeserializerKind.DESERIALIZED
}
inner class KonanCachedLibraryModuleDeserializer(
@@ -845,7 +845,7 @@ internal class KonanIrLinker(
}
}
override val origin get() = IrModuleOrigin.DESERIALIZED
override val kind get() = IrModuleDeserializerKind.DESERIALIZED
}
private inner class KonanForwardDeclarationModuleDeserializer(moduleDescriptor: ModuleDescriptor) : IrModuleDeserializer(moduleDescriptor, KotlinAbiVersion.CURRENT) {
@@ -897,7 +897,7 @@ internal class KonanIrLinker(
override val moduleFragment: IrModuleFragment = KonanIrModuleFragmentImpl(moduleDescriptor, builtIns)
override val moduleDependencies: Collection<IrModuleDeserializer> = emptyList()
override val origin get() = IrModuleOrigin.SYNTHETIC
override val kind get() = IrModuleDeserializerKind.SYNTHETIC
}
private val String.isForwardDeclarationModuleName: Boolean get() = this == "<forward declarations>"
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanUserVisibleIrModulesSupport.kt
+1 -1
View File
@@ -35,7 +35,7 @@ class KonanUserVisibleIrModulesSupport(
// Transform deserializers to [ModuleWithUninitializedDependencies]s.
val modules: Map<ResolvedDependencyId, ModuleWithUninitializedDependencies> = deserializers.mapNotNull { deserializer ->
val library: KotlinLibrary = deserializer.kotlinLibrary ?: return@mapNotNull null
val library: KotlinLibrary = deserializer.asDeserializedKotlinLibrary ?: return@mapNotNull null
val moduleId = getUserVisibleModuleId(deserializer)
if (moduleId in excludedModuleIds) return@mapNotNull null