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

[JS IR] local var clashes

Browse Source
This commit is contained in:
Anton Bannykh
2021-10-18 21:11:07 +03:00
committed by TeamCityServer
parent 05e8bfcd2a
commit 5100cb058f
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/JsGenerationContext.kt
+17 -11
View File
@@ -5,10 +5,8 @@
package org.jetbrains.kotlin.ir.backend.js.utils package org.jetbrains.kotlin.ir.backend.js.utils
import org.jetbrains.kotlin.ir.declarations.IrDeclarationWithName import org.jetbrains.kotlin.ir.IrElement
import org.jetbrains.kotlin.ir.declarations.IrFile import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.declarations.IrFunction
import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
import org.jetbrains.kotlin.ir.expressions.IrLoop import org.jetbrains.kotlin.ir.expressions.IrLoop
import org.jetbrains.kotlin.ir.expressions.IrReturnableBlock import org.jetbrains.kotlin.ir.expressions.IrReturnableBlock
import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol
@@ -49,20 +47,28 @@ class JsGenerationContext(
) )
} }
private val nameCache = mutableMapOf<IrElement, JsName>()
fun getNameForValueDeclaration(declaration: IrDeclarationWithName): JsName { fun getNameForValueDeclaration(declaration: IrDeclarationWithName): JsName {
val name = localNames!!.variableNames.names[declaration] return nameCache.getOrPut(declaration) {
?: error("Variable name is not found ${declaration.name}") val name = localNames!!.variableNames.names[declaration]
return JsName(name, false) ?: error("Variable name is not found ${declaration.name}")
JsName(name, true)
}
} }
fun getNameForLoop(loop: IrLoop): JsName? { fun getNameForLoop(loop: IrLoop): JsName? {
val name = localNames!!.localLoopNames.names[loop] ?: return null return nameCache.getOrPut(loop) {
return JsName(name, false) val name = localNames!!.localLoopNames.names[loop] ?: return null
JsName(name, true)
}
} }
fun getNameForReturnableBlock(block: IrReturnableBlock): JsName? { fun getNameForReturnableBlock(block: IrReturnableBlock): JsName? {
val name = localNames!!.localReturnableBlockNames.names[block] ?: return null return nameCache.getOrPut(block) {
return JsName(name, false) val name = localNames!!.localReturnableBlockNames.names[block] ?: return null
return JsName(name, true)
}
} }
fun checkIfJsCode(symbol: IrFunctionSymbol): Boolean = symbol == staticContext.backendContext.intrinsics.jsCode fun checkIfJsCode(symbol: IrFunctionSymbol): Boolean = symbol == staticContext.backendContext.intrinsics.jsCode