From 8617809528bb636f0ef53a0032da9425c89e90dc Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Tue, 2 Feb 2021 15:59:43 +0300
Subject: [PATCH] Rename `expression` value parameter to `declaration`

---
 .../kotlin/ir/interpreter/IrInterpreter.kt         | 14 +++++++-------
 .../jetbrains/kotlin/ir/interpreter/stack/Stack.kt |  5 -----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/IrInterpreter.kt b/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/IrInterpreter.kt
index e68eaa71ba9..98e05f189b5 100644
--- a/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/IrInterpreter.kt
+++ b/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/IrInterpreter.kt
@@ -104,7 +104,7 @@ class IrInterpreter(val irBuiltIns: IrBuiltIns, private val bodyMap: Map<IdSigna
                 is IrCall -> interpretCall(this)
                 is IrConstructorCall -> interpretConstructorCall(this)
                 is IrEnumConstructorCall -> interpretEnumConstructorCall(this)
-                is IrDelegatingConstructorCall -> interpretDelegatedConstructorCall(this)
+                is IrDelegatingConstructorCall -> interpretDelegatingConstructorCall(this)
                 is IrInstanceInitializerCall -> interpretInstanceInitializerCall(this)
                 is IrBody -> interpretBody(this)
                 is IrBlock -> interpretBlock(this)
@@ -442,7 +442,7 @@ class IrInterpreter(val irBuiltIns: IrBuiltIns, private val bodyMap: Map<IdSigna
         return interpretConstructor(enumConstructorCall)
     }
 
-    private fun interpretDelegatedConstructorCall(delegatingConstructorCall: IrDelegatingConstructorCall): ExecutionResult {
+    private fun interpretDelegatingConstructorCall(delegatingConstructorCall: IrDelegatingConstructorCall): ExecutionResult {
         if (delegatingConstructorCall.symbol.owner.parent == irBuiltIns.anyClass.owner) {
             val anyAsStateObject = Common(irBuiltIns.anyClass.owner)
             stack.pushReturnValue(anyAsStateObject)
@@ -605,12 +605,12 @@ class IrInterpreter(val irBuiltIns: IrBuiltIns, private val bodyMap: Map<IdSigna
         return Next
     }
 
-    private fun interpretVariable(expression: IrVariable): ExecutionResult {
-        if (expression.initializer == null) {
-            return Next.apply { stack.addVar(Variable(expression.symbol)) }
+    private fun interpretVariable(declaration: IrVariable): ExecutionResult {
+        if (declaration.initializer == null) {
+            return Next.apply { stack.addVar(Variable(declaration.symbol)) }
         }
-        expression.initializer?.interpret()?.check { return it } //?: return Next
-        stack.addVar(Variable(expression.symbol, stack.popReturnValue()))
+        declaration.initializer?.interpret()?.check { return it } //?: return Next
+        stack.addVar(Variable(declaration.symbol, stack.popReturnValue()))
         return Next
     }
 
diff --git a/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/stack/Stack.kt b/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/stack/Stack.kt
index de5a7a445a7..f2dee0adc7e 100644
--- a/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/stack/Stack.kt
+++ b/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/stack/Stack.kt
@@ -151,11 +151,6 @@ internal class StackImpl : Stack {
 }
 
 private class FrameContainer(val irFile: IrFile? = null, private val entryPoint: IrFunction? = null, current: Frame = InterpreterFrame()) {
-    /*var lineNumber: Int
-        get() = getTopFrame().lineOfCall
-        set(value) {
-            getTopFrame().lineOfCall = value
-        }*/
     var lineNumber: Int = -1
     private val innerStack = mutableListOf(current)
     private fun getTopFrame() = innerStack.first()