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

translator: fix assignment argument variables

Browse Source
This commit is contained in:
Alexey Stepanov
2016-07-13 16:52:10 +03:00
parent 4da6ddde80
commit 423d393c5d
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
translator/src/main/kotlin/org/kotlinnative/translator/FunctionCodegen.kt
+4 -4
View File
@@ -297,11 +297,11 @@ class FunctionCodegen(val state: TranslationState, val function: KtNamedFunction
val assignExpression = evaluateExpression(eq.getNextSiblingIgnoringWhitespaceAndComments(), scopeDepth) ?: return null val assignExpression = evaluateExpression(eq.getNextSiblingIgnoringWhitespaceAndComments(), scopeDepth) ?: return null
when (assignExpression) { when (assignExpression) {
//TODO resolving
is LLVMVariable -> { is LLVMVariable -> {
assignExpression.kotlinName = identifier!!.text val allocVar = variableManager.getVariable(identifier!!.text, LLVMIntType(), pointer = true)
assignExpression.pointer = false codeBuilder.allocVar(allocVar)
variableManager.addVariable(identifier.text, assignExpression, scopeDepth) variableManager.addVariable(identifier.text, allocVar, scopeDepth)
codeBuilder.copyVariableValue(assignExpression, allocVar)
} }
is LLVMConstant -> { is LLVMConstant -> {
val newVar = variableManager.getVariable(identifier!!.text, LLVMIntType(), pointer = true) val newVar = variableManager.getVariable(identifier!!.text, LLVMIntType(), pointer = true)
translator/src/main/kotlin/org/kotlinnative/translator/llvm/LLVMBuilder.kt
+7
View File
@@ -117,6 +117,13 @@ class LLVMBuilder(val arm: Boolean) {
llvmCode.appendln(code) llvmCode.appendln(code)
} }
fun copyVariableValue(from: LLVMVariable, to: LLVMVariable) {
val tmp = getNewVariable(from.type, from.pointer)
llvmCode.appendln("$tmp = load ${tmp.type}, ${from.getType()} $from, align ${tmp.type.align}")
llvmCode.appendln("store ${to.type} $tmp, ${to.getType()} $to, align ${tmp.type.align}")
}
fun loadArgument(llvmVariable: LLVMVariable, store: Boolean = true): LLVMVariable { fun loadArgument(llvmVariable: LLVMVariable, store: Boolean = true): LLVMVariable {
val allocVar = LLVMVariable("${llvmVariable.label}.addr", llvmVariable.type, llvmVariable.kotlinName, true) val allocVar = LLVMVariable("${llvmVariable.label}.addr", llvmVariable.type, llvmVariable.kotlinName, true)
addVariableByRef(allocVar, llvmVariable, store) addVariableByRef(allocVar, llvmVariable, store)