From 7f51be9cd340a3cea9d51ad863b43d9fe3cf75fd Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 16 Dec 2019 17:35:48 +0100
Subject: [PATCH] Minor, change parameter name of FrameMap.enter/leave

It's not a descriptor in case of IrFrameMap
---
 .../src/org/jetbrains/kotlin/codegen/FrameMap.kt | 16 ++++++++--------
 .../kotlin/backend/jvm/codegen/irCodegenUtils.kt | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FrameMap.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/FrameMap.kt
index 3fc3899d6dd..c87f73d25a1 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FrameMap.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FrameMap.kt
@@ -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
     }
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/irCodegenUtils.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/irCodegenUtils.kt
index e8741a422ac..7f0b4639120 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/irCodegenUtils.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/irCodegenUtils.kt
@@ -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 =