Minor, change parameter name of FrameMap.enter/leave
It's not a descriptor in case of IrFrameMap
This commit is contained in:
@@ -31,21 +31,21 @@ open class FrameMapBase<T : Any> {
|
||||
var currentSize = 0
|
||||
private set
|
||||
|
||||
open fun enter(descriptor: T, type: Type): Int {
|
||||
open fun enter(key: T, type: Type): Int {
|
||||
val index = currentSize
|
||||
myVarIndex.put(descriptor, index)
|
||||
myVarIndex.put(key, index)
|
||||
currentSize += type.size
|
||||
myVarSizes.put(descriptor, type.size)
|
||||
myVarSizes.put(key, type.size)
|
||||
return index
|
||||
}
|
||||
|
||||
open fun leave(descriptor: T): Int {
|
||||
val size = myVarSizes.get(descriptor)
|
||||
open fun leave(key: T): Int {
|
||||
val size = myVarSizes.get(key)
|
||||
currentSize -= size
|
||||
myVarSizes.remove(descriptor)
|
||||
val oldIndex = myVarIndex.remove(descriptor)
|
||||
myVarSizes.remove(key)
|
||||
val oldIndex = myVarIndex.remove(key)
|
||||
if (oldIndex != currentSize) {
|
||||
throw IllegalStateException("Descriptor can be left only if it is last: $descriptor")
|
||||
throw IllegalStateException("Descriptor can be left only if it is last: $key")
|
||||
}
|
||||
return oldIndex
|
||||
}
|
||||
|
||||
+6
-6
@@ -41,14 +41,14 @@ import org.jetbrains.org.objectweb.asm.Type
|
||||
class IrFrameMap : FrameMapBase<IrSymbol>() {
|
||||
private val typeMap = mutableMapOf<IrSymbol, Type>()
|
||||
|
||||
override fun enter(descriptor: IrSymbol, type: Type): Int {
|
||||
typeMap[descriptor] = type
|
||||
return super.enter(descriptor, type)
|
||||
override fun enter(key: IrSymbol, type: Type): Int {
|
||||
typeMap[key] = type
|
||||
return super.enter(key, type)
|
||||
}
|
||||
|
||||
override fun leave(descriptor: IrSymbol): Int {
|
||||
typeMap.remove(descriptor)
|
||||
return super.leave(descriptor)
|
||||
override fun leave(key: IrSymbol): Int {
|
||||
typeMap.remove(key)
|
||||
return super.leave(key)
|
||||
}
|
||||
|
||||
fun typeOf(symbol: IrSymbol): Type =
|
||||
|
||||
Reference in New Issue
Block a user