From 45820f0220ea84aed6264316bd3ca9a9984fdcc6 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Mon, 22 May 2017 10:50:28 +0300 Subject: [PATCH] Minor: more cleanup after converting to Kotlin --- .../boxing/RedundantBoxingMethodTransformer.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingMethodTransformer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingMethodTransformer.kt index ce884efaf2f..00d5917e59b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingMethodTransformer.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingMethodTransformer.kt @@ -60,13 +60,14 @@ class RedundantBoxingMethodTransformer : MethodTransformer() { node: MethodNode, frames: Array?> ) { - for (i in 0..node.instructions.size() - 1) { - val insn = node.instructions.get(i) - val frame = frames[i] - if (insn.opcode != Opcodes.POP && insn.opcode != Opcodes.POP2 || frame == null) { + for (i in frames.indices) { + val insn = node.instructions[i] + if (insn.opcode != Opcodes.POP && insn.opcode != Opcodes.POP2) { continue } + val frame = frames[i] ?: continue + val top = frame.top()!! interpreter.processPopInstruction(insn, top) @@ -104,7 +105,7 @@ class RedundantBoxingMethodTransformer : MethodTransformer() { if (boxed.isEmpty()) continue - val firstBoxed = boxed.iterator().next().descriptor + val firstBoxed = boxed.first().descriptor if (isUnsafeToRemoveBoxingForConnectedValues(variableValues, firstBoxed.unboxedType)) { for (value in boxed) { val descriptor = value.descriptor @@ -193,7 +194,7 @@ class RedundantBoxingMethodTransformer : MethodTransformer() { } for (varIndex in doubleSizedVars) { - for (i in varIndex + 1..remapping.size - 1) { + for (i in varIndex + 1..remapping.lastIndex) { remapping[i]++ } }