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

JVM_IR: fix load check in inliner (should accept primitives too)

Browse Source
This commit is contained in:
pyos
2019-11-06 16:42:42 +01:00
committed by max-kammerer
parent 4164b620e8
commit fb9f43c119
4 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.kt
+1 -1
View File
@@ -901,7 +901,7 @@ class MethodInliner(
var cur: AbstractInsnNode? = node.instructions.first var cur: AbstractInsnNode? = node.instructions.first
while (cur != null) { while (cur != null) {
if (cur is VarInsnNode && cur.opcode == Opcodes.ALOAD && map.contains(cur.`var`)) { if (cur is VarInsnNode && cur.opcode in Opcodes.ILOAD..Opcodes.ALOAD && map.contains(cur.`var`)) {
val varIndex = cur.`var` val varIndex = cur.`var`
val capturedParamDesc = map[varIndex]!! val capturedParamDesc = map[varIndex]!!
compiler/testData/codegen/boxInline/capture/captureInlinable.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
// IGNORE_BACKEND: JVM_IR
// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
// FILE: 1.kt // FILE: 1.kt
package test package test
compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
// IGNORE_BACKEND: JVM_IR
// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
// FILE: 1.kt // FILE: 1.kt
package test package test
compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
// IGNORE_BACKEND: JVM_IR
// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
// FILE: 1.kt // FILE: 1.kt
package test package test