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

[JVM] Move private extension methods into FixStackFrame

Browse Source
This commit is contained in:
Ivan Kylchik
2023-08-24 12:40:10 +02:00
committed by Space Team
parent 2c4c3a73b8
commit f49f6656b9
1 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FixStackAnalyzer.kt
+6 -6
View File
@@ -176,19 +176,18 @@ internal class FixStackAnalyzer(
override fun merge(frame: Frame<out FixStackValue>, interpreter: Interpreter<FixStackValue>): Boolean { override fun merge(frame: Frame<out FixStackValue>, interpreter: Interpreter<FixStackValue>): Boolean {
throw UnsupportedOperationException("Stack normalization should not merge frames") throw UnsupportedOperationException("Stack normalization should not merge frames")
} }
}
private fun FixStackFrame.executeBeforeInlineCallMarker(insn: AbstractInsnNode) { private fun executeBeforeInlineCallMarker(insn: AbstractInsnNode) {
saveStackAndClear(insn) saveStackAndClear(insn)
} }
private fun FixStackFrame.saveStackAndClear(insn: AbstractInsnNode) { private fun saveStackAndClear(insn: AbstractInsnNode) {
val savedValues = getStackContent() val savedValues = getStackContent()
spilledStacks[insn] = savedValues spilledStacks[insn] = savedValues
clearStack() clearStack()
} }
private fun FixStackFrame.executeAfterInlineCallMarker(insn: AbstractInsnNode) { private fun executeAfterInlineCallMarker(insn: AbstractInsnNode) {
val beforeInlineMarker = context.openingInlineMethodMarker[insn] val beforeInlineMarker = context.openingInlineMethodMarker[insn]
if (stackSize > 0) { if (stackSize > 0) {
val returnValue = pop() val returnValue = pop()
@@ -202,7 +201,7 @@ internal class FixStackAnalyzer(
} }
} }
private fun FixStackFrame.executeRestoreStackInTryCatch(insn: AbstractInsnNode) { private fun executeRestoreStackInTryCatch(insn: AbstractInsnNode) {
val saveNode = context.saveStackMarkerForRestoreMarker[insn] val saveNode = context.saveStackMarkerForRestoreMarker[insn]
val savedValues = spilledStacks.getOrElse(saveNode!!) { val savedValues = spilledStacks.getOrElse(saveNode!!) {
throw AssertionError("${insn.indexOf()}: Restore stack is unavailable for ${saveNode.indexOf()}") throw AssertionError("${insn.indexOf()}: Restore stack is unavailable for ${saveNode.indexOf()}")
@@ -210,10 +209,11 @@ internal class FixStackAnalyzer(
pushAll(savedValues) pushAll(savedValues)
} }
private fun FixStackFrame.executeSaveStackBeforeTry(insn: AbstractInsnNode) { private fun executeSaveStackBeforeTry(insn: AbstractInsnNode) {
saveStackAndClear(insn) saveStackAndClear(insn)
} }
} }
}
} }