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

JVM_IR: fix name of received field for suspend lambdas

Browse Source 
$ at the start caused AnonymousObjectTransformer to skip the field.
This commit is contained in:
Georgy Bronnikov
2019-12-21 15:26:16 +03:00
committed by Ilmir Usmanov
parent 068d3f4beb
commit d4b0151f51
10 changed files with 58 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AddContinuationLowering.kt
+2 -1
View File
@@ -110,7 +110,8 @@ private class AddContinuationLowering(private val context: JvmBackendContext) :
val receiverField = info.function.extensionReceiverParameter?.let {
assert(info.arity != 0)
addField("\$p", it.type)
// Do not put '$' at the start, to avoid being caught by inlineCodegenUtils.isCapturedFieldName()
addField("p\$", it.type)
}
val parametersFields = info.function.valueParameters.map { addField(it.name.asString(), it.type) }
compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver_ir.txt
Vendored
+1 -1
View File
@@ -1,8 +1,8 @@
@kotlin.coroutines.jvm.internal.DebugMetadata
@kotlin.Metadata
final class LambdaWithLongReceiverKt$box$1$1 {
private field $p: long
private field label: int
private field p$: long
inner class LambdaWithLongReceiverKt$box$1
inner class LambdaWithLongReceiverKt$box$1$1
public method <init>(p0: kotlin.coroutines.Continuation): void
compiler/testData/codegen/box/coroutines/stopAfter.kt
Vendored
+25
View File
@@ -0,0 +1,25 @@
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_RUNTIME
/**
* _Example_
* The following will print `1`, `2` and `3` when executed:
* ```
* arrayOf(1, 2, 3, 4, 5)
* .iterator()
* .stopAfter { it == 3 }
* .forEach(::println)
* ```
* @return an iterator, which stops [this] Iterator after first element for which [predicate] returns `true`
*/
inline fun <T> Iterator<T>.stopAfter(crossinline predicate: (T) -> Boolean): Iterator<T> = iterator {
for (element in this@stopAfter) {
yield(element)
if (predicate(element)) {
break
}
}
}
fun box() =
listOf("OK", "fail").iterator().stopAfter { it == "OK" }.next()
compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
// FILE: test.kt
// COMMON_COROUTINES_TEST
// WITH_RUNTIME
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
Generated
+5
View File
@@ -6539,6 +6539,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt", "kotlin.coroutines");
}
@TestMetadata("stopAfter.kt")
public void testStopAfter() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/stopAfter.kt");
}
@TestMetadata("suspendCallsInArguments.kt")
public void testSuspendCallsInArguments_1_2() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt", "kotlin.coroutines.experimental");
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -6539,6 +6539,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt", "kotlin.coroutines");
}
@TestMetadata("stopAfter.kt")
public void testStopAfter() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/stopAfter.kt");
}
@TestMetadata("suspendCallsInArguments.kt")
public void testSuspendCallsInArguments_1_2() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt", "kotlin.coroutines.experimental");
compiler/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java
Generated
+5
View File
@@ -6179,6 +6179,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt", "kotlin.coroutines");
}
@TestMetadata("stopAfter.kt")
public void testStopAfter() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/stopAfter.kt");
}
@TestMetadata("suspendCallsInArguments.kt")
public void testSuspendCallsInArguments_1_3() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt", "kotlin.coroutines");
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
Generated
+5
View File
@@ -6179,6 +6179,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt", "kotlin.coroutines");
}
@TestMetadata("stopAfter.kt")
public void testStopAfter() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/stopAfter.kt");
}
@TestMetadata("suspendCallsInArguments.kt")
public void testSuspendCallsInArguments_1_3() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt", "kotlin.coroutines");
js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -5269,6 +5269,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt", "kotlin.coroutines");
}
@TestMetadata("stopAfter.kt")
public void testStopAfter() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/stopAfter.kt");
}
@TestMetadata("suspendCallsInArguments.kt")
public void testSuspendCallsInArguments_1_3() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt", "kotlin.coroutines");
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -5589,6 +5589,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt", "kotlin.coroutines");
}
@TestMetadata("stopAfter.kt")
public void testStopAfter() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/stopAfter.kt");
}
@TestMetadata("suspendCallsInArguments.kt")
public void testSuspendCallsInArguments_1_2() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt", "kotlin.coroutines.experimental");