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

backend/codegen: do not rely on branch result Nothing type

Browse Source 
Fix deadCodeElimination/kt14357.kt
This commit is contained in:
Svyatoslav Scherbina
2017-03-02 12:48:12 +07:00
committed by SvyatoslavScherbina
parent 68b3e2243b
commit 23c70fddb0
1 changed files with 6 additions and 5 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 -5
View File
@@ -1723,7 +1723,6 @@ internal class CodeGeneratorVisitor(val context: Context) : IrElementVisitorVoid
private fun generateWhenCase(resultPhi: LLVMValueRef?, branch: IrBranch, private fun generateWhenCase(resultPhi: LLVMValueRef?, branch: IrBranch,
bbNext: LLVMBasicBlockRef?, bbExit: LLVMBasicBlockRef?) { bbNext: LLVMBasicBlockRef?, bbExit: LLVMBasicBlockRef?) {
val branchResult = branch.result val branchResult = branch.result
val isNothing = KotlinBuiltIns.isNothing(branchResult.type)
val brResult = if (isUnconditional(branch)) { // It is the "else" clause. val brResult = if (isUnconditional(branch)) { // It is the "else" clause.
evaluateExpression(branchResult) // Generate clause body. evaluateExpression(branchResult) // Generate clause body.
} else { // It is conditional clause. } else { // It is conditional clause.
@@ -1733,10 +1732,12 @@ internal class CodeGeneratorVisitor(val context: Context) : IrElementVisitorVoid
codegen.positionAtEnd(bbCurr) // Switch generation to block for clause body. codegen.positionAtEnd(bbCurr) // Switch generation to block for clause body.
evaluateExpression(branch.result) // Generate clause body. evaluateExpression(branch.result) // Generate clause body.
} }
if (resultPhi != null && !isNothing) if (!codegen.isAfterTerminator()) {
codegen.assignPhis(resultPhi to brResult) if (resultPhi != null)
if (bbExit != null && !isNothing) codegen.assignPhis(resultPhi to brResult)
codegen.br(bbExit) if (bbExit != null)
codegen.br(bbExit)
}
if (bbNext != null) // Switch generation to next or exit. if (bbNext != null) // Switch generation to next or exit.
codegen.positionAtEnd(bbNext) codegen.positionAtEnd(bbNext)
else if (bbExit != null) else if (bbExit != null)