From f49f6656b9a3cd1d14bd7b1bbb4e09407a582d10 Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Thu, 24 Aug 2023 12:40:10 +0200
Subject: [PATCH] [JVM] Move private extension methods into `FixStackFrame`

---
 .../optimization/fixStack/FixStackAnalyzer.kt | 58 +++++++++----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FixStackAnalyzer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FixStackAnalyzer.kt
index 427e58dcafe..57f0a9ba286 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FixStackAnalyzer.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FixStackAnalyzer.kt
@@ -176,42 +176,42 @@ internal class FixStackAnalyzer(
             override fun merge(frame: Frame<out FixStackValue>, interpreter: Interpreter<FixStackValue>): Boolean {
                 throw UnsupportedOperationException("Stack normalization should not merge frames")
             }
-        }
 
-        private fun FixStackFrame.executeBeforeInlineCallMarker(insn: AbstractInsnNode) {
-            saveStackAndClear(insn)
-        }
+            private fun executeBeforeInlineCallMarker(insn: AbstractInsnNode) {
+                saveStackAndClear(insn)
+            }
 
-        private fun FixStackFrame.saveStackAndClear(insn: AbstractInsnNode) {
-            val savedValues = getStackContent()
-            spilledStacks[insn] = savedValues
-            clearStack()
-        }
-
-        private fun FixStackFrame.executeAfterInlineCallMarker(insn: AbstractInsnNode) {
-            val beforeInlineMarker = context.openingInlineMethodMarker[insn]
-            if (stackSize > 0) {
-                val returnValue = pop()
+            private fun saveStackAndClear(insn: AbstractInsnNode) {
+                val savedValues = getStackContent()
+                spilledStacks[insn] = savedValues
                 clearStack()
-                val savedValues = spilledStacks[beforeInlineMarker]
-                pushAll(savedValues!!)
-                push(returnValue)
-            } else {
-                val savedValues = spilledStacks[beforeInlineMarker]
-                pushAll(savedValues!!)
             }
-        }
 
-        private fun FixStackFrame.executeRestoreStackInTryCatch(insn: AbstractInsnNode) {
-            val saveNode = context.saveStackMarkerForRestoreMarker[insn]
-            val savedValues = spilledStacks.getOrElse(saveNode!!) {
-                throw AssertionError("${insn.indexOf()}: Restore stack is unavailable for ${saveNode.indexOf()}")
+            private fun executeAfterInlineCallMarker(insn: AbstractInsnNode) {
+                val beforeInlineMarker = context.openingInlineMethodMarker[insn]
+                if (stackSize > 0) {
+                    val returnValue = pop()
+                    clearStack()
+                    val savedValues = spilledStacks[beforeInlineMarker]
+                    pushAll(savedValues!!)
+                    push(returnValue)
+                } else {
+                    val savedValues = spilledStacks[beforeInlineMarker]
+                    pushAll(savedValues!!)
+                }
             }
-            pushAll(savedValues)
-        }
 
-        private fun FixStackFrame.executeSaveStackBeforeTry(insn: AbstractInsnNode) {
-            saveStackAndClear(insn)
+            private fun executeRestoreStackInTryCatch(insn: AbstractInsnNode) {
+                val saveNode = context.saveStackMarkerForRestoreMarker[insn]
+                val savedValues = spilledStacks.getOrElse(saveNode!!) {
+                    throw AssertionError("${insn.indexOf()}: Restore stack is unavailable for ${saveNode.indexOf()}")
+                }
+                pushAll(savedValues)
+            }
+
+            private fun executeSaveStackBeforeTry(insn: AbstractInsnNode) {
+                saveStackAndClear(insn)
+            }
         }
     }