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

JVM IR: Don't remove stores to visible locals in DelegatedPropertyOptimizer

Browse Source
This commit is contained in:
Steven Schäfer
2020-08-05 11:32:07 +02:00
committed by Alexander Udalov
parent 983c84d6a6
commit da9bff40f0
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/DelegatedPropertyOptimizer.kt
+10 -1
View File
@@ -81,9 +81,18 @@ class DelegatedPropertyOptimizer {
} }
// Remove the unused KProperty loads. // Remove the unused KProperty loads.
val locals = methodNode.localVariables.mapTo(mutableSetOf()) { it.index }
for (kPropertyRanges in variableToDelegatedPropertyIndex.values) { for (kPropertyRanges in variableToDelegatedPropertyIndex.values) {
for ((from, to) in kPropertyRanges.ranges) { for ((from, to) in kPropertyRanges.ranges) {
methodNode.instructions.removeRange(from, to) // Stores to variables with LVT entries need to be preserved. We store `null` for
// unused KProperties, for compatibility with the JVM BE.
val storeInsn = to as VarInsnNode
if (storeInsn.`var` !in locals) {
methodNode.instructions.removeRange(from, to)
} else {
methodNode.instructions.removeRange(from, to.previous)
methodNode.instructions.insertBefore(to, InsnNode(Opcodes.ACONST_NULL))
}
} }
} }
} }