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

translator: fix multiscope variable resolving

Browse Source
This commit is contained in:
Alexey Stepanov
2016-07-13 12:43:03 +03:00
parent 8b81d9c38b
commit 2fe1a68439
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
translator/src/main/kotlin/org/kotlinnative/translator/FunctionCodegen.kt
+1 -1
View File
@@ -248,7 +248,7 @@ class FunctionCodegen(val state: TranslationState, val function: KtNamedFunction
variableManager.addVariable(identifier.text, assignExpression, scopeDepth) variableManager.addVariable(identifier.text, assignExpression, scopeDepth)
} }
is LLVMConstant -> { is LLVMConstant -> {
val newVar = LLVMVariable("%${identifier!!.text}.addr", type = LLVMIntType(), kotlinName = identifier.text, pointer = true) val newVar = variableManager.getVariable(identifier!!.text, type = LLVMIntType(), pointer = true)
codeBuilder.addConstant(newVar, assignExpression) codeBuilder.addConstant(newVar, assignExpression)
variableManager.addVariable(identifier.text, newVar, scopeDepth) variableManager.addVariable(identifier.text, newVar, scopeDepth)
} }
translator/src/main/kotlin/org/kotlinnative/translator/VariableManager.kt
+10 -1
View File
@@ -1,12 +1,14 @@
package org.kotlinnative.translator package org.kotlinnative.translator
import org.kotlinnative.translator.llvm.LLVMVariable import org.kotlinnative.translator.llvm.LLVMVariable
import org.kotlinnative.translator.llvm.types.LLVMType
import java.util.* import java.util.*
class VariableManager { class VariableManager {
private var fileVariableCollectionTree = HashMap<String, Stack<Pair<LLVMVariable, Int>>>() private var fileVariableCollectionTree = HashMap<String, Stack<Pair<LLVMVariable, Int>>>()
private var globalVariableCollection = HashMap<String, LLVMVariable>() private var globalVariableCollection = HashMap<String, LLVMVariable>()
private var variableVersion = HashMap<String, Int>()
fun getLLVMvalue(variableName: String): LLVMVariable? { fun getLLVMvalue(variableName: String): LLVMVariable? {
return fileVariableCollectionTree[variableName]?.peek()?.first ?: globalVariableCollection[variableName] return fileVariableCollectionTree[variableName]?.peek()?.first ?: globalVariableCollection[variableName]
@@ -17,9 +19,16 @@ class VariableManager {
} }
fun addVariable(name: String, variable: LLVMVariable, level: Int) { fun addVariable(name: String, variable: LLVMVariable, level: Int) {
val stack = fileVariableCollectionTree.getOrDefault(String, Stack<Pair<LLVMVariable, Int>>()) val stack = fileVariableCollectionTree.getOrDefault(name, Stack<Pair<LLVMVariable, Int>>())
stack.push(Pair(variable, level)) stack.push(Pair(variable, level))
fileVariableCollectionTree.put(name, stack) fileVariableCollectionTree.put(name, stack)
} }
fun getVariable(name: String, type: LLVMType, pointer: Boolean): LLVMVariable {
val ourVersion = variableVersion.getOrDefault(name, 0) + 1
variableVersion.put(name, ourVersion)
return LLVMVariable("%managed.${name}.${ourVersion}", kotlinName = name, type = type, pointer = pointer)
}
} }