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

JVM IR: Implement CHECK_NOT_NULL as a lowering

Browse Source
This commit is contained in:
Steven Schäfer
2019-10-29 14:49:18 +01:00
committed by Alexander Udalov
parent ea6c43dabd
commit dcd72b06d8
6 changed files with 78 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/nullCheck/RedundantNullCheckMethodTransformer.kt
+10 -5
View File
@@ -142,9 +142,9 @@ class RedundantNullCheckMethodTransformer(private val generationState: Generatio
private fun transformTrivialCheckNotNull(insn: AbstractInsnNode, nullability: Nullability) {
if (nullability != Nullability.NOT_NULL) return
val dupInsn = insn.previous?.takeIf { it.opcode == Opcodes.DUP } ?: return
val previousInsn = insn.previous?.takeIf { it.opcode == Opcodes.DUP || it.opcode == Opcodes.ALOAD } ?: return
methodNode.instructions.run {
remove(dupInsn)
remove(previousInsn)
remove(insn)
}
}
@@ -184,9 +184,10 @@ class RedundantNullCheckMethodTransformer(private val generationState: Generatio
}
insn.isCheckNotNull() -> {
val dupInsn = insn.previous ?: continue@insnLoop
if (dupInsn.opcode != Opcodes.DUP) continue@insnLoop
val aLoadInsn = dupInsn.previous ?: continue@insnLoop
val previous = insn.previous ?: continue@insnLoop
val aLoadInsn = if (previous.opcode == Opcodes.DUP) {
previous.previous ?: continue@insnLoop
} else previous
if (aLoadInsn.opcode != Opcodes.ALOAD) continue@insnLoop
addDependentCheck(insn, aLoadInsn as VarInsnNode)
}
@@ -303,6 +304,10 @@ class RedundantNullCheckMethodTransformer(private val generationState: Generatio
// INVOKESTATIC checkNotNull
// <...> -- v is not null here (otherwise an exception was thrown)
// ALOAD v
// INVOKESTATIC checkNotNull
// <...> -- v is not null here (otherwise an exception was thrown)
// ALOAD v
// LDC *
// INVOKESTATIC checkParameterIsNotNull