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

JVM_IR KT-45377 rewrite constants again after AddContinuationLowering

Browse Source
This commit is contained in:
Dmitry Petrov
2021-03-22 21:22:11 +03:00
committed by TeamCityServer
parent 0f2aca3280
commit 4f250ed498
10 changed files with 90 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -9066,6 +9066,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/coroutines/kt44221.kt");
}
@Test
@TestMetadata("kt45377.kt")
public void testKt45377() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/kt45377.kt");
}
@Test
@TestMetadata("lastExpressionIsLoop.kt")
public void testLastExpressionIsLoop() throws Exception {
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLower.kt
+2 -1
View File
@@ -336,7 +336,7 @@ private val jvmFilePhases = listOf(
functionReferencePhase,
suspendLambdaPhase,
propertyReferencePhase,
constPhase,
constPhase1,
// TODO: merge the next three phases together, as visitors behave incorrectly between them
// (backing fields moved out of companion objects are reachable by two paths):
moveOrCopyCompanionObjectFieldsPhase,
@@ -386,6 +386,7 @@ private val jvmFilePhases = listOf(
tailCallOptimizationPhase,
addContinuationPhase,
constPhase2, // handle const properties in default arguments of "original" suspend funs
innerClassesPhase,
innerClassesMemberBodyPhase,
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ConstLowering.kt
+8 -2
View File
@@ -20,9 +20,15 @@ import org.jetbrains.kotlin.ir.types.isPrimitiveType
import org.jetbrains.kotlin.ir.types.isStringClassType
import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
internal val constPhase = makeIrFilePhase(
internal val constPhase1 = makeIrFilePhase(
::ConstLowering,
name = "Const",
name = "Const1",
description = "Substitute calls to const properties with constant values"
)
internal val constPhase2 = makeIrFilePhase(
::ConstLowering,
name = "Const2",
description = "Substitute calls to const properties with constant values"
)
compiler/testData/codegen/box/coroutines/kt45377.kt
Vendored
+42
View File
@@ -0,0 +1,42 @@
// WITH_RUNTIME
// FILE: kt45377.kt
import kotlin.coroutines.*
fun runs(f: suspend () -> String): String {
var result = ""
f.startCoroutine(Continuation(EmptyCoroutineContext) { result = it.getOrThrow() })
return result
}
fun box(): String {
val b = B("O")
val s1 = runs { b.foo() }
if (s1 != "OK") return "Failed: s1=$s1"
var s2 = runs { b.foo("K") }
if (s2 != "OK") return "Failed: s2=$s2"
val a: A = b
val s3 = runs { a.foo() }
if (s3 != "OK") return "Failed: s3=$s3"
val s4 = runs { a.foo("K")}
if (s4 != "OK") return "Failed: s4=$s4"
return "OK"
}
// FILE: file1.kt
private const val K = "K"
interface A {
suspend fun foo(k: String = K): String
}
// FILE: file2.kt
class B(val o: String) : A {
override suspend fun foo(k: String) = o + k
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -9066,6 +9066,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/coroutines/kt44221.kt");
}
@Test
@TestMetadata("kt45377.kt")
public void testKt45377() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/kt45377.kt");
}
@Test
@TestMetadata("lastExpressionIsLoop.kt")
public void testLastExpressionIsLoop() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -9066,6 +9066,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/coroutines/kt44221.kt");
}
@Test
@TestMetadata("kt45377.kt")
public void testKt45377() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/kt45377.kt");
}
@Test
@TestMetadata("lastExpressionIsLoop.kt")
public void testLastExpressionIsLoop() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -7079,6 +7079,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/coroutines/kt44221.kt");
}
@TestMetadata("kt45377.kt")
public void testKt45377() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/kt45377.kt");
}
@TestMetadata("lastExpressionIsLoop.kt")
public void testLastExpressionIsLoop() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
Generated
+5
View File
@@ -6328,6 +6328,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
runTest("compiler/testData/codegen/box/coroutines/kt44221.kt");
}
@TestMetadata("kt45377.kt")
public void testKt45377() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/kt45377.kt");
}
@TestMetadata("lastExpressionIsLoop.kt")
public void testLastExpressionIsLoop() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -5749,6 +5749,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/coroutines/kt44221.kt");
}
@TestMetadata("kt45377.kt")
public void testKt45377() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/kt45377.kt");
}
@TestMetadata("lastExpressionIsLoop.kt")
public void testLastExpressionIsLoop() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -5749,6 +5749,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/coroutines/kt44221.kt");
}
@TestMetadata("kt45377.kt")
public void testKt45377() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/kt45377.kt");
}
@TestMetadata("lastExpressionIsLoop.kt")
public void testLastExpressionIsLoop() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt");