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

[JVM] Drop getFrame and setFrame methods from FastAnalyzer

Browse Source
This commit is contained in:
Ivan Kylchik
2023-09-06 11:47:31 +02:00
committed by Space Team
parent f7f253d2bf
commit 87c46db3d5
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/FastAnalyzer.kt
+7 -13
View File
@@ -60,7 +60,8 @@ abstract class FastAnalyzer<V : Value, I : Interpreter<V>, F : Frame<V>>(
while (top > 0) { while (top > 0) {
val insn = queue[--top] val insn = queue[--top]
val f = getFrame(insn)!! @Suppress("UNCHECKED_CAST")
val f = frames[insn] as F
queued[insn] = false queued[insn] = false
val insnNode = method.instructions[insn] val insnNode = method.instructions[insn]
@@ -123,14 +124,14 @@ abstract class FastAnalyzer<V : Value, I : Interpreter<V>, F : Frame<V>>(
* If updated, adds the frame to the queue * If updated, adds the frame to the queue
*/ */
private fun mergeControlFlowEdge(dest: Int, frame: F, canReuse: Boolean = false) { private fun mergeControlFlowEdge(dest: Int, frame: F, canReuse: Boolean = false) {
val oldFrame = getFrame(dest) val oldFrame = frames[dest]
val changes = when { val changes = when {
canReuse && !isMergeNode[dest] -> { canReuse && !isMergeNode[dest] -> {
setFrame(dest, frame) frames[dest] = frame
true true
} }
oldFrame == null -> { oldFrame == null -> {
setFrame(dest, newFrame(frame.locals, frame.maxStackSize).apply { init(frame) }) frames[dest] = newFrame(frame.locals, frame.maxStackSize).apply { init(frame) }
true true
} }
!isMergeNode[dest] -> { !isMergeNode[dest] -> {
@@ -201,13 +202,6 @@ abstract class FastAnalyzer<V : Value, I : Interpreter<V>, F : Frame<V>>(
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
protected fun getFrame(insn: AbstractInsnNode): F? = frames[insn.indexOf()] as? F protected fun getFrame(insn: AbstractInsnNode): F? = frames[insn.indexOf()] as? F
@Suppress("UNCHECKED_CAST")
protected fun getFrame(index: Int): F? = frames[index] as? F
protected fun setFrame(index: Int, newFrame: F) {
frames[index] = newFrame
}
private fun visitMeaningfulInstruction(insnNode: AbstractInsnNode, insnType: Int, insnOpcode: Int, current: F, insn: Int) { private fun visitMeaningfulInstruction(insnNode: AbstractInsnNode, insnType: Int, insnOpcode: Int, current: F, insn: Int) {
when { when {
insnType == AbstractInsnNode.JUMP_INSN -> insnType == AbstractInsnNode.JUMP_INSN ->
@@ -301,14 +295,14 @@ abstract class FastAnalyzer<V : Value, I : Interpreter<V>, F : Frame<V>>(
insnHandlers.add(tcb) insnHandlers.add(tcb)
} }
protected fun updateQueue(changes: Boolean, dest: Int) { private fun updateQueue(changes: Boolean, dest: Int) {
if (changes && !queued[dest]) { if (changes && !queued[dest]) {
queued[dest] = true queued[dest] = true
queue[top++] = dest queue[top++] = dest
} }
} }
protected fun F.dump(): String { private fun Frame<V>.dump(): String {
return buildString { return buildString {
append("{\n") append("{\n")
append(" locals: [\n") append(" locals: [\n")