diff --git a/compiler/testData/codegen/box/coroutines/javaInterop/objectWithSeveralSuspends.kt b/compiler/testData/codegen/box/coroutines/javaInterop/objectWithSeveralSuspends.kt index 45d6255c449..cca2a55c4b0 100644 --- a/compiler/testData/codegen/box/coroutines/javaInterop/objectWithSeveralSuspends.kt +++ b/compiler/testData/codegen/box/coroutines/javaInterop/objectWithSeveralSuspends.kt @@ -62,17 +62,25 @@ inline fun inlineMe3(crossinline c: suspend () -> Unit) = object: SuspendRunnabl import test.InlineMeKt; import helpers.CoroutineUtilKt; import helpers.EmptyContinuation; +import kotlin.jvm.functions.Function1; +import COROUTINES_PACKAGE.Continuation; import kotlin.Unit; public class A { + static Function1, Object> callback = new Function1, Object>() { + @Override + public Object invoke(Continuation continuation) { + return CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation); + } + }; public static Object call() { - return InlineMeKt.inlineMe((continuation) -> CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation)); + return InlineMeKt.inlineMe(callback); } public static Object call2() { - return InlineMeKt.inlineMe2((continuation) -> CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation)); + return InlineMeKt.inlineMe2(callback); } public static Object call3() { - return InlineMeKt.inlineMe3((continuation) -> CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation)); + return InlineMeKt.inlineMe3(callback); } } diff --git a/compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt b/compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt index bb0a70bebad..832709d258f 100644 --- a/compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt +++ b/compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt @@ -32,17 +32,25 @@ inline fun inlineMe3(crossinline c: suspend () -> Unit) = suspend { import test.InlineMeKt; import helpers.CoroutineUtilKt; import helpers.EmptyContinuation; +import kotlin.jvm.functions.Function1; +import COROUTINES_PACKAGE.Continuation; import kotlin.Unit; public class A { + static Function1, Object> callback = new Function1, Object>() { + @Override + public Object invoke(Continuation continuation) { + return CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation); + } + }; public static Object call() { - return InlineMeKt.inlineMe((continuation) -> CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation)); + return InlineMeKt.inlineMe(callback); } public static Object call2() { - return InlineMeKt.inlineMe2((continuation) -> CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation)); + return InlineMeKt.inlineMe2(callback); } public static Object call3() { - return InlineMeKt.inlineMe3((continuation) -> CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation)); + return InlineMeKt.inlineMe3(callback); } } diff --git a/compiler/testData/codegen/box/coroutines/javaInterop/returnObject.kt b/compiler/testData/codegen/box/coroutines/javaInterop/returnObject.kt index bcb1dad733b..5ab2afe9c6a 100644 --- a/compiler/testData/codegen/box/coroutines/javaInterop/returnObject.kt +++ b/compiler/testData/codegen/box/coroutines/javaInterop/returnObject.kt @@ -42,17 +42,25 @@ inline fun inlineMe3(crossinline c: suspend () -> Unit) = object: SuspendRunnabl import test.InlineMeKt; import helpers.CoroutineUtilKt; import helpers.EmptyContinuation; +import kotlin.jvm.functions.Function1; +import COROUTINES_PACKAGE.Continuation; import kotlin.Unit; public class A { + static Function1, Object> callback = new Function1, Object>() { + @Override + public Object invoke(Continuation continuation) { + return CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation); + } + }; public static Object call() { - return InlineMeKt.inlineMe((continuation) -> CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation)); + return InlineMeKt.inlineMe(callback); } public static Object call2() { - return InlineMeKt.inlineMe2((continuation) -> CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation)); + return InlineMeKt.inlineMe2(callback); } public static Object call3() { - return InlineMeKt.inlineMe3((continuation) -> CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation)); + return InlineMeKt.inlineMe3(callback); } } diff --git a/compiler/testData/codegen/box/coroutines/javaInterop/severalCaptures.kt b/compiler/testData/codegen/box/coroutines/javaInterop/severalCaptures.kt index a888fe5d71d..1415b0b3d55 100644 --- a/compiler/testData/codegen/box/coroutines/javaInterop/severalCaptures.kt +++ b/compiler/testData/codegen/box/coroutines/javaInterop/severalCaptures.kt @@ -72,27 +72,31 @@ inline fun inlineMe5(crossinline c1: suspend () -> Unit) = inlineMe({ c1(); c1() import test.InlineMeKt; import helpers.CoroutineUtilKt; import helpers.EmptyContinuation; +import kotlin.jvm.functions.Function1; +import COROUTINES_PACKAGE.Continuation; import kotlin.Unit; public class A { + static Function1, Object> callback = new Function1, Object>() { + @Override + public Object invoke(Continuation continuation) { + return CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation); + } + }; public static Object call() { - return InlineMeKt.inlineMe((continuation) -> CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation), - (continuation) -> CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation)); + return InlineMeKt.inlineMe(callback, callback); } public static Object call2() { - return InlineMeKt.inlineMe2((continuation) -> CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation), - (continuation) -> CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation)); + return InlineMeKt.inlineMe2(callback, callback); } public static Object call3() { - return InlineMeKt.inlineMe3((continuation) -> CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation), - (continuation) -> CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation)); + return InlineMeKt.inlineMe3(callback, callback); } public static Object call4() { - return InlineMeKt.inlineMe4((continuation) -> CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation), - (continuation) -> CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation)); + return InlineMeKt.inlineMe4(callback, callback); } public static Object call5() { - return InlineMeKt.inlineMe5((continuation) -> CoroutineUtilKt.getStateMachineChecker().suspendHere(continuation)); + return InlineMeKt.inlineMe5(callback); } }