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

Rename variable

Browse Source
This commit is contained in:
Ilya Matveev
2017-02-17 12:02:20 +03:00
committed by ilmat192
parent 9bc13264a7
commit 316ed73bd5
1 changed files with 18 additions and 10 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
+18 -10
View File
@@ -1028,24 +1028,32 @@ internal class CodeGeneratorVisitor(val context: Context) : IrElementVisitorVoid
}
//-------------------------------------------------------------------------//
/* FIXME. Fix "when" type in frontend.
* For the following code:
* fun foo(x: Int) {
* when (x) {
* 0 -> 0
* }
* }
* we cannot determine if the result of when is assigned or not.
*/
private fun evaluateWhen(expression: IrWhen): LLVMValueRef {
context.log("evaluateWhen : ${ir2string(expression)}")
var bbExit: LLVMBasicBlockRef? = null // By default "when" does not have "exit".
val isUnit = KotlinBuiltIns.isUnit(expression.type)
val isNothing = KotlinBuiltIns.isNothing(expression.type)
val hasNoUnconditional = !isUnconditional(expression.branches.last())
// If "when" has no unconditional branch we may continue execution even if it has type "Nothing".
// So we need an exit block.
if (!isNothing || hasNoUnconditional) // If "when" has "exit".
// We may not cover all cases if IrWhen is used as statement.
val coverAllCases = isUnconditional(expression.branches.last())
// "When" has exit block if:
// its type is not Nothing - we must place phi in the exit block
// or it doesn't cover all cases - we may fall through all of them and must create exit block to continue.
if (!isNothing || !coverAllCases) // If "when" has "exit".
bbExit = codegen.basicBlock() // Create basic block to process "exit".
val hasNoValue = hasNoUnconditional
// (It is possible if IrWhen is used as statement).
val llvmType = codegen.getLLVMType(expression.type)
val resultPhi = if (isUnit || isNothing || hasNoValue) null else
val resultPhi = if (isUnit || isNothing || !coverAllCases) null else
codegen.appendingTo(bbExit!!) {
codegen.phi(llvmType)
}
@@ -1061,7 +1069,7 @@ internal class CodeGeneratorVisitor(val context: Context) : IrElementVisitorVoid
// FIXME: remove the hacks.
isUnit -> codegen.theUnitInstanceRef.llvm
isNothing -> codegen.kNothingFakeValue
hasNoValue -> LLVMGetUndef(llvmType)!!
!coverAllCases -> LLVMGetUndef(llvmType)!!
else -> resultPhi!!
}
}