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

JVM don't remove NOP starting a try-catch block

Browse Source
This commit is contained in:
Dmitry Petrov
2021-09-28 18:03:17 +03:00
committed by teamcityserver
parent 9325660f06
commit cc885f9b24
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/temporaryVals/TemporaryVariablesEliminationTransformer.kt
+3 -2
View File
@@ -37,7 +37,6 @@ class TemporaryVariablesEliminationTransformer(private val state: GenerationStat
methodNode.removeUnusedLocalVariables() methodNode.removeUnusedLocalVariables()
} }
private fun simplifyTrivialInstructions(methodNode: MethodNode) { private fun simplifyTrivialInstructions(methodNode: MethodNode) {
val insnList = methodNode.instructions val insnList = methodNode.instructions
for (insn in insnList.toArray()) { for (insn in insnList.toArray()) {
@@ -61,12 +60,14 @@ class TemporaryVariablesEliminationTransformer(private val state: GenerationStat
} }
} }
} }
val tcbStartLabels = methodNode.tryCatchBlocks.mapTo(HashSet()) { it.start }
for (insn in insnList.toArray()) { for (insn in insnList.toArray()) {
// Remove NOPs immediately preceded or immediately followed by an instruction that does something // Remove NOPs immediately preceded or immediately followed by an instruction that does something
// - not a LINENUMBER, not a LABEL, and not a FRAME. // - not a LINENUMBER, not a LABEL, and not a FRAME.
if (insn.opcode == Opcodes.NOP) { if (insn.opcode == Opcodes.NOP) {
val next = insn.next
val prev = insn.previous val prev = insn.previous
if (prev in tcbStartLabels) continue
val next = insn.next
if (next != null && next.isMeaningful || prev != null && prev.isMeaningful) { if (next != null && next.isMeaningful || prev != null && prev.isMeaningful) {
insnList.remove(insn) insnList.remove(insn)
} }