From 00f0ea97ed42b9548a52a76f4276b07dabcd771d Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Tue, 4 Sep 2018 11:31:20 +0300 Subject: [PATCH] Fix generating singleton value after Nothing-typed expression --- .../org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt index 3d15bf33694..5b61ef90d61 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt @@ -694,11 +694,11 @@ internal class FunctionGenerationContext(val function: LLVMValueRef, val shared = descriptor.objectIsShared && context.config.threadsAreAllowed val objectPtr = codegen.getObjectInstanceStorage(descriptor, shared) - val bbCurrent = currentBlock val bbInit = basicBlock("label_init", locationInfo) val bbExit = basicBlock("label_continue", locationInfo) val objectVal = loadSlot(objectPtr, false) val objectInitialized = icmpUGt(ptrToInt(objectVal, codegen.intPtrType), codegen.immOneIntPtrType) + val bbCurrent = currentBlock condBr(objectInitialized, bbExit, bbInit) positionAtEnd(bbInit)