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

backend: Generate exit block for "when" if it has no unconditional branch

Browse Source
This commit is contained in:
Ilya Matveev
2017-02-17 11:24:12 +03:00
committed by ilmat192
parent c0f9c9fd5d
commit 9bc13264a7
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
+6 -3
View File
@@ -1034,11 +1034,14 @@ internal class CodeGeneratorVisitor(val context: Context) : IrElementVisitorVoid
var bbExit: LLVMBasicBlockRef? = null // By default "when" does not have "exit". var bbExit: LLVMBasicBlockRef? = null // By default "when" does not have "exit".
val isUnit = KotlinBuiltIns.isUnit(expression.type) val isUnit = KotlinBuiltIns.isUnit(expression.type)
val isNothing = KotlinBuiltIns.isNothing(expression.type) val isNothing = KotlinBuiltIns.isNothing(expression.type)
val hasNoUnconditional = !isUnconditional(expression.branches.last())
if (!isNothing) // If "when" has "exit". // If "when" has no unconditional branch we may continue execution even if it has type "Nothing".
bbExit = codegen.basicBlock() // Create basic block to process "exit". // So we need an exit block.
if (!isNothing || hasNoUnconditional) // If "when" has "exit".
bbExit = codegen.basicBlock() // Create basic block to process "exit".
val hasNoValue = !isUnconditional(expression.branches.last()) val hasNoValue = hasNoUnconditional
// (It is possible if IrWhen is used as statement). // (It is possible if IrWhen is used as statement).
val llvmType = codegen.getLLVMType(expression.type) val llvmType = codegen.getLLVMType(expression.type)