From 3355f04fa1ea107989a7fb6db8f52b92d5114526 Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Wed, 28 Dec 2022 12:01:47 +0200 Subject: [PATCH] [IR] Drop all usages of Ir.irModule --- .../src/org/jetbrains/kotlin/backend/konan/Context.kt | 2 +- .../org/jetbrains/kotlin/backend/konan/llvm/BitcodePhases.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt index 84292be0b49..c24c6fd6b41 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt @@ -164,7 +164,7 @@ internal class Context( override lateinit var ir: KonanIr override val irBuiltIns - get() = ir.irModule.irBuiltins + get() = irModule!!.irBuiltins override val typeSystem: IrTypeSystemContext get() = IrTypeSystemContextImpl(irBuiltIns) diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/BitcodePhases.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/BitcodePhases.kt index c62bd74025f..19263f17c1f 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/BitcodePhases.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/BitcodePhases.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.util.OperatorNameConventions internal val createLLVMDeclarationsPhase = makeKonanModuleOpPhase( name = "CreateLLVMDeclarations", description = "Map IR declarations to LLVM", - op = { context, _ -> context.generationState.llvmDeclarations = createLlvmDeclarations(context.generationState, context.ir.irModule) } + op = { context, _ -> context.generationState.llvmDeclarations = createLlvmDeclarations(context.generationState, context.irModule!!) } ) internal val RTTIPhase = makeKonanModuleOpPhase(