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

Fix compilation against asm 7.0

Browse Source
This commit is contained in:
Mikhael Bogdanov
2021-02-01 16:47:09 +01:00
parent 78c6e0733c
commit 206b38f0ab
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/CapturedVarsOptimizationMethodTransformer.kt
+2 -2
View File
@@ -84,7 +84,7 @@ class CapturedVarsOptimizationMethodTransformer : MethodTransformer() {
private fun AbstractInsnNode.getIndex() = methodNode.instructions.indexOf(this) private fun AbstractInsnNode.getIndex() = methodNode.instructions.indexOf(this)
private fun createRefValues() { private fun createRefValues() {
for (insn in methodNode.instructions) { for (insn in methodNode.instructions.asSequence()) {
if (insn.opcode == Opcodes.NEW && insn is TypeInsnNode) { if (insn.opcode == Opcodes.NEW && insn is TypeInsnNode) {
val type = Type.getObjectType(insn.desc) val type = Type.getObjectType(insn.desc)
if (AsmTypes.isSharedVarType(type)) { if (AsmTypes.isSharedVarType(type)) {
@@ -124,7 +124,7 @@ class CapturedVarsOptimizationMethodTransformer : MethodTransformer() {
} }
private fun trackPops(frames: Array<out Frame<BasicValue>?>) { private fun trackPops(frames: Array<out Frame<BasicValue>?>) {
for ((i, insn) in methodNode.instructions.withIndex()) { for ((i, insn) in methodNode.instructions.asSequence().withIndex()) {
val frame = frames[i] ?: continue val frame = frames[i] ?: continue
when (insn.opcode) { when (insn.opcode) {
Opcodes.POP -> { Opcodes.POP -> {