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

Merge pull request #28 from JetBrains/fix_void

Browse Source 
Fix void calls.
This commit is contained in:
Nikolay Igotti
2016-11-01 13:12:47 +03:00
committed by GitHub
parent 08bfdb652c 7cf38d9501
commit b142d39dbc
1 changed files with 3 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/native/llvm/IrToBitcode.kt
+3 -3
View File
@@ -85,7 +85,9 @@ internal class CodeGeneratorVisitor(val context: Context) : IrElementVisitorVoid
} }
override fun visitCall(expression: IrCall) { override fun visitCall(expression: IrCall) {
evaluateExpression(generator.tmpVariable(), expression) val isUnit = KotlinBuiltIns.isUnit(expression.descriptor.returnType!!)
val tmpVariable = if (isUnit) "" else generator.tmpVariable()
evaluateExpression(tmpVariable, expression)
} }
override fun visitFunction(declaration: IrFunction) { override fun visitFunction(declaration: IrFunction) {
@@ -183,8 +185,6 @@ internal class CodeGeneratorVisitor(val context: Context) : IrElementVisitorVoid
} }
private fun evaluateSimpleFunctionCall(tmpVariableName: String, value: IrCall, args: MutableList<LLVMOpaqueValue?>): LLVMOpaqueValue? { private fun evaluateSimpleFunctionCall(tmpVariableName: String, value: IrCall, args: MutableList<LLVMOpaqueValue?>): LLVMOpaqueValue? {
if (KotlinBuiltIns.isUnit(value.descriptor.returnType!!))
return generator.call(value.descriptor as FunctionDescriptor, args, null)
return generator.call(value.descriptor as FunctionDescriptor, args, tmpVariableName) return generator.call(value.descriptor as FunctionDescriptor, args, tmpVariableName)
} }