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

Cleaning into RedundantGotoMethodTransformer

Browse Source 
- Use val when it is possible
- Use filterIsIstance
- Replace takeif + ?.let by an if instruction
This commit is contained in:
Mikaël Peltier
2018-02-16 11:52:14 +01:00
committed by Dmitry Petrov
parent 9fb0f59813
commit 2de0b2a9ef
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/RedundantGotoMethodTransformer.kt
+6 -5
View File
@@ -43,9 +43,9 @@ class RedundantGotoMethodTransformer : MethodTransformer() {
*/ */
override fun transform(internalClassName: String, methodNode: MethodNode) { override fun transform(internalClassName: String, methodNode: MethodNode) {
val insns = methodNode.instructions.toArray().apply { reverse() } val insns = methodNode.instructions.toArray().apply { reverse() }
var insnsToRemove = arrayListOf<AbstractInsnNode>() val insnsToRemove = arrayListOf<AbstractInsnNode>()
val currentLabels = hashSetOf<LabelNode>() val currentLabels = hashSetOf<LabelNode>()
var labelsToReplace = hashMapOf<LabelNode, JumpInsnNode>() val labelsToReplace = hashMapOf<LabelNode, JumpInsnNode>()
var pendingGoto: JumpInsnNode? = null var pendingGoto: JumpInsnNode? = null
for (insn in insns) { for (insn in insns) {
@@ -72,7 +72,7 @@ class RedundantGotoMethodTransformer : MethodTransformer() {
// Rewrite branch instructions. // Rewrite branch instructions.
if (!labelsToReplace.isEmpty()) { if (!labelsToReplace.isEmpty()) {
insns.filter { it is JumpInsnNode }.forEach { rewriteLabelIfNeeded(it as JumpInsnNode, labelsToReplace) } insns.filterIsInstance<JumpInsnNode>().forEach { rewriteLabelIfNeeded(it, labelsToReplace) }
} }
for (insnToRemove in insnsToRemove) { for (insnToRemove in insnsToRemove) {
@@ -84,9 +84,10 @@ class RedundantGotoMethodTransformer : MethodTransformer() {
jumpInsn: JumpInsnNode, jumpInsn: JumpInsnNode,
labelsToReplace: HashMap<LabelNode, JumpInsnNode> labelsToReplace: HashMap<LabelNode, JumpInsnNode>
) { ) {
getLastTargetJumpInsn(jumpInsn, labelsToReplace).takeIf { it.label != jumpInsn.label }?.let { val lastTargetLabel = getLastTargetJumpInsn(jumpInsn, labelsToReplace).label
if (lastTargetLabel != jumpInsn.label) {
// Do not remove the old label because it can be used to define a local variable range. // Do not remove the old label because it can be used to define a local variable range.
jumpInsn.label = it.label jumpInsn.label = lastTargetLabel
} }
} }