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

CODEGEN: fix evaluateBlock()

Browse Source 
- we shouldn't ignore variable name to return
This commit is contained in:
Vasily Levchenko
2016-11-28 17:52:57 +03:00
committed by vvlevchenko
parent de06d069b1
commit 835ab152f3
1 changed files with 4 additions and 4 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
+4 -4
View File
@@ -376,12 +376,12 @@ internal class CodeGeneratorVisitor(val context: Context) : IrElementVisitorVoid
is IrSetField -> return evaluateSetField ( value)
is IrConst<*> -> return evaluateConst ( value)
is IrReturn -> return evaluateReturn ( value)
is IrBlock -> return evaluateBlock ( value)
is IrBlock -> return evaluateBlock (tmpVariableName, value)
is IrExpressionBody -> return evaluateExpression (tmpVariableName, value.expression)
is IrWhen -> return evaluateWhen (tmpVariableName, value)
is IrThrow -> return evaluateThrow (tmpVariableName, value)
is IrStringConcatenation -> return evaluateStringConcatenation(tmpVariableName, value)
is IrBlockBody -> return evaluateBlock ( value as IrStatementContainer)
is IrBlockBody -> return evaluateBlock (tmpVariableName, value as IrStatementContainer)
is IrWhileLoop -> return evaluateWhileLoop ( value)
null -> return null
else -> {
@@ -664,12 +664,12 @@ internal class CodeGeneratorVisitor(val context: Context) : IrElementVisitorVoid
//-------------------------------------------------------------------------//
private fun evaluateBlock(value: IrStatementContainer): LLVMValueRef? {
private fun evaluateBlock(tmpVariableName: String, value: IrStatementContainer): LLVMValueRef? {
logger.log("evaluateBlock : ${value.statements.forEach { ir2string(it) }}")
value.statements.dropLast(1).forEach {
evaluateExpression(codegen.newVar(), it)
}
return evaluateExpression(codegen.newVar(), value.statements.lastOrNull())
return evaluateExpression(tmpVariableName, value.statements.lastOrNull())
}
//-------------------------------------------------------------------------//