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

Do not take LVT into account when calculating liveness of variables

Browse Source
This commit is contained in:
Ilmir Usmanov
2020-07-20 15:56:29 +02:00
parent 687d13a320
commit 60875f96b4
19 changed files with 32 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/coroutines/debug/debuggerMetadata.kt
Vendored
+5
View File
@@ -44,6 +44,7 @@ suspend fun named(): String {
val s8 = ""
val s9 = ""
val map = getSpilledToVariable().toMap()
println(s1 + s2 + s3 + s4 + s5 + s6 + s7 + s8 + s9)
return map["L$0"] + map["L$1"] + map["L$2"] + map["L$3"] + map["L$4"] + map["L$5"] + map["L$6"] + map["L$7"] + map["L$8"]
}
@@ -51,14 +52,17 @@ suspend fun suspended() {
dummy()
val ss = ""
suspendHere()
println(ss)
}
suspend fun multipleLocalsInOneSlot() {
for (first in 0 until 1) {
suspendHere()
println(first)
}
for (second in 0 until 1) {
suspendHere()
println(second)
}
}
@@ -78,6 +82,7 @@ fun box(): String {
dummy()
val a = ""
res = getSpilledToVariable().toMap()["L$0"] ?: "lambda fail"
println(a)
}
if (res != "a") {
return "" + res
compiler/testData/codegen/box/coroutines/debug/debuggerMetadata_ir.kt
Vendored
+5 -1
View File
@@ -3,7 +3,6 @@
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// WITH_COROUTINES
// TODO: Merge the test with debuggerMetadata when KT-28016 is fixed, particulary, do not spill 0, since it is constant.
@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER", "CANNOT_OVERRIDE_INVISIBLE_MEMBER")
@@ -45,6 +44,7 @@ suspend fun named(): String {
val s8 = ""
val s9 = ""
val map = getSpilledToVariable().toMap()
println(s1 + s2 + s3 + s4 + s5 + s6 + s7 + s8 + s9)
return map["L$0"] + map["L$1"] + map["L$2"] + map["L$3"] + map["L$4"] + map["L$5"] + map["L$6"] + map["L$7"] + map["L$8"]
}
@@ -52,14 +52,17 @@ suspend fun suspended() {
dummy()
val ss = ""
suspendHere()
println(ss)
}
suspend fun multipleLocalsInOneSlot() {
for (first in 0 until 1) {
suspendHere()
println(first)
}
for (second in 0 until 1) {
suspendHere()
println(second)
}
}
@@ -79,6 +82,7 @@ fun box(): String {
dummy()
val a = ""
res = getSpilledToVariable().toMap()["L$0"] ?: "lambda fail"
println(a)
}
if (res != "a") {
return "" + res
compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.txt
Vendored
-32
View File
@@ -4,9 +4,6 @@ public final class CrossinlineKt$box$1$filter$$inlined$source$1$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field L$4: java.lang.Object
field L$5: java.lang.Object
field label: int
synthetic field result: java.lang.Object
synthetic final field this$0: CrossinlineKt$box$1$filter$$inlined$source$1
@@ -20,9 +17,6 @@ public final class CrossinlineKt$box$1$filter$$inlined$source$1$1 {
@kotlin.coroutines.jvm.internal.DebugMetadata
public final class CrossinlineKt$box$1$filter$$inlined$source$1$lambda$1$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field label: int
synthetic field result: java.lang.Object
synthetic final field this$0: CrossinlineKt$box$1$filter$$inlined$source$1$lambda$1
@@ -62,9 +56,6 @@ public final class CrossinlineKt$box$1$filter$$inlined$source$1 {
public final class CrossinlineKt$box$1$fold$$inlined$consumeEach$1$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field L$4: java.lang.Object
field label: int
synthetic field result: java.lang.Object
synthetic final field this$0: CrossinlineKt$box$1$fold$$inlined$consumeEach$1
@@ -93,9 +84,6 @@ public final class CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field L$4: java.lang.Object
field L$5: java.lang.Object
field label: int
synthetic field result: java.lang.Object
synthetic final field this$0: CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1
@@ -109,9 +97,6 @@ public final class CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1$1 {
@kotlin.coroutines.jvm.internal.DebugMetadata
public final class CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1$2$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field label: int
synthetic field result: java.lang.Object
synthetic final field this$0: CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1$2
@@ -160,9 +145,6 @@ final class CrossinlineKt$box$1 {
synthetic final field $res: kotlin.jvm.internal.Ref$IntRef
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field L$4: java.lang.Object
field label: int
inner (anonymous) class CrossinlineKt$box$1
method <init>(p0: kotlin.jvm.internal.Ref$IntRef, p1: kotlin.coroutines.Continuation): void
@@ -201,9 +183,6 @@ public final class CrossinlineKt$filter$$inlined$source$1$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field L$4: java.lang.Object
field L$5: java.lang.Object
field label: int
synthetic field result: java.lang.Object
synthetic final field this$0: CrossinlineKt$filter$$inlined$source$1
@@ -217,9 +196,6 @@ public final class CrossinlineKt$filter$$inlined$source$1$1 {
@kotlin.coroutines.jvm.internal.DebugMetadata
public final class CrossinlineKt$filter$$inlined$source$1$lambda$1$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field label: int
synthetic field result: java.lang.Object
synthetic final field this$0: CrossinlineKt$filter$$inlined$source$1$lambda$1
@@ -259,9 +235,6 @@ public final class CrossinlineKt$filter$$inlined$source$1 {
public final class CrossinlineKt$fold$$inlined$consumeEach$1$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field L$4: java.lang.Object
field label: int
synthetic field result: java.lang.Object
synthetic final field this$0: CrossinlineKt$fold$$inlined$consumeEach$1
@@ -289,10 +262,6 @@ public final class CrossinlineKt$fold$$inlined$consumeEach$1 {
public final class CrossinlineKt$fold$1 {
// source: 'crossinline.kt'
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field L$4: java.lang.Object
field label: int
synthetic field result: java.lang.Object
inner (anonymous) class CrossinlineKt$fold$1
@@ -309,7 +278,6 @@ public final class CrossinlineKt$range$$inlined$source$1$1 {
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field L$4: java.lang.Object
field label: int
synthetic field result: java.lang.Object
synthetic final field this$0: CrossinlineKt$range$$inlined$source$1
compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline_1_2.txt
Vendored
-32
View File
@@ -3,9 +3,6 @@ public final class CrossinlineKt$box$1$doResume$$inlined$filter$1$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field L$4: java.lang.Object
field L$5: java.lang.Object
synthetic field data: java.lang.Object
synthetic field exception: java.lang.Throwable
synthetic final field this$0: CrossinlineKt$box$1$doResume$$inlined$filter$1
@@ -20,9 +17,6 @@ public final class CrossinlineKt$box$1$doResume$$inlined$filter$1$1 {
@kotlin.Metadata
public final class CrossinlineKt$box$1$doResume$$inlined$filter$1$2$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
synthetic field data: java.lang.Object
synthetic field exception: java.lang.Throwable
synthetic final field this$0: CrossinlineKt$box$1$doResume$$inlined$filter$1$2
@@ -71,9 +65,6 @@ public final class CrossinlineKt$box$1$filter$$inlined$source$1$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field L$4: java.lang.Object
field L$5: java.lang.Object
synthetic field data: java.lang.Object
synthetic field exception: java.lang.Throwable
synthetic final field this$0: CrossinlineKt$box$1$filter$$inlined$source$1
@@ -88,9 +79,6 @@ public final class CrossinlineKt$box$1$filter$$inlined$source$1$1 {
@kotlin.Metadata
public final class CrossinlineKt$box$1$filter$$inlined$source$1$lambda$1$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
synthetic field data: java.lang.Object
synthetic field exception: java.lang.Throwable
synthetic final field this$0: CrossinlineKt$box$1$filter$$inlined$source$1$lambda$1
@@ -131,9 +119,6 @@ public final class CrossinlineKt$box$1$filter$$inlined$source$1 {
public final class CrossinlineKt$box$1$fold$$inlined$consumeEach$1$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field L$4: java.lang.Object
synthetic field data: java.lang.Object
synthetic field exception: java.lang.Throwable
synthetic final field this$0: CrossinlineKt$box$1$fold$$inlined$consumeEach$1
@@ -164,9 +149,6 @@ final class CrossinlineKt$box$1 {
synthetic final field $res: kotlin.jvm.internal.Ref$IntRef
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field L$4: java.lang.Object
inner (anonymous) class CrossinlineKt$box$1
method <init>(p0: kotlin.jvm.internal.Ref$IntRef, p1: kotlin.coroutines.experimental.Continuation): void
public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): kotlin.coroutines.experimental.Continuation
@@ -205,9 +187,6 @@ public final class CrossinlineKt$filter$$inlined$source$1$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field L$4: java.lang.Object
field L$5: java.lang.Object
synthetic field data: java.lang.Object
synthetic field exception: java.lang.Throwable
synthetic final field this$0: CrossinlineKt$filter$$inlined$source$1
@@ -222,9 +201,6 @@ public final class CrossinlineKt$filter$$inlined$source$1$1 {
@kotlin.Metadata
public final class CrossinlineKt$filter$$inlined$source$1$lambda$1$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
synthetic field data: java.lang.Object
synthetic field exception: java.lang.Throwable
synthetic final field this$0: CrossinlineKt$filter$$inlined$source$1$lambda$1
@@ -265,9 +241,6 @@ public final class CrossinlineKt$filter$$inlined$source$1 {
public final class CrossinlineKt$fold$$inlined$consumeEach$1$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field L$4: java.lang.Object
synthetic field data: java.lang.Object
synthetic field exception: java.lang.Throwable
synthetic final field this$0: CrossinlineKt$fold$$inlined$consumeEach$1
@@ -296,10 +269,6 @@ public final class CrossinlineKt$fold$$inlined$consumeEach$1 {
public final class CrossinlineKt$fold$1 {
// source: 'crossinline.kt'
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field L$4: java.lang.Object
synthetic field data: java.lang.Object
synthetic field exception: java.lang.Throwable
inner (anonymous) class CrossinlineKt$fold$1
@@ -317,7 +286,6 @@ public final class CrossinlineKt$range$$inlined$source$1$1 {
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field L$4: java.lang.Object
synthetic field data: java.lang.Object
synthetic field exception: java.lang.Throwable
synthetic final field this$0: CrossinlineKt$range$$inlined$source$1
compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline_ir.txt
Vendored
-20
View File
@@ -4,9 +4,6 @@ public final class CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field L$4: java.lang.Object
field L$5: java.lang.Object
field label: int
synthetic field result: java.lang.Object
synthetic final field this$0: CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1
@@ -20,8 +17,6 @@ public final class CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1$1 {
@kotlin.coroutines.jvm.internal.DebugMetadata
public final class CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1$2$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field label: int
synthetic field result: java.lang.Object
synthetic final field this$0: CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1$2
@@ -69,9 +64,6 @@ final class CrossinlineKt$box$1 {
synthetic final field $res: kotlin.jvm.internal.Ref$IntRef
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field L$4: java.lang.Object
field label: int
inner (anonymous) class CrossinlineKt$box$1
method <init>(p0: kotlin.jvm.internal.Ref$IntRef, p1: kotlin.coroutines.Continuation): void
@@ -110,9 +102,6 @@ public final class CrossinlineKt$filter$$inlined$source$1$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field L$4: java.lang.Object
field L$5: java.lang.Object
field label: int
synthetic field result: java.lang.Object
synthetic final field this$0: CrossinlineKt$filter$$inlined$source$1
@@ -138,8 +127,6 @@ public final class CrossinlineKt$filter$$inlined$source$1 {
@kotlin.coroutines.jvm.internal.DebugMetadata
public final class CrossinlineKt$filter$lambda-3$$inlined$consumeEach$1$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field label: int
synthetic field result: java.lang.Object
synthetic final field this$0: CrossinlineKt$filter$lambda-3$$inlined$consumeEach$1
@@ -167,8 +154,6 @@ public final class CrossinlineKt$filter$lambda-3$$inlined$consumeEach$1 {
public final class CrossinlineKt$fold$$inlined$consumeEach$1$1 {
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field label: int
synthetic field result: java.lang.Object
synthetic final field this$0: CrossinlineKt$fold$$inlined$consumeEach$1
@@ -196,10 +181,6 @@ public final class CrossinlineKt$fold$$inlined$consumeEach$1 {
final class CrossinlineKt$fold$1 {
// source: 'crossinline.kt'
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
field L$3: java.lang.Object
field L$4: java.lang.Object
field label: int
synthetic field result: java.lang.Object
inner (anonymous) class CrossinlineKt$fold$1
@@ -212,7 +193,6 @@ final class CrossinlineKt$fold$1 {
public final class CrossinlineKt$range$$inlined$source$1$1 {
field I$0: int
field I$1: int
field I$2: int
field L$0: java.lang.Object
field L$1: java.lang.Object
field L$2: java.lang.Object
compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.txt
Vendored
-1
View File
@@ -51,7 +51,6 @@ public final class flow/InnerObjectRetransformationKt$check$$inlined$flowWith$1
@kotlin.coroutines.jvm.internal.DebugMetadata
final class flow/InnerObjectRetransformationKt$check$1 {
// source: 'innerObjectRetransformation.kt'
field L$0: java.lang.Object
field label: int
synthetic field result: java.lang.Object
inner (anonymous) class flow/InnerObjectRetransformationKt$check$1
compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation_1_2.txt
Vendored
-1
View File
@@ -48,7 +48,6 @@ public final class flow/InnerObjectRetransformationKt$check$$inlined$flowWith$1
@kotlin.Metadata
final class flow/InnerObjectRetransformationKt$check$1 {
// source: 'innerObjectRetransformation.kt'
field L$0: java.lang.Object
synthetic field data: java.lang.Object
synthetic field exception: java.lang.Throwable
inner (anonymous) class flow/InnerObjectRetransformationKt$check$1
compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation_ir.txt
Vendored
-1
View File
@@ -51,7 +51,6 @@ public final class flow/InnerObjectRetransformationKt$check$$inlined$flowWith$1
@kotlin.Metadata
final class flow/InnerObjectRetransformationKt$check$1 {
// source: 'innerObjectRetransformation.kt'
field L$0: java.lang.Object
field label: int
synthetic field result: java.lang.Object
inner (anonymous) class flow/InnerObjectRetransformationKt$check$1