Split up IR header onto separate tables
This commit is contained in:
+1
-3
@@ -106,9 +106,7 @@ internal fun produceOutput(context: Context) {
|
|||||||
context.config.includeBinaries,
|
context.config.includeBinaries,
|
||||||
neededLibraries,
|
neededLibraries,
|
||||||
context.serializedMetadata!!,
|
context.serializedMetadata!!,
|
||||||
// During serializer and library commonizations we've got duplicate SerializedIr in
|
context.serializedIr!!,
|
||||||
// two different packages. TODO: Eliminate them eventually.
|
|
||||||
SerializedIr(context.serializedIr!!.module, context.serializedIr!!.combinedDeclarationFilePath),
|
|
||||||
versions,
|
versions,
|
||||||
target,
|
target,
|
||||||
output,
|
output,
|
||||||
|
|||||||
+9
@@ -42,6 +42,15 @@ class KonanIrLinker(
|
|||||||
override fun reader(moduleDescriptor: ModuleDescriptor, uniqId: UniqId) =
|
override fun reader(moduleDescriptor: ModuleDescriptor, uniqId: UniqId) =
|
||||||
moduleDescriptor.konanLibrary!!.irDeclaration(uniqId.index, uniqId.isLocal)
|
moduleDescriptor.konanLibrary!!.irDeclaration(uniqId.index, uniqId.isLocal)
|
||||||
|
|
||||||
|
override fun readSymbol(moduleDescriptor: ModuleDescriptor, symbolIndex: Int) =
|
||||||
|
moduleDescriptor.konanLibrary!!.symbol(symbolIndex)
|
||||||
|
|
||||||
|
override fun readType(moduleDescriptor: ModuleDescriptor, typeIndex: Int) =
|
||||||
|
moduleDescriptor.konanLibrary!!.type(typeIndex)
|
||||||
|
|
||||||
|
override fun readString(moduleDescriptor: ModuleDescriptor, stringIndex: Int) =
|
||||||
|
moduleDescriptor.konanLibrary!!.string(stringIndex)
|
||||||
|
|
||||||
override val ModuleDescriptor.irHeader get() = this.konanLibrary!!.irHeader
|
override val ModuleDescriptor.irHeader get() = this.konanLibrary!!.irHeader
|
||||||
|
|
||||||
val modules: Map<String, IrModuleFragment> get() = mutableMapOf<String, IrModuleFragment>().apply {
|
val modules: Map<String, IrModuleFragment> get() = mutableMapOf<String, IrModuleFragment>().apply {
|
||||||
|
|||||||
Reference in New Issue
Block a user