diff --git a/compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionDisabled.kt b/compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionDisabled.kt index 1981ecc6c7a..b9da206e874 100644 --- a/compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionDisabled.kt +++ b/compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionDisabled.kt @@ -2,12 +2,10 @@ // KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - package suspendFunctionAssertionDisabled import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* class Checker { suspend fun check() { @@ -33,4 +31,4 @@ fun box(): String { builder { c.check() } return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionsEnabled.kt b/compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionsEnabled.kt index e843ffcb26d..a937c0c5bb8 100644 --- a/compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionsEnabled.kt +++ b/compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionsEnabled.kt @@ -2,12 +2,10 @@ // KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - package suspendFunctionAssertionsEnabled import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* class Checker { suspend fun check() { @@ -37,4 +35,4 @@ fun box(): String { } return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsDisabled.kt b/compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsDisabled.kt index a3425c11bf5..098235714c0 100644 --- a/compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsDisabled.kt +++ b/compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsDisabled.kt @@ -2,12 +2,10 @@ // KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - package suspendLambdaAssertionsDisabled import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* class Checker { fun check() { @@ -33,4 +31,4 @@ fun box(): String { c.check() return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsEnabled.kt b/compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsEnabled.kt index 4328c0d333d..e9f3ebc920f 100644 --- a/compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsEnabled.kt +++ b/compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsEnabled.kt @@ -2,12 +2,10 @@ // KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - package suspendLambdaAssertionsEnabled import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* class Checker { fun check() { @@ -37,4 +35,4 @@ fun box(): String { } return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt b/compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt index 4a6150b2030..8aebf31e159 100644 --- a/compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt +++ b/compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt @@ -3,11 +3,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt b/compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt index c64f4d1f374..0a01d53ca1d 100644 --- a/compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt +++ b/compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt @@ -2,11 +2,9 @@ // WASM_MUTE_REASON: UNIT_ISSUES // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/contracts/kt39374.kt b/compiler/testData/codegen/box/contracts/kt39374.kt index 708010d3e92..e69bdf6f00d 100644 --- a/compiler/testData/codegen/box/contracts/kt39374.kt +++ b/compiler/testData/codegen/box/contracts/kt39374.kt @@ -2,10 +2,8 @@ // WITH_RUNTIME // KJS_WITH_FULL_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import kotlin.contracts.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* @ExperimentalContracts @@ -31,4 +29,4 @@ val z: S = S.Z() @ExperimentalContracts fun box(): String = when (val w = z) { is S.Z -> runBlocking { w.f() } -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt b/compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt index 92c1aa88445..f76e008e42d 100644 --- a/compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt +++ b/compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere( diff --git a/compiler/testData/codegen/box/coroutines/accessorForSuspend.kt b/compiler/testData/codegen/box/coroutines/accessorForSuspend.kt index e35dfb3e971..48e7f1b0705 100644 --- a/compiler/testData/codegen/box/coroutines/accessorForSuspend.kt +++ b/compiler/testData/codegen/box/coroutines/accessorForSuspend.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/async.kt b/compiler/testData/codegen/box/coroutines/async.kt index c3a29497255..e432aafa5d9 100644 --- a/compiler/testData/codegen/box/coroutines/async.kt +++ b/compiler/testData/codegen/box/coroutines/async.kt @@ -1,13 +1,12 @@ // SKIP_JDK6 // TARGET_BACKEND: JVM // WITH_RUNTIME -// COMMON_COROUTINES_TEST // FULL_JDK // WITH_COROUTINES import java.util.concurrent.CompletableFuture -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun foo(): CompletableFuture = CompletableFuture.supplyAsync { "foo" } fun bar(v: String): CompletableFuture = CompletableFuture.supplyAsync { "bar with $v" } diff --git a/compiler/testData/codegen/box/coroutines/asyncException.kt b/compiler/testData/codegen/box/coroutines/asyncException.kt index f7dd341c2b9..3c4c83a142b 100644 --- a/compiler/testData/codegen/box/coroutines/asyncException.kt +++ b/compiler/testData/codegen/box/coroutines/asyncException.kt @@ -1,13 +1,12 @@ // SKIP_JDK6 // TARGET_BACKEND: JVM // WITH_RUNTIME -// COMMON_COROUTINES_TEST // FULL_JDK // WITH_COROUTINES import java.util.concurrent.CompletableFuture -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun exception(v: String): CompletableFuture = CompletableFuture.supplyAsync { throw RuntimeException(v) } diff --git a/compiler/testData/codegen/box/coroutines/await.kt b/compiler/testData/codegen/box/coroutines/await.kt index a47acf9136e..1c6e084f587 100644 --- a/compiler/testData/codegen/box/coroutines/await.kt +++ b/compiler/testData/codegen/box/coroutines/await.kt @@ -1,11 +1,10 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // FILE: promise.kt import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Promise(private val executor: ((T) -> Unit) -> Unit) { private var value: Any? = null @@ -53,8 +52,8 @@ fun processQueue() { // FILE: await.kt import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* private var log = "" @@ -99,8 +98,8 @@ fun asyncOperation(resultSupplier: () -> T) = Promise { resolve -> fun getLog() = log // FILE: main.kt -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* private fun test() = async { val o = await(asyncOperation { "O" }) diff --git a/compiler/testData/codegen/box/coroutines/beginWithException.kt b/compiler/testData/codegen/box/coroutines/beginWithException.kt index d259f4b6e45..f49f36f6144 100644 --- a/compiler/testData/codegen/box/coroutines/beginWithException.kt +++ b/compiler/testData/codegen/box/coroutines/beginWithException.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(): Any = suspendCoroutineUninterceptedOrReturn { x -> } diff --git a/compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt b/compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt index 3e1e1d7e1b0..d6435b1679f 100644 --- a/compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt +++ b/compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(): Any = suspendCoroutineUninterceptedOrReturn { x ->} fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt b/compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt index e7fb2356c1c..8219ba77c79 100644 --- a/compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt +++ b/compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt @@ -1,9 +1,7 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* interface I1 { suspend fun f(a: A, b: B): String diff --git a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.kt b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.kt index 126678efe35..a55c3f22157 100644 --- a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.kt +++ b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.kt @@ -1,10 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // CHECK_BYTECODE_LISTING import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.kt b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.kt index d8b34165fbe..eaacff10bad 100644 --- a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.kt +++ b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.kt @@ -1,10 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // CHECK_BYTECODE_LISTING import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(c: suspend() -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt b/compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt index 3606d4c0ea7..4bd01f09560 100644 --- a/compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt +++ b/compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(): String { var z = "fail1" @@ -28,4 +26,4 @@ fun box(): String { } return result -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt b/compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt index e793d5d9372..a5b7d713e9d 100644 --- a/compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt +++ b/compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var result = "FAIL" @@ -34,4 +33,4 @@ fun builder(c: suspend Controller.() -> Unit): String { fun box(): String { return builder() { bar() } -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/coercionToUnit.kt b/compiler/testData/codegen/box/coroutines/coercionToUnit.kt index f26e8fdf6d0..f3a90c11316 100644 --- a/compiler/testData/codegen/box/coroutines/coercionToUnit.kt +++ b/compiler/testData/codegen/box/coroutines/coercionToUnit.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun await(t: T): T = suspendCoroutineUninterceptedOrReturn { c -> diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt b/compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt index e9000bb7ae7..2e7ab381301 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt @@ -2,10 +2,9 @@ // IGNORE_BACKEND: JS // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt b/compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt index 287a5efa163..caa4b89ad54 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt @@ -1,10 +1,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/complexChainSuspend.kt b/compiler/testData/codegen/box/coroutines/controlFlow/complexChainSuspend.kt index e3d48fcb9b8..9884582c4e8 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/complexChainSuspend.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/complexChainSuspend.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var result = "" diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt b/compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt index d25fc2bf712..16e7072e9cf 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/doubleBreak.kt b/compiler/testData/codegen/box/coroutines/controlFlow/doubleBreak.kt index a6606899ddb..3e8bb7bae2a 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/doubleBreak.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/doubleBreak.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { @@ -67,4 +66,4 @@ fun box(): String { if (res != "slh;rlh;rlb;slt;slh;rlh;rlc;slb;return;") return "FAIL: $res" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/finallyCatch.kt b/compiler/testData/codegen/box/coroutines/controlFlow/finallyCatch.kt index 5d664329e7e..1b7ee4516e6 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/finallyCatch.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/finallyCatch.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var result = "" @@ -41,4 +40,4 @@ fun builder(c: suspend Controller.() -> Unit): String { fun box(): String { return builder { result = bars() } -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt b/compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt index 1fc095f3854..961074283d5 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt @@ -1,10 +1,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt b/compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt index 4bb0bea41c7..f104c41e9e5 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt @@ -1,10 +1,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt b/compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt index cf85b08bcdc..957ea5d903b 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt @@ -1,10 +1,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt b/compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt index ba14d5e6f5e..05475b66c00 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt @@ -1,10 +1,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt b/compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt index 205634c1a0c..29a0e6af31c 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit): Unit { c.startCoroutine(handleResultContinuation { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/multipleCatchBlocksSuspend.kt b/compiler/testData/codegen/box/coroutines/controlFlow/multipleCatchBlocksSuspend.kt index bed07027828..0d7ddc28946 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/multipleCatchBlocksSuspend.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/multipleCatchBlocksSuspend.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var result = "" diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt b/compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt index 8ea2cedaf8f..695002a438b 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* @@ -52,4 +51,4 @@ fun box(): String { if (res != "log(1);suspend(2);log(3);return(4);") return "FAIL: $res" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/returnWithFinally.kt b/compiler/testData/codegen/box/coroutines/controlFlow/returnWithFinally.kt index 440f86654b4..0d6a9786623 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/returnWithFinally.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/returnWithFinally.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var result = "" diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/suspendInStringTemplate.kt b/compiler/testData/codegen/box/coroutines/controlFlow/suspendInStringTemplate.kt index 851229874e0..3dfff638c64 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/suspendInStringTemplate.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/suspendInStringTemplate.kt @@ -1,10 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // IGNORE_BACKEND: JS import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* // KT-36897 @@ -26,4 +25,4 @@ fun box(): String { } return result -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt b/compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt index 38bc1800523..275ce510683 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt @@ -1,10 +1,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt b/compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt index bb9036e2c3f..c7200720390 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/throwFromFinally.kt b/compiler/testData/codegen/box/coroutines/controlFlow/throwFromFinally.kt index 5ab5f60cd78..834359066c6 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/throwFromFinally.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/throwFromFinally.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var result = "" @@ -62,4 +61,4 @@ fun box(): String { if (res != "try;try(t);catch;return;") return "FAIL: $res" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt b/compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt index d01e25273c0..c8a267ea0d1 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt b/compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt index bc6735b3f9c..58df295846f 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "" @@ -44,4 +43,4 @@ fun box():String { id("b") if (result != "a012b") return "FAIL: $result" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt b/compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt index 1065573ddb1..d8c168e5e29 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt @@ -1,10 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.Continuation -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.Continuation +import kotlin.coroutines.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt b/compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt index 4072acf4bed..40b08bd2ac1 100644 --- a/compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt +++ b/compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var result = false diff --git a/compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt b/compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt index 8c018988501..bb6039a50bd 100644 --- a/compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt +++ b/compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt @@ -1,8 +1,7 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* inline fun inlinedLambda(block: () -> Unit) { return block() @@ -31,4 +30,4 @@ fun box(): String { } } return res -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt b/compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt index 8da10cbc5aa..8f6553ba9c9 100644 --- a/compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt +++ b/compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { val x = c.createCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt b/compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt index 668053126de..fa3dd5a07ce 100644 --- a/compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt +++ b/compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt @@ -3,10 +3,9 @@ // IGNORE_BACKEND: JS_IR_ES6 // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.ContinuationAdapter fun runCustomLambdaAsCoroutine(e: Throwable? = null, x: (Continuation) -> Any?): String { diff --git a/compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt b/compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt index 296199d5562..4c7384f25df 100644 --- a/compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt +++ b/compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME -// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* interface Consumer { fun consume(s: String) } diff --git a/compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt b/compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt index 37c31f507fd..d90883f2319 100644 --- a/compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt +++ b/compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(a: String = "abc", i: Int = 2): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt b/compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt index 0ab41fbf21d..42a74baf42e 100644 --- a/compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt +++ b/compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "fail" @@ -29,4 +27,4 @@ fun box(): String { } return result -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/dispatchResume.kt b/compiler/testData/codegen/box/coroutines/dispatchResume.kt index 5f84e849ae1..0b19f347c6a 100644 --- a/compiler/testData/codegen/box/coroutines/dispatchResume.kt +++ b/compiler/testData/codegen/box/coroutines/dispatchResume.kt @@ -1,10 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // FULL_JDK import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var log = "" diff --git a/compiler/testData/codegen/box/coroutines/emptyClosure.kt b/compiler/testData/codegen/box/coroutines/emptyClosure.kt index 73d54cfd669..8146a6a4c8b 100644 --- a/compiler/testData/codegen/box/coroutines/emptyClosure.kt +++ b/compiler/testData/codegen/box/coroutines/emptyClosure.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = 0 diff --git a/compiler/testData/codegen/box/coroutines/epam.kt b/compiler/testData/codegen/box/coroutines/epam.kt index f388c03238d..e8422f0a507 100644 --- a/compiler/testData/codegen/box/coroutines/epam.kt +++ b/compiler/testData/codegen/box/coroutines/epam.kt @@ -1,10 +1,9 @@ // FULL_JDK -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* class MyDeferred(val t: suspend () -> T) { suspend fun await() = t() @@ -29,4 +28,4 @@ fun box(): String { result = zip(first, second) { firstValue: Int, secondValue: Int -> firstValue + secondValue }.await() } return if (result == 3) "OK" else "FAIL $result" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt b/compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt index 00357aa8264..f23d75b5f32 100644 --- a/compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt +++ b/compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(v: T): T = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt index c3b5ccd0398..9347c3e330a 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt @@ -1,10 +1,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class A { var result = mutableListOf("O", "K", null) diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt index e9f58439168..e1bb79bedb6 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt @@ -2,10 +2,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt index 4a4c44d03b3..38d12584c1d 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt @@ -1,10 +1,8 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import kotlin.properties.Delegates class Pipe { diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt index e65f3f23746..8ede15ed52e 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* data class A(val o: String) { operator fun component2(): String = "K" diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt index e7cb0c2d18e..d53f464b26f 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt @@ -1,10 +1,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt index 6e9ef63419b..0e5b3198637 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class A(val w: String) { suspend fun String.ext(): String = suspendCoroutineUninterceptedOrReturn { diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt index 64305315c39..9db95a1c021 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class A(val w: String) { suspend fun Long.ext(): String = suspendCoroutineUninterceptedOrReturn { diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt index c8e7b616b80..5f15aca8868 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* data class A(val o: String) { operator suspend fun component2(): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendInlineSuspendFinally.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendInlineSuspendFinally.kt index 7b7b4342d2e..ddbf1cbfa81 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendInlineSuspendFinally.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendInlineSuspendFinally.kt @@ -1,10 +1,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt index 2328571d9b2..9963fabcb7e 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt @@ -1,10 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendThere(v: A): A = suspendCoroutineUninterceptedOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt index 6f369b93679..f30c90874f4 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt @@ -1,10 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendThere(v: A): A = suspendCoroutineUninterceptedOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt index fe1df792459..9b1a24626ca 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt @@ -1,10 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendThere(v: A): A = suspendCoroutineUninterceptedOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt index 58b8f89974e..ebee646d974 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt @@ -1,10 +1,8 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* class CompilerKillingIterator(private val underlying: Iterator, private val transform: suspend (e: T) -> Iterator) { private var currentIt: Iterator = object : Iterator { @@ -40,4 +38,4 @@ fun box(): String { } } return res -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt index 334020019c7..599d627ff21 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt @@ -1,10 +1,8 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* class CompilerKillingIterator(private val underlying: Iterator, private val transform: suspend (e: T) -> Iterator) { private var currentIt: Iterator = object : Iterator { @@ -40,4 +38,4 @@ fun box(): String { } } return res -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt index f10fbcdfe89..85d42f8afda 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt @@ -1,10 +1,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import kotlin.test.assertEquals suspend fun ArrayList.yield(v: Int): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt index b3093221741..89989b58559 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt @@ -1,10 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // DONT_RUN_GENERATED_CODE: JS import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* tailrec suspend infix fun Int.test(x : Int) : Int { if (this > 1) { @@ -23,4 +22,4 @@ fun box() : String { res = if (1000000.test(1000000) == 1) "OK" else "FAIL" } return res -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt index 9b644f4b38c..472676e6bcc 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt @@ -1,10 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // DONT_RUN_GENERATED_CODE: JS import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* tailrec suspend infix fun Int.foo(x: Int) { if (x == 0) return @@ -21,4 +20,4 @@ fun box(): String { 1 foo 1000000 } return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt index 17871dd2a1b..12765bde182 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // DONT_RUN_GENERATED_CODE: JS import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* tailrec suspend fun Iterator.foldl(acc : A, foldFunction : (e : T, acc : A) -> A) : A = if (!hasNext()) acc @@ -22,4 +21,4 @@ fun box() : String { } return if (sum == 500000500000) "OK" else "FAIL: $sum" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt index 5ba04452f46..9f8357791b6 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt @@ -1,9 +1,8 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* suspend fun escapeChar(c : Char) : String? = when (c) { '\\' -> "\\\\" diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt index e26d74de1bb..af6920acbd9 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt @@ -2,9 +2,8 @@ // WITH_RUNTIME // WITH_COROUTINES // DONT_RUN_GENERATED_CODE: JS -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* tailrec suspend fun String.repeat(num : Int, acc : StringBuilder = StringBuilder()) : String = if (num == 0) acc.toString() diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt index 8cf0c689920..18c4b74054d 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // DONT_RUN_GENERATED_CODE: JS import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* tailrec suspend fun foo(x: Int) { if (x == 0) return @@ -19,4 +18,4 @@ fun box(): String { foo(1000000) } return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt index 6355270dac6..dc928e3e802 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // DONT_RUN_GENERATED_CODE: JS import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* tailrec suspend fun sum(x: Long, sum: Long): Long { if (x == 0.toLong()) return sum @@ -21,4 +20,4 @@ fun box() : String { } if (sum != 500000500000.toLong()) return "Fail $sum" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt index df9aeb6a5da..3560e3c1bd2 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // DONT_RUN_GENERATED_CODE: JS import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* tailrec suspend fun foo(x: Int) { return if (x > 0) { diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt index b131b38901b..85097623d83 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // DONT_RUN_GENERATED_CODE: JS import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* tailrec suspend fun foo(x: Int) { if (x == 0) return @@ -19,4 +18,4 @@ fun box(): String { foo(1000000) } return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt index eb3d58c6158..f85a69b51f7 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // DONT_RUN_GENERATED_CODE: JS import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* tailrec suspend fun withWhen(counter : Int, d : Any) : Int = if (counter == 0) { diff --git a/compiler/testData/codegen/box/coroutines/generate.kt b/compiler/testData/codegen/box/coroutines/generate.kt index 91863e3eee4..332f76db86c 100644 --- a/compiler/testData/codegen/box/coroutines/generate.kt +++ b/compiler/testData/codegen/box/coroutines/generate.kt @@ -1,11 +1,10 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* // FULL_JDK -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun box(): String { val x = gen().joinToString() diff --git a/compiler/testData/codegen/box/coroutines/handleException.kt b/compiler/testData/codegen/box/coroutines/handleException.kt index 4cd66eac93b..6a1c89136d1 100644 --- a/compiler/testData/codegen/box/coroutines/handleException.kt +++ b/compiler/testData/codegen/box/coroutines/handleException.kt @@ -1,10 +1,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var exception: Throwable? = null diff --git a/compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt b/compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt index c30b0d23890..7ba6aa92cbf 100644 --- a/compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt +++ b/compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit): String { diff --git a/compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt b/compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt index 8bbbfa402f8..a4a02524ce0 100644 --- a/compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt +++ b/compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/handleResultSuspended.kt b/compiler/testData/codegen/box/coroutines/handleResultSuspended.kt index 211bfe46211..c64caa6282f 100644 --- a/compiler/testData/codegen/box/coroutines/handleResultSuspended.kt +++ b/compiler/testData/codegen/box/coroutines/handleResultSuspended.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var log = "" diff --git a/compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt b/compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt index 53113bc548a..6c32b28a927 100644 --- a/compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt +++ b/compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var stopped = false var log = "" @@ -48,4 +47,4 @@ fun box(): String { if (log != "123") return "fail: $log" return result -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine.kt index 50768e1f589..2659adf15e7 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Any.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Any.kt index 5db8f8a566b..e5c0a5d8b09 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Any.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Any.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineAny.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineAny.kt index e5d201fdd82..e6fd0ddf8f4 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineAny.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineAny.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineInt.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineInt.kt index ab485ceb801..20f2d04ae14 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineInt.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineInt.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Int.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Int.kt index b4078fefef5..46105358627 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Int.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Int.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Long.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Long.kt index 8c38adfaa5a..91a3120e448 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Long.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Long.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_NAny.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_NAny.kt index c993eb6e897..c980c8131b8 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_NAny.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_NAny.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt index 15ad71b4e49..c3b1f2626b8 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_suspendFunType.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_suspendFunType.kt index 673673cf0c7..09411359c9f 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_suspendFunType.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_suspendFunType.kt @@ -1,11 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // IGNORE_BACKEND: JS_IR import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationCrossinline.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationCrossinline.kt index 019248de7f6..63b9611c2c9 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationCrossinline.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationCrossinline.kt @@ -1,9 +1,7 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) @@ -43,4 +41,4 @@ fun test() { fun box(): String { test() return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationNonInline.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationNonInline.kt index cc9552b170f..d5ae231e07a 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationNonInline.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationNonInline.kt @@ -1,9 +1,7 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) @@ -43,4 +41,4 @@ fun test() { fun box(): String { test() return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/interfaceDelegateWithInlineClass.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/interfaceDelegateWithInlineClass.kt index 5ac261989c2..449d7a2f72b 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/interfaceDelegateWithInlineClass.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/interfaceDelegateWithInlineClass.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) @@ -38,4 +36,4 @@ fun box(): String { if (result != "OK") return "FAIL: $result" return result -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun.kt index 958a5cf9a2a..b9bca379f0d 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any.kt index a9d7dc57e6a..b64ecb7c266 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_itf.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_itf.kt index 61e94f2973a..2a4fd0ec6fa 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_itf.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_itf.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_this.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_this.kt index 897adc26438..a9038ac2c50 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_this.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_this.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Int.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Int.kt index 29abe545919..754ed403daf 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Int.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Int.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt index 1ad31eb48bc..59a2ce42a32 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Any.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Any.kt index e6af827e69b..28c57e0e032 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Any.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Any.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineAny.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineAny.kt index 91f01db2062..d8188a7c391 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineAny.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineAny.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineInt.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineInt.kt index ed9f7aa6bf4..1cb0ed38fe9 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineInt.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineInt.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Int.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Int.kt index c1b4263c404..8f63afefff8 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Int.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Int.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Long.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Long.kt index 43e9c5b1c43..2fa7262a88a 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Long.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Long.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_NAny.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_NAny.kt index e992bc12dfb..4c1d6c7ece4 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_NAny.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_NAny.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt index b3d8f3bfc83..56d1de5b032 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_suspendFunType.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_suspendFunType.kt index ad47d13e527..aca1dc83c17 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_suspendFunType.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_suspendFunType.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationCrossinline.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationCrossinline.kt index ea0e6e015a3..933b1e87eb3 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationCrossinline.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationCrossinline.kt @@ -1,9 +1,7 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) @@ -51,4 +49,4 @@ fun test() { fun box(): String { test() return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationNonInline.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationNonInline.kt index 4361ea7d5de..f9a9896c970 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationNonInline.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationNonInline.kt @@ -1,9 +1,7 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) @@ -51,4 +49,4 @@ fun test() { fun box(): String { test() return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/interfaceDelegateWithInlineClass.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/interfaceDelegateWithInlineClass.kt index 2dc3da93548..1ff072f8ff0 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/interfaceDelegateWithInlineClass.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/interfaceDelegateWithInlineClass.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) @@ -44,4 +42,4 @@ fun box(): String { if (result != "OK") return "FAIL: $result" return result -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun.kt index 5d3d7c7dce6..3427679fcf4 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any.kt index bea9484893c..f43f1dfb54c 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_itf.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_itf.kt index 7d32fbda6fb..5952f79a20c 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_itf.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_itf.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_this.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_this.kt index 98b8edd97bd..70f41f9d312 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_this.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_this.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Int.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Int.kt index 8b193bc04ad..4372aeb274b 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Int.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Int.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt index a4f922a0065..e02a337fdf7 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "FAIL" diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Any.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Any.kt index d73098fc7c7..119f8179e1e 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Any.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Any.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "FAIL" diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineAny.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineAny.kt index 73b1acd71fa..74d2b1949c5 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineAny.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineAny.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "FAIL" diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineInt.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineInt.kt index fc08508ad24..901a5de8301 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineInt.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineInt.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "FAIL" diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Int.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Int.kt index d0fadab5062..4e007d32618 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Int.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Int.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "FAIL" diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Long.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Long.kt index c60a0815245..2ccd2676978 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Long.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Long.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "FAIL" diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_NAny.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_NAny.kt index 8988ec5e51f..e33ab032478 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_NAny.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_NAny.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "FAIL" diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt index c199f7be7ba..1cced7e1d89 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "FAIL" diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_suspendFunType.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_suspendFunType.kt index b0ab0e65ff6..232f9bc8515 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_suspendFunType.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_suspendFunType.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "FAIL" diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationCrossinline.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationCrossinline.kt index 8fb3abf1b0b..9795923d827 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationCrossinline.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationCrossinline.kt @@ -1,9 +1,7 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* var result = "FAIL" @@ -55,4 +53,4 @@ fun test() { fun box(): String { test() return result -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationNonInline.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationNonInline.kt index efa22111697..1b69cd83e76 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationNonInline.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationNonInline.kt @@ -1,9 +1,7 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* var result = "FAIL" @@ -55,4 +53,4 @@ fun test() { fun box(): String { test() return result -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/interfaceDelegateWithInlineClass.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/interfaceDelegateWithInlineClass.kt index e9a9f202754..e4fc462d868 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/interfaceDelegateWithInlineClass.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/interfaceDelegateWithInlineClass.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "FAIL" @@ -46,4 +44,4 @@ fun box(): String { if (result != "OK") return "FAIL: $result" return result -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun.kt index f0ea3de33d8..380e3a6e673 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "FAIL" diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any.kt index fcfcb43a1e5..edc97528e63 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "FAIL" diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_itf.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_itf.kt index 34423556600..4433bdb6788 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_itf.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_itf.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "FAIL" diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_this.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_this.kt index f7c82953694..f6b9f19243a 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_this.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_this.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "FAIL" diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Int.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Int.kt index 21a42a432a3..b828c0115c4 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Int.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Int.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "FAIL" diff --git a/compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt b/compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt index ef425c2dcd5..47c7cc2bda5 100644 --- a/compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt +++ b/compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendThere(v: Any?): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume(v?.toString() ?: "") diff --git a/compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClass.kt b/compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClass.kt index 7b092b89728..dfe4e6fb462 100644 --- a/compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClass.kt +++ b/compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClass.kt @@ -1,6 +1,5 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // IGNORE_LIGHT_ANALYSIS // !INHERIT_MULTIFILE_PARTS // TARGET_BACKEND: JVM @@ -13,8 +12,8 @@ package test import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun foo(): String = bar("OK") diff --git a/compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClassUnoptimized.kt b/compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClassUnoptimized.kt index ea0f92853c1..209047ba11a 100644 --- a/compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClassUnoptimized.kt +++ b/compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClassUnoptimized.kt @@ -1,6 +1,5 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // TARGET_BACKEND: JVM // FILE: test.kt @@ -11,8 +10,8 @@ package test import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun foo(): String = bar("OK") diff --git a/compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt b/compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt index 02cf582a154..bfbf7d3055d 100644 --- a/compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt +++ b/compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt @@ -1,10 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES // WITH_REFLECT -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendThere(v: String): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt b/compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt index fecaa567153..a3be99db7be 100644 --- a/compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt +++ b/compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt @@ -1,13 +1,12 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // WITH_REFLECT // CHECK_NOT_CALLED: suspendInline_61zpoe$ // CHECK_NOT_CALLED: suspendInline_6r51u9$ // CHECK_NOT_CALLED: suspendInline import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { fun withValue(v: String, x: Continuation) { diff --git a/compiler/testData/codegen/box/coroutines/inlineSuspendLambdaNonLocalReturn.kt b/compiler/testData/codegen/box/coroutines/inlineSuspendLambdaNonLocalReturn.kt index ab6dde1150a..36311f7b6d4 100644 --- a/compiler/testData/codegen/box/coroutines/inlineSuspendLambdaNonLocalReturn.kt +++ b/compiler/testData/codegen/box/coroutines/inlineSuspendLambdaNonLocalReturn.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend inline fun doTwice(block: suspend () -> Unit) { block() @@ -26,4 +25,4 @@ fun box(): String { } return testResult -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt b/compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt index d66f21d0203..0237ce77cf5 100644 --- a/compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt +++ b/compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt @@ -1,10 +1,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var globalResult = "" var wasCalled = false diff --git a/compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt b/compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt index f220b0740ed..2cfdcb2ecbb 100644 --- a/compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt +++ b/compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var i = 0 diff --git a/compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt b/compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt index 193e709fef0..28c33ee5317 100644 --- a/compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt +++ b/compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt @@ -1,10 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* // WITH_REFLECT -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun runInstanceOf(): Boolean = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt index e55e2058860..f6b76381e2f 100644 --- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt +++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt index aa3976a5040..87b7e1c24cf 100644 --- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt +++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt index 2222a1969f4..5496b783177 100644 --- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt +++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt index 87313527e19..e067af09cc7 100644 --- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt +++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt index 47308031f7e..8c36dadb6a9 100644 --- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt +++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt index 17e2f510d20..eda3ca071a9 100644 --- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt +++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt index d6ce61323c0..840d76645e1 100644 --- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt +++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt @@ -1,10 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* // TARGET_BACKEND: JVM -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt index ccb729668d2..3bc6f947c5c 100644 --- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt +++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt index 750bd0695fc..9e34f402d75 100644 --- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt +++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt @@ -1,10 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* // TARGET_BACKEND: JVM -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt index 07c37314f25..e4c2a041596 100644 --- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt +++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt index 192b484d2e9..71d63b62f18 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt @@ -1,8 +1,7 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import kotlin.test.assertEquals suspend fun suspendHere() = diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt index 9f5e66713ed..d6ed978e6f7 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt @@ -1,8 +1,7 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import kotlin.test.assertEquals class Controller { diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt index d7f375fa797..25b9fbf508e 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt @@ -1,8 +1,7 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import kotlin.test.assertEquals @Suppress("DEPRECATION_ERROR") diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt index 75bbf60adee..be100bbcacc 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import kotlin.test.assertEquals suspend fun suspendHereUnintercepted(): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt index 65a477c0cc5..df94880cc59 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import kotlin.test.assertEquals suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt index 51bee8a6ded..d982f890690 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import kotlin.test.assertEquals suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt index 73361284dc5..0bba8305606 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import kotlin.test.assertEquals var callback: () -> Unit = {} diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt index 77a3e04b449..c93096b090e 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import kotlin.test.assertEquals suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/iterateOverArray.kt b/compiler/testData/codegen/box/coroutines/iterateOverArray.kt index 2db9dcfdbc4..7bf8486af83 100644 --- a/compiler/testData/codegen/box/coroutines/iterateOverArray.kt +++ b/compiler/testData/codegen/box/coroutines/iterateOverArray.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/javaInterop/objectWithSeveralSuspends.kt b/compiler/testData/codegen/box/coroutines/javaInterop/objectWithSeveralSuspends.kt index 45089b9df38..e18f4e0f1e9 100644 --- a/compiler/testData/codegen/box/coroutines/javaInterop/objectWithSeveralSuspends.kt +++ b/compiler/testData/codegen/box/coroutines/javaInterop/objectWithSeveralSuspends.kt @@ -1,5 +1,4 @@ // TARGET_BACKEND: JVM -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING @@ -62,7 +61,7 @@ import test.InlineMeKt; import helpers.CoroutineUtilKt; import helpers.EmptyContinuation; import kotlin.jvm.functions.Function1; -import COROUTINES_PACKAGE.Continuation; +import kotlin.coroutines.Continuation; import kotlin.Unit; public class A { @@ -87,7 +86,7 @@ public class A { import test.* import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(c: suspend () -> Unit) { c.startCoroutine(CheckStateMachineContinuation) @@ -196,4 +195,4 @@ fun box(): String { StateMachineChecker.check(18) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt b/compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt index 32e6f43fe0c..a99a90b02b5 100644 --- a/compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt +++ b/compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt @@ -1,5 +1,4 @@ // TARGET_BACKEND: JVM -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING @@ -32,7 +31,7 @@ import test.InlineMeKt; import helpers.CoroutineUtilKt; import helpers.EmptyContinuation; import kotlin.jvm.functions.Function1; -import COROUTINES_PACKAGE.Continuation; +import kotlin.coroutines.Continuation; import kotlin.Unit; public class A { @@ -57,7 +56,7 @@ public class A { import test.* import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(c: suspend () -> Unit) { c.startCoroutine(CheckStateMachineContinuation) @@ -108,4 +107,4 @@ fun box(): String { } StateMachineChecker.check(16) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/javaInterop/returnObject.kt b/compiler/testData/codegen/box/coroutines/javaInterop/returnObject.kt index fadae10ebbf..6cc18e8049c 100644 --- a/compiler/testData/codegen/box/coroutines/javaInterop/returnObject.kt +++ b/compiler/testData/codegen/box/coroutines/javaInterop/returnObject.kt @@ -1,5 +1,4 @@ // TARGET_BACKEND: JVM -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING @@ -42,7 +41,7 @@ import test.InlineMeKt; import helpers.CoroutineUtilKt; import helpers.EmptyContinuation; import kotlin.jvm.functions.Function1; -import COROUTINES_PACKAGE.Continuation; +import kotlin.coroutines.Continuation; import kotlin.Unit; public class A { @@ -67,7 +66,7 @@ public class A { import test.* import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(c: suspend () -> Unit) { c.startCoroutine(CheckStateMachineContinuation) @@ -118,4 +117,4 @@ fun box(): String { } StateMachineChecker.check(16) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/javaInterop/severalCaptures.kt b/compiler/testData/codegen/box/coroutines/javaInterop/severalCaptures.kt index 7dbd4704982..dcfc53a3695 100644 --- a/compiler/testData/codegen/box/coroutines/javaInterop/severalCaptures.kt +++ b/compiler/testData/codegen/box/coroutines/javaInterop/severalCaptures.kt @@ -1,5 +1,4 @@ // TARGET_BACKEND: JVM -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // CHECK_STATE_MACHINE @@ -72,7 +71,7 @@ import test.InlineMeKt; import helpers.CoroutineUtilKt; import helpers.EmptyContinuation; import kotlin.jvm.functions.Function1; -import COROUTINES_PACKAGE.Continuation; +import kotlin.coroutines.Continuation; import kotlin.Unit; public class A { @@ -103,7 +102,7 @@ public class A { import test.* import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(c: suspend () -> Unit) { c.startCoroutine(CheckStateMachineContinuation) @@ -283,4 +282,4 @@ fun box(): String { StateMachineChecker.reset() return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/javaInterop/suspendInlineWithCrossinline.kt b/compiler/testData/codegen/box/coroutines/javaInterop/suspendInlineWithCrossinline.kt index 71be1cd6cbf..c7f6918f3bc 100644 --- a/compiler/testData/codegen/box/coroutines/javaInterop/suspendInlineWithCrossinline.kt +++ b/compiler/testData/codegen/box/coroutines/javaInterop/suspendInlineWithCrossinline.kt @@ -1,5 +1,4 @@ // TARGET_BACKEND: JVM -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING @@ -19,7 +18,7 @@ import test.InlineMeKt; import helpers.CoroutineUtilKt; import helpers.EmptyContinuation; import kotlin.jvm.functions.Function1; -import COROUTINES_PACKAGE.Continuation; +import kotlin.coroutines.Continuation; import kotlin.Unit; public class A { @@ -41,8 +40,8 @@ public class A { import test.* import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(CheckStateMachineContinuation) @@ -74,4 +73,4 @@ fun box(): String { } StateMachineChecker.check(4) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/kt12958.kt b/compiler/testData/codegen/box/coroutines/kt12958.kt index 5de10da7c30..6bc7710dcfb 100644 --- a/compiler/testData/codegen/box/coroutines/kt12958.kt +++ b/compiler/testData/codegen/box/coroutines/kt12958.kt @@ -1,10 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* // WITH_CONTINUATION -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(v: V): V = suspendCoroutineUninterceptedOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/kt15016.kt b/compiler/testData/codegen/box/coroutines/kt15016.kt index 864ba110a29..cd078cce761 100644 --- a/compiler/testData/codegen/box/coroutines/kt15016.kt +++ b/compiler/testData/codegen/box/coroutines/kt15016.kt @@ -1,11 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.intrinsics.COROUTINE_SUSPENDED -import COROUTINES_PACKAGE.intrinsics.suspendCoroutineUninterceptedOrReturn -import COROUTINES_PACKAGE.* +import kotlin.coroutines.intrinsics.COROUTINE_SUSPENDED +import kotlin.coroutines.intrinsics.suspendCoroutineUninterceptedOrReturn +import kotlin.coroutines.* class Bar(val x: Any) inline fun Any.map(transform: (Any) -> Any) { diff --git a/compiler/testData/codegen/box/coroutines/kt15017.kt b/compiler/testData/codegen/box/coroutines/kt15017.kt index 865f44594e9..c65464dd893 100644 --- a/compiler/testData/codegen/box/coroutines/kt15017.kt +++ b/compiler/testData/codegen/box/coroutines/kt15017.kt @@ -1,8 +1,7 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.startCoroutine +import kotlin.coroutines.startCoroutine class Controller { suspend inline fun suspendInlineThrow(v: String): String = throw RuntimeException(v) diff --git a/compiler/testData/codegen/box/coroutines/kt15930.kt b/compiler/testData/codegen/box/coroutines/kt15930.kt index 51fb9abde85..042cf0761d8 100644 --- a/compiler/testData/codegen/box/coroutines/kt15930.kt +++ b/compiler/testData/codegen/box/coroutines/kt15930.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.intrinsics.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.intrinsics.* +import kotlin.coroutines.* class A { var isMinusAssignCalled = false diff --git a/compiler/testData/codegen/box/coroutines/kt21605.kt b/compiler/testData/codegen/box/coroutines/kt21605.kt index 738382154f8..6e7536ab520 100644 --- a/compiler/testData/codegen/box/coroutines/kt21605.kt +++ b/compiler/testData/codegen/box/coroutines/kt21605.kt @@ -1,9 +1,7 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* interface Consumer { fun consume(s: String) } diff --git a/compiler/testData/codegen/box/coroutines/kt25912.kt b/compiler/testData/codegen/box/coroutines/kt25912.kt index 130aa067c96..beaf3608e6d 100644 --- a/compiler/testData/codegen/box/coroutines/kt25912.kt +++ b/compiler/testData/codegen/box/coroutines/kt25912.kt @@ -1,11 +1,10 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // IGNORE_BACKEND: NATIVE import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun box(): String { val gg = object : Grouping { diff --git a/compiler/testData/codegen/box/coroutines/kt28844.kt b/compiler/testData/codegen/box/coroutines/kt28844.kt index 7fbb3846bd5..c83f1a0577e 100644 --- a/compiler/testData/codegen/box/coroutines/kt28844.kt +++ b/compiler/testData/codegen/box/coroutines/kt28844.kt @@ -1,10 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // IGNORE_BACKEND: NATIVE import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(block: suspend Unit.() -> Unit) { block.startCoroutine(Unit, EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt b/compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt index 101a1257da5..098e0bdac00 100644 --- a/compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt +++ b/compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var result = "" diff --git a/compiler/testData/codegen/box/coroutines/lastStatementInc.kt b/compiler/testData/codegen/box/coroutines/lastStatementInc.kt index e3cad551967..de3479956c1 100644 --- a/compiler/testData/codegen/box/coroutines/lastStatementInc.kt +++ b/compiler/testData/codegen/box/coroutines/lastStatementInc.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume("OK") diff --git a/compiler/testData/codegen/box/coroutines/lastStementAssignment.kt b/compiler/testData/codegen/box/coroutines/lastStementAssignment.kt index e8402f6a1b9..728a0648229 100644 --- a/compiler/testData/codegen/box/coroutines/lastStementAssignment.kt +++ b/compiler/testData/codegen/box/coroutines/lastStementAssignment.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume("OK") diff --git a/compiler/testData/codegen/box/coroutines/lastUnitExpression.kt b/compiler/testData/codegen/box/coroutines/lastUnitExpression.kt index d4d946acf64..615bdb45d39 100644 --- a/compiler/testData/codegen/box/coroutines/lastUnitExpression.kt +++ b/compiler/testData/codegen/box/coroutines/lastUnitExpression.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var ok = false diff --git a/compiler/testData/codegen/box/coroutines/localDelegate.kt b/compiler/testData/codegen/box/coroutines/localDelegate.kt index b38dbf8d921..f02290e1f4c 100644 --- a/compiler/testData/codegen/box/coroutines/localDelegate.kt +++ b/compiler/testData/codegen/box/coroutines/localDelegate.kt @@ -1,10 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.COROUTINE_SUSPENDED -import COROUTINES_PACKAGE.intrinsics.suspendCoroutineUninterceptedOrReturn +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.COROUTINE_SUSPENDED +import kotlin.coroutines.intrinsics.suspendCoroutineUninterceptedOrReturn class OkDelegate { operator fun getValue(receiver: Any?, property: Any?): String = "OK" diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt b/compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt index 21760f011d9..c5d939772e0 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt @@ -4,10 +4,9 @@ // IGNORE_BACKEND: JVM, JS, NATIVE // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun callLocal(): String { val local = suspend fun() = "OK" diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt index 67eff67c23e..a518e94d06c 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun callLocal(a: String, b: String): String { suspend fun local() = suspendCoroutineUninterceptedOrReturn { diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt index 8f01b97097b..3c0e88eeebc 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun callLocal(): String { val a = "O" diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt index c6148d35bff..92b22244acf 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun callLocal(): String { suspend fun String.local() = suspendCoroutineUninterceptedOrReturn { diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt index 47cdbe05977..c28fd71dfaf 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun callLocal(): String { suspend infix fun String.local(a: String) = suspendCoroutineUninterceptedOrReturn { diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt index d03f2546a69..05b8d9ab210 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun callLocal(): String { val l: suspend () -> String = { diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt index e895cfc5926..62691c8354a 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun callLocal(): String { suspend fun local(): String { diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt index b438db745ec..8e884a71422 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt @@ -1,9 +1,7 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* suspend fun callLocal(): String { suspend fun local() = "OK" diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt index 87c6d43c296..973588191eb 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun callLocal(): String { suspend fun local() = suspendCoroutineUninterceptedOrReturn { diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt index a65c502cb60..a857c18fc9f 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "FAIL" var i = 0 diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt index bc8115db659..691492a1585 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun callLocal(a: String, b: String): String { suspend fun local(a: String, b: String) = suspendCoroutineUninterceptedOrReturn { diff --git a/compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt b/compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt index 917aae72d2f..c0641638b62 100644 --- a/compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt +++ b/compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun getLong(): Long = suspendCoroutineUninterceptedOrReturn { x -> x.resume(1234567890123L) diff --git a/compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt b/compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt index c491c20c86e..5d3fbef2bdb 100644 --- a/compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt +++ b/compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(r: LongRange): Long = suspendCoroutineUninterceptedOrReturn { x -> x.resume(r.start + r.endInclusive) diff --git a/compiler/testData/codegen/box/coroutines/mergeNullAndString.kt b/compiler/testData/codegen/box/coroutines/mergeNullAndString.kt index 7e0c607cd4e..cfdf55891d2 100644 --- a/compiler/testData/codegen/box/coroutines/mergeNullAndString.kt +++ b/compiler/testData/codegen/box/coroutines/mergeNullAndString.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt index 553ee474395..33d5dbbfa45 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt @@ -1,14 +1,12 @@ // IGNORE_BACKEND: NATIVE // WITH_COROUTINES // WITH_RUNTIME -// COMMON_COROUTINES_TEST - // MODULE: lib(support) // FILE: lib.kt import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend inline fun inlined( crossinline step: suspend () -> R @@ -22,11 +20,9 @@ suspend fun notInlined( // FILE: main.kt // WITH_COROUTINES // WITH_RUNTIME -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "FAIL" @@ -45,4 +41,4 @@ fun box(): String { test() } return result -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt index 258aace95b7..4e61ecf8103 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt @@ -8,10 +8,9 @@ inline fun foo(x: String = "OK"): String { // FILE: main.kt // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "" diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt index 72cee2ee5e4..285dae7d44e 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt @@ -1,13 +1,11 @@ // WITH_COROUTINES // WITH_RUNTIME -// COMMON_COROUTINES_TEST - // MODULE: lib(support) // FILE: lib.kt import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var continuation: () -> Unit = { } var log = "" @@ -39,8 +37,8 @@ fun builder(c: suspend () -> Unit) { // MODULE: main(lib) // FILE: main.kt -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun baz() { bar("A") diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt index 96bd6e26f5e..8d689cd45e5 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt @@ -1,13 +1,11 @@ // WITH_COROUTINES // WITH_RUNTIME -// COMMON_COROUTINES_TEST - // MODULE: lib(support) // FILE: lib.kt import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var continuation: () -> Unit = { } var log = "" @@ -45,8 +43,8 @@ fun builder(c: suspend () -> Unit) { // MODULE: main(lib) // FILE: main.kt -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun baz() { val a = A("A") diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt index 02f12ed6240..736540d70a3 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt @@ -1,13 +1,11 @@ // WITH_COROUTINES // WITH_RUNTIME -// COMMON_COROUTINES_TEST - // MODULE: lib(support) // FILE: lib.kt import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var continuation: () -> Unit = { } var log = "" @@ -43,8 +41,8 @@ fun C.builder(c: suspend C.() -> Unit) { // MODULE: main(lib) // FILE: main.kt -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun C.baz() { v = "A" diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt index 3aca04ab5a1..99501074f46 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt @@ -1,14 +1,12 @@ // IGNORE_BACKEND: NATIVE // WITH_COROUTINES // WITH_RUNTIME -// COMMON_COROUTINES_TEST - // MODULE: lib(support) // FILE: lib.kt import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var continuation: () -> Unit = { } var log = "" @@ -44,8 +42,8 @@ fun builder(c: suspend () -> Unit) { // MODULE: main(lib) // FILE: main.kt -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun baz() { val a = bar("A") diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt index 204539f0b59..a66518f6dff 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt @@ -1,7 +1,6 @@ // IGNORE_BACKEND: NATIVE // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // MODULE: lib // FILE: lib.kt suspend inline fun foo(v: String): String = v @@ -11,8 +10,8 @@ suspend inline fun bar(): String = foo("O") // MODULE: main(lib, support) // FILE: main.kt import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/multiModule/simple.kt b/compiler/testData/codegen/box/coroutines/multiModule/simple.kt index 64d9c856784..0a2c2596937 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/simple.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/simple.kt @@ -1,13 +1,12 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // MODULE: controller(support) // FILE: controller.kt package lib import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> @@ -20,8 +19,8 @@ class Controller { // FILE: main.kt import lib.* import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend Controller.() -> Unit) { c.startCoroutine(Controller(), EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt b/compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt index 83363299870..2e7856f3de9 100644 --- a/compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt +++ b/compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var lastSuspension: Continuation? = null diff --git a/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt b/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt index 877d4054d00..6a01e0bf54e 100644 --- a/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt +++ b/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var lastSuspension: Continuation? = null diff --git a/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt b/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt index cac917da90e..996f7354952 100644 --- a/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt +++ b/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var lastSuspension: Continuation? = null diff --git a/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt b/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt index 5dedd0226ce..663999ab4cf 100644 --- a/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt +++ b/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var lastSuspension: Continuation? = null diff --git a/compiler/testData/codegen/box/coroutines/nestedTryCatch.kt b/compiler/testData/codegen/box/coroutines/nestedTryCatch.kt index 350d544d3ae..cf4f4c1c01c 100644 --- a/compiler/testData/codegen/box/coroutines/nestedTryCatch.kt +++ b/compiler/testData/codegen/box/coroutines/nestedTryCatch.kt @@ -1,10 +1,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var globalResult = "" var wasCalled = false diff --git a/compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt b/compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt index c8eddab8a3b..34d8eff0711 100644 --- a/compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt +++ b/compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun builder(c: suspend () -> Int): Int { diff --git a/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt b/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt index d393f5ceea5..f1189aa83fb 100644 --- a/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt +++ b/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME -// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var cResult = 0 diff --git a/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt b/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt index af5fc73a96a..45721e9f8ff 100644 --- a/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt +++ b/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME -// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt b/compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt index e292198e2be..780d61ebadd 100644 --- a/compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt +++ b/compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun box(): String { async { diff --git a/compiler/testData/codegen/box/coroutines/recursiveSuspend.kt b/compiler/testData/codegen/box/coroutines/recursiveSuspend.kt index 90f5e4c633f..b7cc79806bc 100644 --- a/compiler/testData/codegen/box/coroutines/recursiveSuspend.kt +++ b/compiler/testData/codegen/box/coroutines/recursiveSuspend.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun box(): String { var result = 0 diff --git a/compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt b/compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt index aa360c8bb59..9ebccd0669f 100644 --- a/compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt +++ b/compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt @@ -1,10 +1,8 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* private var prevSender: String = "FAIL" @@ -42,4 +40,4 @@ fun box(): String { receivedMessage("OK", "/who") } return prevSender -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/returnByLabel.kt b/compiler/testData/codegen/box/coroutines/returnByLabel.kt index 836f10ae700..25440dfc6d9 100644 --- a/compiler/testData/codegen/box/coroutines/returnByLabel.kt +++ b/compiler/testData/codegen/box/coroutines/returnByLabel.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume("OK") diff --git a/compiler/testData/codegen/box/coroutines/simple.kt b/compiler/testData/codegen/box/coroutines/simple.kt index 3731dd4ec0b..62903aba8b8 100644 --- a/compiler/testData/codegen/box/coroutines/simple.kt +++ b/compiler/testData/codegen/box/coroutines/simple.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume("OK") diff --git a/compiler/testData/codegen/box/coroutines/simpleException.kt b/compiler/testData/codegen/box/coroutines/simpleException.kt index b086b794eaf..21297ff1b46 100644 --- a/compiler/testData/codegen/box/coroutines/simpleException.kt +++ b/compiler/testData/codegen/box/coroutines/simpleException.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt b/compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt index 25ca2d4562c..892e0320273 100644 --- a/compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt +++ b/compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume("OK") diff --git a/compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt b/compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt index 67be6b24d95..06573c23347 100644 --- a/compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt +++ b/compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): String = throw RuntimeException("OK") diff --git a/compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt b/compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt index 527fd45bc1b..a83b52f2a2f 100644 --- a/compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt +++ b/compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt @@ -1,13 +1,12 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* // WITH_REFLECT // CHECK_NOT_CALLED: suspendInline_61zpoe$ // CHECK_NOT_CALLED: suspendInline_6r51u9$ // CHECK_NOT_CALLED: suspendInline -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend inline fun suspendInline(v: String): String = v diff --git a/compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt b/compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt index 4bf708ac8ac..1ab732d22f2 100644 --- a/compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt +++ b/compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* // Note: This test for issue KT-28207 about infinite loop after throwing exception from finally block @@ -39,4 +38,4 @@ fun box(): String { } return result -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt b/compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt index d3ffc479cd6..74fc2624e00 100644 --- a/compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt +++ b/compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* // Note: This test for issue KT-28207 about infinite loop after throwing exception from finally block @@ -48,4 +47,4 @@ fun box(): String { return result -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt b/compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt index 0b49fa281b0..20f13292af4 100644 --- a/compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt +++ b/compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere() = "OK" diff --git a/compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt b/compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt index 38bc0cb13eb..f33921ca516 100644 --- a/compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt +++ b/compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Int = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt b/compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt index 2e356a6257c..5b861804f88 100644 --- a/compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt +++ b/compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var globalResult = "" suspend fun suspendWithValue(v: String): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt b/compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt index 5b7ef570bfe..12625c6b078 100644 --- a/compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt +++ b/compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var result = "" diff --git a/compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt b/compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt index 4e2fd0f4157..7598aa584eb 100644 --- a/compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt +++ b/compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt @@ -1,10 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.suspendCoroutineUninterceptedOrReturn -import COROUTINES_PACKAGE.intrinsics.COROUTINE_SUSPENDED +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.suspendCoroutineUninterceptedOrReturn +import kotlin.coroutines.intrinsics.COROUTINE_SUSPENDED fun box(): String { async { diff --git a/compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt b/compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt index 06f7be45741..2371d5e9643 100644 --- a/compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt +++ b/compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* interface TestInterface { suspend fun toInt(): Int = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspendDelegation.kt b/compiler/testData/codegen/box/coroutines/suspendDelegation.kt index 92750645f98..802fc81ab4d 100644 --- a/compiler/testData/codegen/box/coroutines/suspendDelegation.kt +++ b/compiler/testData/codegen/box/coroutines/suspendDelegation.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): String = suspendThere() diff --git a/compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt b/compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt index de1171d1037..c776dec68f0 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(v: Int): Int = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt b/compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt index 7a2f2b96a46..b71f7dd891e 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt @@ -1,13 +1,11 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - // FILE: stuff.kt package stuff import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* object Host { suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> @@ -19,8 +17,8 @@ object Host { // FILE: test.kt import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import stuff.Host.suspendHere fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt index 345b9db67e0..a1228e8d4cc 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt @@ -1,10 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // FULL_JDK import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var log = "" diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt index dfa2bab7997..b3d35447b7e 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt @@ -1,10 +1,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var exception: Throwable? = null diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt index 87c31afe684..1199f00256f 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendThere(v: String): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt index 678765c6e7b..5310f5b2d50 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt @@ -1,11 +1,10 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.COROUTINE_SUSPENDED -import COROUTINES_PACKAGE.intrinsics.suspendCoroutineUninterceptedOrReturn +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.COROUTINE_SUSPENDED +import kotlin.coroutines.intrinsics.suspendCoroutineUninterceptedOrReturn class MyTest { suspend fun act(value: String): String = suspendCoroutineUninterceptedOrReturn { diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt index 7ca863cfc43..82df555a2aa 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class A(val v: String) { suspend fun suspendThere(v: String): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt index 0523f92f294..afd2d38de64 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt @@ -1,11 +1,10 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.COROUTINE_SUSPENDED -import COROUTINES_PACKAGE.intrinsics.suspendCoroutineUninterceptedOrReturn +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.COROUTINE_SUSPENDED +import kotlin.coroutines.intrinsics.suspendCoroutineUninterceptedOrReturn class MyTest { suspend fun act(value: String): String = suspendCoroutineUninterceptedOrReturn { diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt index 149f3b3cd09..8fc377e3b07 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import kotlin.reflect.KProperty suspend fun suspendThere(v: String): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt index 0e4dd227270..b6e14a89cf5 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class X { var res = "" diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt index 86f9adb506c..b9f3528392f 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var x = true diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt index 756fe4bb4cc..c8f27f44fe9 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendThere(v: String): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt index 5771cc14152..a00aca0923c 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendThere(v: String): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt index 34775f65723..8dbe5c8a8aa 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* open class A(val v: String) { suspend fun suspendThere(v: String): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt index 25d9fd9baa2..cf270224486 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* abstract class A(val v: String) { suspend abstract fun foo(v: String): String diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt index cda43f8cee3..69641063159 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* interface A { val v: String diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt index 14411f2977d..2a5d0f2f0f9 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* open class A(val v: String) { suspend fun suspendThere(v: String): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt index 1dbe4637a50..fba9816e6cd 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendThere(v: String): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt index 02113d0964d..e51f2eab6a1 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(v: String): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt index 9db14a3230c..2c7d9e01696 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(v: String): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParametersNoCapture.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParametersNoCapture.kt index 679f28ef211..a44a237525e 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParametersNoCapture.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParametersNoCapture.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(v: String): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt index 5f8d15e93ba..88792fdca97 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME -// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(v: String): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt index e80bb76623c..d9e1b23e387 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME -// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(v: String): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/suspendInCycle.kt b/compiler/testData/codegen/box/coroutines/suspendInCycle.kt index 2f7965b8c9c..9b7492d2e6f 100644 --- a/compiler/testData/codegen/box/coroutines/suspendInCycle.kt +++ b/compiler/testData/codegen/box/coroutines/suspendInCycle.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var i = 0 diff --git a/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt b/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt index 1123c751bbb..ed5d7104a9a 100644 --- a/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt +++ b/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt b/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt index c5959647e05..93f2c54f061 100644 --- a/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt +++ b/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt @@ -2,10 +2,9 @@ // IGNORE_BACKEND: JS_IR_ES6 // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt b/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt index 8d9acce99ce..1cfa7a75989 100644 --- a/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt +++ b/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspendLambdaWithArgumentRearrangement.kt b/compiler/testData/codegen/box/coroutines/suspendLambdaWithArgumentRearrangement.kt index 22e10d91535..61efe9c020f 100644 --- a/compiler/testData/codegen/box/coroutines/suspendLambdaWithArgumentRearrangement.kt +++ b/compiler/testData/codegen/box/coroutines/suspendLambdaWithArgumentRearrangement.kt @@ -1,10 +1,9 @@ // IGNORE_BACKEND: JS // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* inline fun callAction(aux: Int, action: () -> String): String { return action() diff --git a/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt b/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt index a6e9d2fc2b6..776227d7d45 100644 --- a/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt +++ b/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class TestClass { suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt b/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt index acaccff04e6..01de31a0be7 100644 --- a/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt +++ b/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class TestClass { suspend fun toInt(): Int = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt index 7782cb0405e..ee7e3bb331d 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt @@ -1,11 +1,10 @@ // IGNORE_BACKEND_FIR: JVM_IR -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // CHECK_BYTECODE_LISTING import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* interface SourceCrossinline { suspend fun consume(sink: Sink) @@ -72,4 +71,4 @@ fun box(): String { } if (res != 12) return "FAIL" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt index dcd448f84b9..dcc818fb856 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt @@ -1,12 +1,11 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST // CHECK_BYTECODE_LISTING // CHECK_NEW_COUNT: function=suspendHere count=0 // CHECK_NEW_COUNT: function=complexSuspend count=0 import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* inline suspend fun suspendThere(v: String): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt index d407e0f35e2..a3a15301870 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt @@ -1,5 +1,4 @@ // IGNORE_BACKEND_FIR: JVM_IR -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // CHECK_BYTECODE_LISTING @@ -15,7 +14,7 @@ package flow -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* interface FlowCollector { diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt index 6b9518e2e61..32f9c62522d 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt @@ -1,10 +1,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* val postponedActions = ArrayList<() -> Unit>() @@ -36,4 +35,4 @@ fun box(): String { return run { catchException() } -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt b/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt index c8502ed7398..1b4873af4ed 100644 --- a/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt +++ b/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun foo(x: Any): Int { return if (x == "56") suspendHere() else 13 diff --git a/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt b/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt index 310c1ddc2f6..2e30058ba41 100644 --- a/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt +++ b/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun foo(x: Any): Int { return try { diff --git a/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt b/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt index c60c498aa4d..5b14dbb3061 100644 --- a/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt +++ b/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun foo(x: Any): Int { return when { diff --git a/compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt b/compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt index b3285d0760f..0eacff0bcf4 100644 --- a/compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt +++ b/compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt @@ -1,8 +1,7 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun box(): String { async { diff --git a/compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt b/compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt index 8e7d908d8b9..fe5bb4c82b8 100644 --- a/compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt +++ b/compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt @@ -1,10 +1,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var globalResult = "" var wasCalled = false diff --git a/compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt b/compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt index bc9f122350f..7211b9e6126 100644 --- a/compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt +++ b/compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt @@ -1,10 +1,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var globalResult = "" var wasCalled = false diff --git a/compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt b/compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt index 8ca5670a359..e6a7fdef492 100644 --- a/compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt +++ b/compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(v: String): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt b/compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt index 11c44fc116f..b73074dec6d 100644 --- a/compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt +++ b/compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt @@ -1,10 +1,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var globalResult = "" var wasCalled = false diff --git a/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt b/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt index f73be96daf0..22acd215dbd 100644 --- a/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt +++ b/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume("OK") diff --git a/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt b/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt index e444505b7b1..233f0646446 100644 --- a/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt +++ b/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume("OK") diff --git a/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt b/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt index dc343d309d8..523629f2c83 100644 --- a/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt +++ b/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "0" diff --git a/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt b/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt index 24105a85d79..796f0b4a6b7 100644 --- a/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt +++ b/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var result = "0" diff --git a/compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt b/compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt index 04d923b6ca9..b9ce426fea9 100644 --- a/compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt +++ b/compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var log = "" var postponed: () -> Unit = { } diff --git a/compiler/testData/codegen/box/coroutines/varCaptuedInCoroutineIntrinsic.kt b/compiler/testData/codegen/box/coroutines/varCaptuedInCoroutineIntrinsic.kt index 2c75e3c721c..938d54342fb 100644 --- a/compiler/testData/codegen/box/coroutines/varCaptuedInCoroutineIntrinsic.kt +++ b/compiler/testData/codegen/box/coroutines/varCaptuedInCoroutineIntrinsic.kt @@ -1,10 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(): String { var s: String? = null @@ -29,4 +27,4 @@ fun box(): String { } return result -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt b/compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt index 39f59c5f5d4..9d5f518805d 100644 --- a/compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt +++ b/compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt @@ -1,10 +1,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume("OK") diff --git a/compiler/testData/codegen/box/coroutines/varSpilling/kt38925.kt b/compiler/testData/codegen/box/coroutines/varSpilling/kt38925.kt index 6c5eb45c557..24e0597e38d 100644 --- a/compiler/testData/codegen/box/coroutines/varSpilling/kt38925.kt +++ b/compiler/testData/codegen/box/coroutines/varSpilling/kt38925.kt @@ -1,10 +1,9 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun foo() { bar { diff --git a/compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt b/compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt index fdad0a16caf..8fa7ff33fb5 100644 --- a/compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt +++ b/compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun foo(value: String): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume(value) diff --git a/compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt b/compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt index 14bac4017fd..21222a17f84 100644 --- a/compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt +++ b/compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt b/compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt index 7741fc0e6d0..47b6e1bf099 100644 --- a/compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt +++ b/compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/parametersMetadata/suspendFunction.kt b/compiler/testData/codegen/box/parametersMetadata/suspendFunction.kt index 5be423553b6..b79a3386c7b 100644 --- a/compiler/testData/codegen/box/parametersMetadata/suspendFunction.kt +++ b/compiler/testData/codegen/box/parametersMetadata/suspendFunction.kt @@ -3,9 +3,8 @@ // WITH_RUNTIME // FULL_JDK // KOTLIN_CONFIGURATION_FLAGS: +JVM.PARAMETERS_METADATA -// COMMON_COROUTINES_TEST -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class A() { suspend fun test(OK: String) { @@ -21,4 +20,4 @@ fun box(): String { if (parameters[0].modifiers != 0) return "wrong modifier on value parameter: ${parameters[0].modifiers}" if (parameters[1].modifiers != 0) return "wrong modifier on Continuation parameter: ${parameters[1].modifiers}" return parameters[0].name -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/boxInline/suspend/capturedVariables.kt b/compiler/testData/codegen/boxInline/suspend/capturedVariables.kt index e653ec6d307..d916a116d42 100644 --- a/compiler/testData/codegen/boxInline/suspend/capturedVariables.kt +++ b/compiler/testData/codegen/boxInline/suspend/capturedVariables.kt @@ -1,9 +1,8 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* suspend inline fun test1(c: suspend () -> Unit) { @@ -16,10 +15,8 @@ suspend inline fun test2(crossinline c: suspend () -> Unit) { } // FILE: box.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt b/compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt index a5075cb2728..5b00ac8e5a2 100644 --- a/compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt +++ b/compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt @@ -1,9 +1,8 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* inline suspend fun foo(crossinline a: suspend () -> Unit, crossinline b: suspend () -> Unit) { @@ -21,12 +20,10 @@ fun builder(c: suspend () -> Unit) { } // FILE: box.kt -// COMMON_COROUTINES_TEST - fun box(): String { var y = "fail" builder { foo({ y = "O" }) { y += "K" } } return y -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt b/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt index 3f4bcfc9006..911f9ebd0d5 100644 --- a/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt +++ b/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt @@ -1,10 +1,9 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* class Controller { @@ -38,9 +37,7 @@ suspend inline fun test3(controller: Controller = defaultController, crossinline } // FILE: box.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt b/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt index af2a989202a..644d74c3e4f 100644 --- a/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt +++ b/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt @@ -1,10 +1,9 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* class Controller { @@ -18,9 +17,7 @@ suspend inline fun test(controller: Controller = defaultController, c: suspend C } // FILE: box.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt b/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt index a4382510c57..22633a69837 100644 --- a/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt +++ b/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt @@ -1,10 +1,9 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* class Controller { @@ -18,9 +17,7 @@ suspend inline fun test(controller: Controller, c: () -> Unit = { controller.re } // FILE: box.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt b/compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt index 2de5ca1129c..79dd8b581f6 100644 --- a/compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt +++ b/compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt @@ -1,10 +1,9 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // WITH_REFLECT -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* import kotlin.reflect.KProperty @@ -29,9 +28,7 @@ suspend inline fun test(crossinline c: suspend (String) -> String): String { } // FILE: box.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun builder(c: suspend () -> Unit) { @@ -46,4 +43,4 @@ fun box(): String { res = test { it } } return res -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt b/compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt index beca6d56678..ac7ca97eb5d 100644 --- a/compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt +++ b/compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt @@ -1,5 +1,4 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES @@ -30,9 +29,7 @@ inline fun Flow<*>.filterIsInstance(): Flow = filter { it is R } as Flow // FILE: box.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/enclodingMethod.kt b/compiler/testData/codegen/boxInline/suspend/enclodingMethod.kt index fca768a6649..d0975166d0e 100644 --- a/compiler/testData/codegen/boxInline/suspend/enclodingMethod.kt +++ b/compiler/testData/codegen/boxInline/suspend/enclodingMethod.kt @@ -1,6 +1,5 @@ // TARGET_BACKEND: JVM // FILE: flow.kt -// COMMON_COROUTINES_TEST // FULL_JDK // WITH_RUNTIME // WITH_COROUTINES @@ -43,8 +42,6 @@ inline fun decorate() = suspend { } // FILE: box.kt -// COMMON_COROUTINES_TEST - import flow.* fun box() : String { diff --git a/compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt b/compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt index 15a4f9e48d1..a5521b9c995 100644 --- a/compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt @@ -1,9 +1,8 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* // Block is allowed to be called from nested classes/lambdas (as common crossinlines) @@ -32,8 +31,6 @@ fun builder(c: suspend () -> Unit) { } // FILE: box.kt -// COMMON_COROUTINES_TEST - suspend fun calculate() = "OK" fun box(): String { diff --git a/compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt b/compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt index c7fc5f17467..1d256ff2ae7 100644 --- a/compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt @@ -1,9 +1,8 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* // Block is allowed to be called from nested classes/lambdas (as common crossinlines) @@ -37,8 +36,6 @@ fun builder(c: suspend () -> Unit) { } // FILE: box.kt -// COMMON_COROUTINES_TEST - suspend fun calculate() = "OK" fun box(): String { diff --git a/compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt b/compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt index 6797a429499..2272e155a1c 100644 --- a/compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt +++ b/compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt @@ -1,5 +1,4 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING @@ -36,12 +35,10 @@ suspend inline fun test5(crossinline c: suspend() -> Unit) { } // FILE: box.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* -import COROUTINES_PACKAGE.jvm.internal.* +import kotlin.coroutines.jvm.internal.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt index 40ea9b34541..202ff0ace90 100644 --- a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt +++ b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt @@ -1,8 +1,7 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* // Block is allowed to be called inside the body of owner inline function @@ -40,9 +39,7 @@ fun builder(c: suspend () -> Unit) { } // FILE: box.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun box() : String { diff --git a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt index 8d4f7be1c72..96ea53cf6c1 100644 --- a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt @@ -1,9 +1,8 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* // Block is allowed to be called inside the body of owner inline function @@ -33,9 +32,7 @@ suspend inline fun test3(crossinline c: suspend () -> Unit) { } // FILE: box.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt index a0d25fba8ae..97d3a8bd5e3 100644 --- a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt +++ b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt @@ -1,8 +1,7 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* // Block is allowed to be called inside the body of owner inline function @@ -40,9 +39,7 @@ fun builder(c: suspend () -> Unit) { } // FILE: box.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun box() : String { diff --git a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt index c57caf2dea6..b0567dab7c2 100644 --- a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt @@ -1,9 +1,8 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* // Block is allowed to be called from nested classes/lambdas (as common crossinlines) @@ -43,9 +42,7 @@ suspend inline fun test4(noinline c: suspend () -> Unit) { } // FILE: box.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* suspend fun calculate() = "OK" diff --git a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt index a1032fc5ded..b3c16a7b24f 100644 --- a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt +++ b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt @@ -1,10 +1,9 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* // Block is allowed to be called inside the body of owner inline function @@ -23,9 +22,7 @@ inline fun transform(crossinline c: suspend () -> Unit) { } // FILE: box.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* suspend fun calculate() = "OK" diff --git a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt index 6886678e0d9..dd34e3ca116 100644 --- a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt @@ -1,10 +1,9 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* // Block is allowed to be called inside the body of owner inline function @@ -15,9 +14,7 @@ suspend inline fun test(c: suspend () -> Unit) { } // FILE: box.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/jvmName.kt b/compiler/testData/codegen/boxInline/suspend/jvmName.kt index cc2b0022165..abe9f30594e 100644 --- a/compiler/testData/codegen/boxInline/suspend/jvmName.kt +++ b/compiler/testData/codegen/boxInline/suspend/jvmName.kt @@ -1,11 +1,10 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING // TARGET_BACKEND: JVM -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* class Result(val x: T) @@ -17,10 +16,8 @@ suspend inline fun test(c: Result) = c.x suspend inline fun test(c: Result) = c.x // FILE: box.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt b/compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt index bd7723034fa..53a2f13b391 100644 --- a/compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt +++ b/compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt @@ -3,8 +3,6 @@ // NO_CHECK_LAMBDA_INLINING // WITH_RUNTIME // WITH_COROUTINES -// COMMON_COROUTINES_TEST - fun handle(f: suspend () -> Unit) {} open class Foo { @@ -26,8 +24,6 @@ class Bar : Foo() { class Baz(unit: Unit) // FILE: inlineSite.kt -// COMMON_COROUTINES_TEST - fun box(): String { Bar().bar {} return "OK" diff --git a/compiler/testData/codegen/boxInline/suspend/multipleLocals.kt b/compiler/testData/codegen/boxInline/suspend/multipleLocals.kt index a8960ae97fe..b0e93f73385 100644 --- a/compiler/testData/codegen/boxInline/suspend/multipleLocals.kt +++ b/compiler/testData/codegen/boxInline/suspend/multipleLocals.kt @@ -1,5 +1,4 @@ // FILE: inlined.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING @@ -60,9 +59,7 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt b/compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt index 4309e753c7c..48426297d9c 100644 --- a/compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt +++ b/compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt @@ -1,5 +1,4 @@ // FILE: inlined.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING @@ -27,9 +26,7 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun builder(c: suspend () -> Unit) { @@ -75,4 +72,4 @@ fun box(): String { if (j != 10) return "FAIL J" if (k != 10) return "FAIL K" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt b/compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt index cb66c494798..33e10a0e4bb 100644 --- a/compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt +++ b/compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt @@ -1,4 +1,3 @@ -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // CHECK_STATE_MACHINE @@ -38,7 +37,7 @@ inline fun map3(source: MyDeferred, crossinline mapper1: (T) // FILE: box.kt import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) @@ -60,4 +59,4 @@ fun box(): String { } if (result != 10) return "FAIL 3 $result" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt b/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt index e94339a6c65..3cacae437c4 100644 --- a/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt @@ -1,9 +1,8 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // SKIP_SOURCEMAP_REMAPPING -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* // Block is allowed to be called from nested classes/lambdas (as common crossinlines) @@ -36,8 +35,6 @@ fun builder(controller: Controller, c: suspend Controller.() -> Unit) { } // FILE: box.kt -// COMMON_COROUTINES_TEST - suspend fun calculate() = "OK" fun box(): String { diff --git a/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt b/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt index 9e65cc7e552..86f6d390bc6 100644 --- a/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt @@ -1,9 +1,8 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // SKIP_SOURCEMAP_REMAPPING -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* // Block is allowed to be called from nested classes/lambdas (as common crossinlines) @@ -41,8 +40,6 @@ fun builder(controller: Controller, c: suspend Controller.() -> Unit) { } // FILE: box.kt -// COMMON_COROUTINES_TEST - suspend fun calculate() = "OK" fun box(): String { diff --git a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt index f72cdb13483..6f3e3ea9f39 100644 --- a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt +++ b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt @@ -1,9 +1,8 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // IGNORE_BACKEND: JS -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* // Block is allowed to be called inside the body of owner inline function @@ -45,9 +44,7 @@ fun builder(controller : Controller, c: suspend Controller.() -> Unit) { } // FILE: box.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun box() : String { diff --git a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt index 126d7fd59c2..9b3e95addfa 100644 --- a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt @@ -1,9 +1,8 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // SKIP_SOURCEMAP_REMAPPING -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* // Block is allowed to be called inside the body of owner inline function @@ -37,9 +36,7 @@ class Controller { } // FILE: box.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun builder(controller: Controller, c: suspend Controller.() -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt index 1180c7c4e09..2170b31a764 100644 --- a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt +++ b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt @@ -1,9 +1,8 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // IGNORE_BACKEND: JS -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* // Block is allowed to be called inside the body of owner inline function @@ -45,9 +44,7 @@ fun builder(controller: Controller, c: suspend Controller.() -> Unit) { } // FILE: box.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun box() : String { diff --git a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt index 1e13cf2866d..260096b26ed 100644 --- a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt @@ -1,9 +1,8 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // SKIP_SOURCEMAP_REMAPPING -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* // Block is allowed to be called from nested classes/lambdas (as common crossinlines) @@ -47,9 +46,7 @@ fun builder(controller: Controller, c: suspend Controller.() -> Unit) { } // FILE: box.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* suspend fun calculate() = "OK" diff --git a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt index 4c5a3303491..f9b1f99e407 100644 --- a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt +++ b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt @@ -1,10 +1,9 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* // Block is allowed to be called inside the body of owner inline function @@ -27,9 +26,7 @@ fun builder(controller: Controller, c: suspend Controller.() -> Unit) { } // FILE: box.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* suspend fun calculate() = "OK" diff --git a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt index e93f778b2f5..36b3072b44e 100644 --- a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt @@ -1,10 +1,9 @@ // FILE: test.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* // Block is allowed to be called inside the body of owner inline function @@ -19,9 +18,7 @@ class Controller { } // FILE: box.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun builder(controller: Controller, c: suspend Controller.() -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/returnValue.kt b/compiler/testData/codegen/boxInline/suspend/returnValue.kt index dab4fe03b0d..817db3ecb44 100644 --- a/compiler/testData/codegen/boxInline/suspend/returnValue.kt +++ b/compiler/testData/codegen/boxInline/suspend/returnValue.kt @@ -1,10 +1,9 @@ // FILE: inlined.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* inline suspend fun suspendThere(v: String): String = suspendCoroutineUninterceptedOrReturn { x -> @@ -19,9 +18,8 @@ suspend inline fun complexSuspend(crossinline c: suspend () -> String): String { } // FILE: inleneSite.kt -// COMMON_COROUTINES_TEST -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt index 84af03aaa19..b866fb06668 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt @@ -1,4 +1,3 @@ -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // CHECK_STATE_MACHINE @@ -6,7 +5,7 @@ // FILE: inline.kt import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* interface SuspendRunnable { suspend fun run() @@ -40,10 +39,8 @@ inline suspend fun inlineMe(crossinline c1: suspend () -> Unit) { // FILE: box.kt -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(c: suspend () -> Unit) { c.startCoroutine(CheckStateMachineContinuation) diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt index 60b882c4d27..d8a7ef5f0a7 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt @@ -1,4 +1,3 @@ -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // CHECK_STATE_MACHINE @@ -40,10 +39,8 @@ inline fun inlineMe2(crossinline c2: suspend () -> Unit): SuspendRunnable = } // FILE: box.kt -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(c: suspend () -> Unit) { c.startCoroutine(CheckStateMachineContinuation) @@ -65,4 +62,4 @@ fun box(): String { } StateMachineChecker.check(numberOfSuspensions = 4) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt index 462d21bd780..7677d0f4170 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt @@ -1,5 +1,4 @@ // FILE: inlined.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING @@ -15,10 +14,8 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt index 5aec1077517..d1a5918c833 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt @@ -1,6 +1,5 @@ // IGNORE_BACKEND_FIR: JVM_IR // FILE: inlined.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING @@ -20,10 +19,8 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt index 6edf3d7c16c..f286865f78a 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt @@ -1,11 +1,10 @@ // FILE: inlined.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING // CHECK_STATE_MACHINE -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.intrinsics.* import helpers.* suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { @@ -21,9 +20,7 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt index 61c4dee625a..fc31a227aea 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt @@ -1,6 +1,5 @@ // IGNORE_BACKEND_FIR: JVM_IR // FILE: inlined.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING @@ -46,10 +45,8 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt index e257cafcd67..a60a9da3935 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt @@ -1,6 +1,5 @@ // IGNORE_BACKEND_FIR: JVM_IR // FILE: inlined.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING @@ -20,10 +19,8 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt index 1de655b1392..e9912fc010d 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt @@ -1,5 +1,4 @@ // FILE: inlined.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING @@ -21,10 +20,8 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt index a5a336fbe4a..47d6a5f9fc6 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt @@ -1,5 +1,4 @@ // FILE: inlined.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING @@ -27,10 +26,8 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt index 72049cdce51..7814be72b3d 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt @@ -1,4 +1,3 @@ -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // CHECK_STATE_MACHINE @@ -46,12 +45,10 @@ inline fun Flow.flowWith(crossinline builderBlock: suspend } // FILE: box.kt -// COMMON_COROUTINES_TEST - import flow.* import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(c: suspend () -> Unit) { c.startCoroutine(CheckStateMachineContinuation) diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt index d3ae1435f04..a5c6a414adb 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt @@ -1,5 +1,4 @@ // FILE: inlined.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING @@ -26,9 +25,7 @@ suspend inline fun crossinlineMe(crossinline c1: suspend () -> Unit, crossinline } // FILE: inlineSite.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun builder(c: suspend () -> Unit) { @@ -49,4 +46,4 @@ fun box(): String { StateMachineChecker.check(numberOfSuspensions = 2) if (j != 2) return "FAIL j != 2 $j" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt index e2b36fb44f7..48accc627e6 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt @@ -1,11 +1,10 @@ // FILE: inlined.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING // CHECK_STATE_MACHINE -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.intrinsics.* import helpers.* interface SuspendRunnable { @@ -26,9 +25,7 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt index 96d88510c28..ada4b3018f2 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt @@ -1,4 +1,3 @@ -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // CHECK_STATE_MACHINE @@ -29,10 +28,8 @@ class R : SuspendRunnable { } // FILE: box.kt -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(c: suspend () -> Unit) { c.startCoroutine(CheckStateMachineContinuation) diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt index fe9b071115e..6fd44fd96b6 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt @@ -1,5 +1,4 @@ // FILE: inlined.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING @@ -11,10 +10,8 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt index 3cf406512ec..b95ad874df8 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt @@ -1,5 +1,4 @@ // FILE: inlined.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING @@ -15,10 +14,8 @@ suspend inline fun crossinlineMe2(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt index 7f7855a0873..37c3fe96a6e 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt @@ -1,4 +1,3 @@ -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // CHECK_STATE_MACHINE @@ -22,10 +21,8 @@ inline fun inlineMe(crossinline c: suspend () -> Unit) = { }() // FILE: box.kt -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(c: suspend () -> Unit) { c.startCoroutine(CheckStateMachineContinuation) diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt index 85fce7eea6a..0a2583db9d6 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt @@ -1,4 +1,3 @@ -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // CHECK_STATE_MACHINE @@ -24,10 +23,8 @@ inline fun inlineMe(crossinline c: suspend () -> Unit, crossinline c2: suspend ( } // FILE: box.kt -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(c: suspend () -> Unit) { c.startCoroutine(CheckStateMachineContinuation) diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt index 2ad6b7dd82f..6641edfaa39 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt @@ -1,4 +1,3 @@ -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING @@ -59,10 +58,8 @@ inline suspend fun inlineMe13(crossinline c: suspend () -> Unit) = inlineMe3(c) inline suspend fun inlineMe14(crossinline c: suspend () -> Unit) = inlineMe4(c) // FILE: box.kt -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(c: suspend () -> Unit) { c.startCoroutine(CheckStateMachineContinuation) @@ -146,4 +143,4 @@ fun box(): String { StateMachineChecker.check(numberOfSuspensions = 4) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt index 0592b2005bd..c072baeaba4 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt @@ -1,4 +1,3 @@ -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // CHECK_STATE_MACHINE @@ -31,10 +30,8 @@ inline fun inlineMe2(crossinline c1: suspend () -> Unit) = } // FILE: box.kt -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(c: suspend () -> Unit) { c.startCoroutine(CheckStateMachineContinuation) diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt index d8c3b9f2a92..a00ddca18de 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt @@ -1,4 +1,3 @@ -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // CHECK_STATE_MACHINE @@ -12,10 +11,8 @@ inline fun inlineMe(crossinline c: suspend () -> Unit) = suspend { c(); c() } inline fun inlineMe2(crossinline c: suspend () -> Unit) = inlineMe { c(); c() } // FILE: box.kt -// COMMON_COROUTINES_TEST - import helpers.* -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun builder(c: suspend () -> Unit) { c.startCoroutine(CheckStateMachineContinuation) diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt index a1ccd141afd..59c4e082522 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt @@ -1,5 +1,4 @@ // FILE: inline.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // FULL_JDK @@ -7,7 +6,7 @@ // CHECK_STATE_MACHINE import helpers.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.intrinsics.* fun check() = true @@ -20,7 +19,7 @@ inline suspend fun inlineMe(): Unit { // FILE: box.kt // WITH_COROUTINES -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt b/compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt index 72f4110e2c1..e3c6e91aaee 100644 --- a/compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt +++ b/compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt @@ -1,5 +1,4 @@ // FILE: inlined.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING @@ -38,8 +37,7 @@ private class SafeFlow(private val block: suspend FlowCollector.() -> Unit } // FILE: inlineSite.kt -// COMMON_COROUTINES_TEST -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun Flow.abc() = map { line -> diff --git a/compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt b/compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt index dde11dccd53..ce8cd56391d 100644 --- a/compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt +++ b/compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt @@ -1,5 +1,4 @@ // FILE: inlined.kt -// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING @@ -17,9 +16,7 @@ suspend inline fun crossinlineMe(crossinline c: suspend (String) -> String, cros } // FILE: inlineSite.kt -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* import helpers.* fun builder(c: suspend () -> Unit) { @@ -75,4 +72,4 @@ fun box(): String { inlineSite() } return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.kt b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.kt index 3c406d64a77..6881043ce03 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.kt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.kt @@ -1,7 +1,6 @@ // WITH_RUNTIME -// COMMON_COROUTINES_TEST -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun suspendHere(ctx: CoroutineContext) = suspendCoroutineUninterceptedOrReturn { x -> if (x.context == ctx) x.resume("OK") else x.resume("FAIL") diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.txt b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.txt index 9df177c7292..1920ff7472b 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.txt @@ -1,22 +1,21 @@ @kotlin.Metadata +@kotlin.coroutines.jvm.internal.DebugMetadata final class CoroutineContextIntrinsicKt$notTailCall$1 { // source: 'coroutineContextIntrinsic.kt' - enclosing method CoroutineContextIntrinsicKt.notTailCall(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; - synthetic field data: java.lang.Object - synthetic field exception: java.lang.Throwable + enclosing method CoroutineContextIntrinsicKt.notTailCall(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + field label: int + synthetic field result: java.lang.Object inner (anonymous) class CoroutineContextIntrinsicKt$notTailCall$1 - method (p0: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - synthetic final method getLabel(): int - synthetic final method setLabel(p0: int): void + method (p0: kotlin.coroutines.Continuation): void + public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } @kotlin.Metadata public final class CoroutineContextIntrinsicKt { // source: 'coroutineContextIntrinsic.kt' inner (anonymous) class CoroutineContextIntrinsicKt$notTailCall$1 - public final static @org.jetbrains.annotations.Nullable method mustBeTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method notTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method retrieveCoroutineContext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method mustBeTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method notTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method retrieveCoroutineContext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic_1_3.txt b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic_1_3.txt deleted file mode 100644 index 1920ff7472b..00000000000 --- a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic_1_3.txt +++ /dev/null @@ -1,21 +0,0 @@ -@kotlin.Metadata -@kotlin.coroutines.jvm.internal.DebugMetadata -final class CoroutineContextIntrinsicKt$notTailCall$1 { - // source: 'coroutineContextIntrinsic.kt' - enclosing method CoroutineContextIntrinsicKt.notTailCall(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - inner (anonymous) class CoroutineContextIntrinsicKt$notTailCall$1 - method (p0: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class CoroutineContextIntrinsicKt { - // source: 'coroutineContextIntrinsic.kt' - inner (anonymous) class CoroutineContextIntrinsicKt$notTailCall$1 - public final static @org.jetbrains.annotations.Nullable method mustBeTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method notTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method retrieveCoroutineContext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.kt b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.kt index 537d3753aaf..9d2c933a6f7 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.kt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.kt @@ -1,8 +1,7 @@ // TODO: KT-37010 KT-37085 // WITH_RUNTIME -// COMMON_COROUTINES_TEST -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere() = suspendCoroutineUninterceptedOrReturn { x -> x.resume("OK") diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.txt b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.txt index 715278a3840..69e6211de5d 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.txt @@ -1,30 +1,28 @@ @kotlin.Metadata +@kotlin.coroutines.jvm.internal.DebugMetadata final class Controller$multipleSuspensions$1 { // source: 'coroutineFields.kt' - enclosing method Controller.multipleSuspensions(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; + enclosing method Controller.multipleSuspensions(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; field L$0: java.lang.Object - synthetic field data: java.lang.Object - synthetic field exception: java.lang.Throwable + field label: int + synthetic field result: java.lang.Object synthetic final field this$0: Controller inner (anonymous) class Controller$multipleSuspensions$1 - method (p0: Controller, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - synthetic final method getLabel(): int - synthetic final method setLabel(p0: int): void + method (p0: Controller, p1: kotlin.coroutines.Continuation): void + public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } @kotlin.Metadata +@kotlin.coroutines.jvm.internal.DebugMetadata final class Controller$nonTailCall$1 { // source: 'coroutineFields.kt' - enclosing method Controller.nonTailCall(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; - synthetic field data: java.lang.Object - synthetic field exception: java.lang.Throwable + enclosing method Controller.nonTailCall(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + field label: int + synthetic field result: java.lang.Object synthetic final field this$0: Controller inner (anonymous) class Controller$nonTailCall$1 - method (p0: Controller, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - synthetic final method getLabel(): int - synthetic final method setLabel(p0: int): void + method (p0: Controller, p1: kotlin.coroutines.Continuation): void + public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } @kotlin.Metadata @@ -33,12 +31,13 @@ public final class Controller { inner (anonymous) class Controller$multipleSuspensions$1 inner (anonymous) class Controller$nonTailCall$1 public method (): void - public final @org.jetbrains.annotations.Nullable method multipleSuspensions(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method nonTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method tailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method multipleSuspensions(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method nonTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method tailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } +@kotlin.coroutines.jvm.internal.DebugMetadata @kotlin.Metadata final class CoroutineFieldsKt$box$1 { // source: 'coroutineFields.kt' @@ -47,11 +46,12 @@ final class CoroutineFieldsKt$box$1 { field J$0: long private synthetic field L$0: java.lang.Object field L$1: java.lang.Object + field label: int inner (anonymous) class CoroutineFieldsKt$box$1 - method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): kotlin.coroutines.experimental.Continuation - public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object + method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.coroutines.Continuation): void + public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation public final method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } @kotlin.Metadata diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_1_3.txt b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_1_3.txt deleted file mode 100644 index 69e6211de5d..00000000000 --- a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_1_3.txt +++ /dev/null @@ -1,63 +0,0 @@ -@kotlin.Metadata -@kotlin.coroutines.jvm.internal.DebugMetadata -final class Controller$multipleSuspensions$1 { - // source: 'coroutineFields.kt' - enclosing method Controller.multipleSuspensions(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field L$0: java.lang.Object - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: Controller - inner (anonymous) class Controller$multipleSuspensions$1 - method (p0: Controller, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -@kotlin.coroutines.jvm.internal.DebugMetadata -final class Controller$nonTailCall$1 { - // source: 'coroutineFields.kt' - enclosing method Controller.nonTailCall(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: Controller - inner (anonymous) class Controller$nonTailCall$1 - method (p0: Controller, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class Controller { - // source: 'coroutineFields.kt' - inner (anonymous) class Controller$multipleSuspensions$1 - inner (anonymous) class Controller$nonTailCall$1 - public method (): void - public final @org.jetbrains.annotations.Nullable method multipleSuspensions(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method nonTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method tailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.coroutines.jvm.internal.DebugMetadata -@kotlin.Metadata -final class CoroutineFieldsKt$box$1 { - // source: 'coroutineFields.kt' - enclosing method CoroutineFieldsKt.box()Ljava/lang/String; - synthetic final field $result: kotlin.jvm.internal.Ref$ObjectRef - field J$0: long - private synthetic field L$0: java.lang.Object - field L$1: java.lang.Object - field label: int - inner (anonymous) class CoroutineFieldsKt$box$1 - method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation - public final method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class CoroutineFieldsKt { - // source: 'coroutineFields.kt' - inner (anonymous) class CoroutineFieldsKt$box$1 - public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String - public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void -} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.kt b/compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.kt index 9fea21bb17a..079d67e03e1 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.kt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.kt @@ -1,7 +1,6 @@ // WITH_RUNTIME -// COMMON_COROUTINES_TEST -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun some() {} @@ -11,4 +10,4 @@ suspend fun test() { } finally { some() } -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.txt b/compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.txt index 0819ca162cb..7ad7a452a5e 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.txt @@ -1,21 +1,20 @@ @kotlin.Metadata +@kotlin.coroutines.jvm.internal.DebugMetadata final class OomInReturnUnitKt$test$1 { // source: 'oomInReturnUnit.kt' - enclosing method OomInReturnUnitKt.test(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; + enclosing method OomInReturnUnitKt.test(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; field L$0: java.lang.Object - synthetic field data: java.lang.Object - synthetic field exception: java.lang.Throwable + field label: int + synthetic field result: java.lang.Object inner (anonymous) class OomInReturnUnitKt$test$1 - method (p0: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - synthetic final method getLabel(): int - synthetic final method setLabel(p0: int): void + method (p0: kotlin.coroutines.Continuation): void + public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } @kotlin.Metadata public final class OomInReturnUnitKt { // source: 'oomInReturnUnit.kt' inner (anonymous) class OomInReturnUnitKt$test$1 - public final static @org.jetbrains.annotations.Nullable method some(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method test(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method some(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method test(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit_1_3.txt b/compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit_1_3.txt deleted file mode 100644 index 7ad7a452a5e..00000000000 --- a/compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit_1_3.txt +++ /dev/null @@ -1,20 +0,0 @@ -@kotlin.Metadata -@kotlin.coroutines.jvm.internal.DebugMetadata -final class OomInReturnUnitKt$test$1 { - // source: 'oomInReturnUnit.kt' - enclosing method OomInReturnUnitKt.test(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field L$0: java.lang.Object - field label: int - synthetic field result: java.lang.Object - inner (anonymous) class OomInReturnUnitKt$test$1 - method (p0: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class OomInReturnUnitKt { - // source: 'oomInReturnUnit.kt' - inner (anonymous) class OomInReturnUnitKt$test$1 - public final static @org.jetbrains.annotations.Nullable method some(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method test(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object -} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.kt b/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.kt index 35aae7d604c..364cb651ea6 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.kt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.kt @@ -1,9 +1,8 @@ // WITH_RUNTIME -// COMMON_COROUTINES_TEST -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* private fun foo() {} private suspend fun bar() = suspendCoroutine { foo() -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.txt b/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.txt index 8465234304b..b7dd9b3abfc 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class PrivateAccessorKt { // source: 'privateAccessor.kt' - synthetic final static method bar(p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + synthetic final static method bar(p0: kotlin.coroutines.Continuation): java.lang.Object private final static method foo(): void } diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor_1_3.txt b/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor_1_3.txt deleted file mode 100644 index b7dd9b3abfc..00000000000 --- a/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor_1_3.txt +++ /dev/null @@ -1,6 +0,0 @@ -@kotlin.Metadata -public final class PrivateAccessorKt { - // source: 'privateAccessor.kt' - synthetic final static method bar(p0: kotlin.coroutines.Continuation): java.lang.Object - private final static method foo(): void -} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor_ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor_ir.txt deleted file mode 100644 index b7dd9b3abfc..00000000000 --- a/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor_ir.txt +++ /dev/null @@ -1,6 +0,0 @@ -@kotlin.Metadata -public final class PrivateAccessorKt { - // source: 'privateAccessor.kt' - synthetic final static method bar(p0: kotlin.coroutines.Continuation): java.lang.Object - private final static method foo(): void -} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun.kt b/compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun.kt index 89e4f357fe4..e5e5b5974af 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun.kt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun.kt @@ -1,4 +1,3 @@ -// COMMON_COROUTINES_TEST // WITH_RUNTIME open class AbstractStuff() { diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun.txt b/compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun.txt index 411031c39cf..99de7cee8da 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun.txt @@ -2,12 +2,12 @@ public class AbstractStuff { // source: 'suspendReifiedFun.kt' public method (): void - public synthetic final method hello(p0: java.lang.Object, p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public synthetic final method hello(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata public final class Stuff { // source: 'suspendReifiedFun.kt' public method (): void - public final @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun_1_3.txt b/compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun_1_3.txt deleted file mode 100644 index 99de7cee8da..00000000000 --- a/compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun_1_3.txt +++ /dev/null @@ -1,13 +0,0 @@ -@kotlin.Metadata -public class AbstractStuff { - // source: 'suspendReifiedFun.kt' - public method (): void - public synthetic final method hello(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class Stuff { - // source: 'suspendReifiedFun.kt' - public method (): void - public final @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object -} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.kt b/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.kt index cb95e9e91dd..5ccf857c790 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.kt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.kt @@ -1,5 +1,4 @@ // TODO: KT-36987 KT-37093 -// COMMON_COROUTINES_TEST // WITH_RUNTIME // There should be no $foo$$inlined$map$1$1 class diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.txt b/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.txt index 56111dbc299..11ccae7c8e5 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.txt @@ -1,55 +1,51 @@ @kotlin.Metadata public interface Flow { // source: 'tcoContinuation.kt' - public abstract @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public abstract @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata public interface FlowCollector { // source: 'tcoContinuation.kt' - public abstract @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public abstract @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata public final class TcoContinuationKt$collect$2$emit$1 { // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$collect$2.emit(Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; - synthetic field data: java.lang.Object - synthetic field exception: java.lang.Throwable + enclosing method TcoContinuationKt$collect$2.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + field label: int + synthetic field result: java.lang.Object synthetic final field this$0: TcoContinuationKt$collect$2 inner (anonymous) class TcoContinuationKt$collect$2 inner (anonymous) class TcoContinuationKt$collect$2$emit$1 - public method (p0: TcoContinuationKt$collect$2, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - synthetic final method getLabel(): int - synthetic final method setLabel(p0: int): void + public method (p0: TcoContinuationKt$collect$2, p1: kotlin.coroutines.Continuation): void + public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } @kotlin.Metadata public final class TcoContinuationKt$collect$2 { // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.collect(LFlow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; + enclosing method TcoContinuationKt.collect(LFlow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; synthetic final field $action: kotlin.jvm.functions.Function2 inner (anonymous) class TcoContinuationKt$collect$2 inner (anonymous) class TcoContinuationKt$collect$2$emit$1 public method (p0: kotlin.jvm.functions.Function2): void - public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata public final class TcoContinuationKt$flow$1$collect$1 { // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$flow$1.collect(LFlowCollector;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; - synthetic field data: java.lang.Object - synthetic field exception: java.lang.Throwable + enclosing method TcoContinuationKt$flow$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + field label: int + synthetic field result: java.lang.Object synthetic final field this$0: TcoContinuationKt$flow$1 inner (anonymous) class TcoContinuationKt$flow$1 inner (anonymous) class TcoContinuationKt$flow$1$collect$1 - public method (p0: TcoContinuationKt$flow$1, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - synthetic final method getLabel(): int - synthetic final method setLabel(p0: int): void + public method (p0: TcoContinuationKt$flow$1, p1: kotlin.coroutines.Continuation): void + public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } @kotlin.Metadata @@ -60,105 +56,101 @@ public final class TcoContinuationKt$flow$1 { inner (anonymous) class TcoContinuationKt$flow$1 inner (anonymous) class TcoContinuationKt$flow$1$collect$1 public method (p0: kotlin.jvm.functions.Function2): void - public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata public final class TcoContinuationKt$foo$$inlined$collect$1 { // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.foo(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; + enclosing method TcoContinuationKt.foo(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; inner (anonymous) class TcoContinuationKt$foo$$inlined$collect$1 public method (): void - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata public final class TcoContinuationKt$foo$$inlined$flow$1 { // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.foo(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; + enclosing method TcoContinuationKt.foo(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; inner (anonymous) class TcoContinuationKt$foo$$inlined$flow$1 public method (): void - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata +@kotlin.coroutines.jvm.internal.DebugMetadata public final class TcoContinuationKt$foo$$inlined$map$1$2$1 { - enclosing method TcoContinuationKt$foo$$inlined$map$1$2.emit(Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; + enclosing method TcoContinuationKt$foo$$inlined$map$1$2.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; field L$0: java.lang.Object - synthetic field data: java.lang.Object - synthetic field exception: java.lang.Throwable + field label: int + synthetic field result: java.lang.Object synthetic final field this$0: TcoContinuationKt$foo$$inlined$map$1$2 inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1$2 inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1$2$1 - public method (p0: TcoContinuationKt$foo$$inlined$map$1$2, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - synthetic final method getLabel(): int - synthetic final method setLabel(p0: int): void + public method (p0: TcoContinuationKt$foo$$inlined$map$1$2, p1: kotlin.coroutines.Continuation): void + public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } @kotlin.Metadata public final class TcoContinuationKt$foo$$inlined$map$1$2 { // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$foo$$inlined$map$1.collect(LFlowCollector;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; + enclosing method TcoContinuationKt$foo$$inlined$map$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; synthetic final field $this_flow$inlined: FlowCollector synthetic final field this$0: TcoContinuationKt$foo$$inlined$map$1 inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1$2 inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1$2$1 public method (p0: FlowCollector, p1: TcoContinuationKt$foo$$inlined$map$1): void - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata public final class TcoContinuationKt$foo$$inlined$map$1 { // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.foo(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; + enclosing method TcoContinuationKt.foo(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; synthetic final field $this_transform$inlined: Flow inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1 public method (p0: Flow): void - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata public final class TcoContinuationKt$map$$inlined$transform$1$1 { - enclosing method TcoContinuationKt$map$$inlined$transform$1.collect(LFlowCollector;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; - synthetic field data: java.lang.Object - synthetic field exception: java.lang.Throwable + enclosing method TcoContinuationKt$map$$inlined$transform$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + field label: int + synthetic field result: java.lang.Object synthetic final field this$0: TcoContinuationKt$map$$inlined$transform$1 inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1 inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$1 - public method (p0: TcoContinuationKt$map$$inlined$transform$1, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - synthetic final method getLabel(): int - synthetic final method setLabel(p0: int): void + public method (p0: TcoContinuationKt$map$$inlined$transform$1, p1: kotlin.coroutines.Continuation): void + public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } @kotlin.Metadata +@kotlin.coroutines.jvm.internal.DebugMetadata public final class TcoContinuationKt$map$$inlined$transform$1$2$1 { - enclosing method TcoContinuationKt$map$$inlined$transform$1$2.emit(Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; + enclosing method TcoContinuationKt$map$$inlined$transform$1$2.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; field L$0: java.lang.Object - synthetic field data: java.lang.Object - synthetic field exception: java.lang.Throwable + field label: int + synthetic field result: java.lang.Object synthetic final field this$0: TcoContinuationKt$map$$inlined$transform$1$2 inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$2 inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$2$1 - public method (p0: TcoContinuationKt$map$$inlined$transform$1$2, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - synthetic final method getLabel(): int - synthetic final method setLabel(p0: int): void + public method (p0: TcoContinuationKt$map$$inlined$transform$1$2, p1: kotlin.coroutines.Continuation): void + public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } @kotlin.Metadata public final class TcoContinuationKt$map$$inlined$transform$1$2 { // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$map$$inlined$transform$1.collect(LFlowCollector;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; + enclosing method TcoContinuationKt$map$$inlined$transform$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; synthetic final field $this_flow$inlined: FlowCollector synthetic final field this$0: TcoContinuationKt$map$$inlined$transform$1 inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$2 inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$2$1 public method (p0: FlowCollector, p1: TcoContinuationKt$map$$inlined$transform$1): void - public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata @@ -170,50 +162,47 @@ public final class TcoContinuationKt$map$$inlined$transform$1 { inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1 inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$1 public method (p0: Flow, p1: kotlin.jvm.functions.Function2): void - public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata public final class TcoContinuationKt$map$$inlined$transform$2$1 { - enclosing method TcoContinuationKt$map$$inlined$transform$2.collect(LFlowCollector;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; - synthetic field data: java.lang.Object - synthetic field exception: java.lang.Throwable + enclosing method TcoContinuationKt$map$$inlined$transform$2.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + field label: int + synthetic field result: java.lang.Object synthetic final field this$0: TcoContinuationKt$map$$inlined$transform$2 inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2 inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2$1 - public method (p0: TcoContinuationKt$map$$inlined$transform$2, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - synthetic final method getLabel(): int - synthetic final method setLabel(p0: int): void + public method (p0: TcoContinuationKt$map$$inlined$transform$2, p1: kotlin.coroutines.Continuation): void + public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } @kotlin.Metadata +@kotlin.coroutines.jvm.internal.DebugMetadata public final class TcoContinuationKt$map$$inlined$transform$2$2$1 { - enclosing method TcoContinuationKt$map$$inlined$transform$2$2.emit(Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; + enclosing method TcoContinuationKt$map$$inlined$transform$2$2.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; field L$0: java.lang.Object - synthetic field data: java.lang.Object - synthetic field exception: java.lang.Throwable + field label: int + synthetic field result: java.lang.Object synthetic final field this$0: TcoContinuationKt$map$$inlined$transform$2$2 inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2$2 inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2$2$1 - public method (p0: TcoContinuationKt$map$$inlined$transform$2$2, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - synthetic final method getLabel(): int - synthetic final method setLabel(p0: int): void + public method (p0: TcoContinuationKt$map$$inlined$transform$2$2, p1: kotlin.coroutines.Continuation): void + public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } @kotlin.Metadata public final class TcoContinuationKt$map$$inlined$transform$2$2 { // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$map$$inlined$transform$2.collect(LFlowCollector;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; + enclosing method TcoContinuationKt$map$$inlined$transform$2.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; synthetic final field $this_flow$inlined: FlowCollector synthetic final field this$0: TcoContinuationKt$map$$inlined$transform$2 inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2$2 inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2$2$1 public method (p0: FlowCollector, p1: TcoContinuationKt$map$$inlined$transform$2): void - public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata @@ -225,49 +214,45 @@ public final class TcoContinuationKt$map$$inlined$transform$2 { inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2 inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2$1 public method (p0: Flow, p1: kotlin.jvm.functions.Function2): void - public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata public final class TcoContinuationKt$transform$$inlined$flow$1$1 { - enclosing method TcoContinuationKt$transform$$inlined$flow$1.collect(LFlowCollector;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; - synthetic field data: java.lang.Object - synthetic field exception: java.lang.Throwable + enclosing method TcoContinuationKt$transform$$inlined$flow$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + field label: int + synthetic field result: java.lang.Object synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$1 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$1 - public method (p0: TcoContinuationKt$transform$$inlined$flow$1, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - synthetic final method getLabel(): int - synthetic final method setLabel(p0: int): void + public method (p0: TcoContinuationKt$transform$$inlined$flow$1, p1: kotlin.coroutines.Continuation): void + public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } @kotlin.Metadata public final class TcoContinuationKt$transform$$inlined$flow$1$lambda$1$1 { - enclosing method TcoContinuationKt$transform$$inlined$flow$1$lambda$1.emit(Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; - synthetic field data: java.lang.Object - synthetic field exception: java.lang.Throwable + enclosing method TcoContinuationKt$transform$$inlined$flow$1$lambda$1.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + field label: int + synthetic field result: java.lang.Object synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$1$lambda$1 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$lambda$1 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$lambda$1$1 - public method (p0: TcoContinuationKt$transform$$inlined$flow$1$lambda$1, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - synthetic final method getLabel(): int - synthetic final method setLabel(p0: int): void + public method (p0: TcoContinuationKt$transform$$inlined$flow$1$lambda$1, p1: kotlin.coroutines.Continuation): void + public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } @kotlin.Metadata public final class TcoContinuationKt$transform$$inlined$flow$1$lambda$1 { // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$transform$$inlined$flow$1.collect(LFlowCollector;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; + enclosing method TcoContinuationKt$transform$$inlined$flow$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; synthetic final field $this_flow$inlined: FlowCollector synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$1 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$lambda$1 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$lambda$1$1 public method (p0: FlowCollector, p1: TcoContinuationKt$transform$$inlined$flow$1): void - public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata @@ -279,49 +264,45 @@ public final class TcoContinuationKt$transform$$inlined$flow$1 { inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$1 public method (p0: Flow, p1: kotlin.jvm.functions.Function3): void - public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata public final class TcoContinuationKt$transform$$inlined$flow$2$1 { - enclosing method TcoContinuationKt$transform$$inlined$flow$2.collect(LFlowCollector;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; - synthetic field data: java.lang.Object - synthetic field exception: java.lang.Throwable + enclosing method TcoContinuationKt$transform$$inlined$flow$2.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + field label: int + synthetic field result: java.lang.Object synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$2 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2$1 - public method (p0: TcoContinuationKt$transform$$inlined$flow$2, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - synthetic final method getLabel(): int - synthetic final method setLabel(p0: int): void + public method (p0: TcoContinuationKt$transform$$inlined$flow$2, p1: kotlin.coroutines.Continuation): void + public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } @kotlin.Metadata public final class TcoContinuationKt$transform$$inlined$flow$2$lambda$1$1 { - enclosing method TcoContinuationKt$transform$$inlined$flow$2$lambda$1.emit(Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; - synthetic field data: java.lang.Object - synthetic field exception: java.lang.Throwable + enclosing method TcoContinuationKt$transform$$inlined$flow$2$lambda$1.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + field label: int + synthetic field result: java.lang.Object synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$2$lambda$1 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2$lambda$1 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2$lambda$1$1 - public method (p0: TcoContinuationKt$transform$$inlined$flow$2$lambda$1, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - synthetic final method getLabel(): int - synthetic final method setLabel(p0: int): void + public method (p0: TcoContinuationKt$transform$$inlined$flow$2$lambda$1, p1: kotlin.coroutines.Continuation): void + public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } @kotlin.Metadata public final class TcoContinuationKt$transform$$inlined$flow$2$lambda$1 { // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$transform$$inlined$flow$2.collect(LFlowCollector;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; + enclosing method TcoContinuationKt$transform$$inlined$flow$2.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; synthetic final field $this_flow$inlined: FlowCollector synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$2 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2$lambda$1 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2$lambda$1$1 public method (p0: FlowCollector, p1: TcoContinuationKt$transform$$inlined$flow$2): void - public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata @@ -333,49 +314,45 @@ public final class TcoContinuationKt$transform$$inlined$flow$2 { inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2$1 public method (p0: Flow, p1: kotlin.jvm.functions.Function3): void - public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata public final class TcoContinuationKt$transform$$inlined$flow$3$1 { - enclosing method TcoContinuationKt$transform$$inlined$flow$3.collect(LFlowCollector;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; - synthetic field data: java.lang.Object - synthetic field exception: java.lang.Throwable + enclosing method TcoContinuationKt$transform$$inlined$flow$3.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + field label: int + synthetic field result: java.lang.Object synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$3 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3$1 - public method (p0: TcoContinuationKt$transform$$inlined$flow$3, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - synthetic final method getLabel(): int - synthetic final method setLabel(p0: int): void + public method (p0: TcoContinuationKt$transform$$inlined$flow$3, p1: kotlin.coroutines.Continuation): void + public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } @kotlin.Metadata public final class TcoContinuationKt$transform$$inlined$flow$3$lambda$1$1 { - enclosing method TcoContinuationKt$transform$$inlined$flow$3$lambda$1.emit(Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; - synthetic field data: java.lang.Object - synthetic field exception: java.lang.Throwable + enclosing method TcoContinuationKt$transform$$inlined$flow$3$lambda$1.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + field label: int + synthetic field result: java.lang.Object synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$3$lambda$1 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3$lambda$1 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3$lambda$1$1 - public method (p0: TcoContinuationKt$transform$$inlined$flow$3$lambda$1, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - synthetic final method getLabel(): int - synthetic final method setLabel(p0: int): void + public method (p0: TcoContinuationKt$transform$$inlined$flow$3$lambda$1, p1: kotlin.coroutines.Continuation): void + public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } @kotlin.Metadata public final class TcoContinuationKt$transform$$inlined$flow$3$lambda$1 { // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$transform$$inlined$flow$3.collect(LFlowCollector;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object; + enclosing method TcoContinuationKt$transform$$inlined$flow$3.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; synthetic final field $this_flow$inlined: FlowCollector synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$3 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3$lambda$1 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3$lambda$1$1 public method (p0: FlowCollector, p1: TcoContinuationKt$transform$$inlined$flow$3): void - public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata @@ -387,8 +364,8 @@ public final class TcoContinuationKt$transform$$inlined$flow$3 { inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3$1 public method (p0: Flow, p1: kotlin.jvm.functions.Function3): void - public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata @@ -396,10 +373,10 @@ public final class TcoContinuationKt { // source: 'tcoContinuation.kt' inner (anonymous) class TcoContinuationKt$collect$2 inner (anonymous) class TcoContinuationKt$flow$1 - private final static @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: Flow, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.experimental.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: Flow, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.experimental.Continuation): java.lang.Object + private final static @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: Flow, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: Flow, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object public final static @org.jetbrains.annotations.NotNull method flow(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): Flow - public final static @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object public final static @org.jetbrains.annotations.NotNull method map(@org.jetbrains.annotations.NotNull p0: Flow, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2): Flow public final static @org.jetbrains.annotations.NotNull method transform(@org.jetbrains.annotations.NotNull p0: Flow, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function3): Flow } diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation_1_3.txt b/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation_1_3.txt deleted file mode 100644 index 11ccae7c8e5..00000000000 --- a/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation_1_3.txt +++ /dev/null @@ -1,382 +0,0 @@ -@kotlin.Metadata -public interface Flow { - // source: 'tcoContinuation.kt' - public abstract @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public interface FlowCollector { - // source: 'tcoContinuation.kt' - public abstract @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$collect$2$emit$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$collect$2.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$collect$2 - inner (anonymous) class TcoContinuationKt$collect$2 - inner (anonymous) class TcoContinuationKt$collect$2$emit$1 - public method (p0: TcoContinuationKt$collect$2, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$collect$2 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.collect(LFlow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - synthetic final field $action: kotlin.jvm.functions.Function2 - inner (anonymous) class TcoContinuationKt$collect$2 - inner (anonymous) class TcoContinuationKt$collect$2$emit$1 - public method (p0: kotlin.jvm.functions.Function2): void - public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$flow$1$collect$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$flow$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$flow$1 - inner (anonymous) class TcoContinuationKt$flow$1 - inner (anonymous) class TcoContinuationKt$flow$1$collect$1 - public method (p0: TcoContinuationKt$flow$1, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$flow$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.flow(Lkotlin/jvm/functions/Function2;)LFlow; - synthetic final field $block: kotlin.jvm.functions.Function2 - inner (anonymous) class TcoContinuationKt$flow$1 - inner (anonymous) class TcoContinuationKt$flow$1$collect$1 - public method (p0: kotlin.jvm.functions.Function2): void - public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$foo$$inlined$collect$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.foo(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - inner (anonymous) class TcoContinuationKt$foo$$inlined$collect$1 - public method (): void - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$foo$$inlined$flow$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.foo(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - inner (anonymous) class TcoContinuationKt$foo$$inlined$flow$1 - public method (): void - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -@kotlin.coroutines.jvm.internal.DebugMetadata -public final class TcoContinuationKt$foo$$inlined$map$1$2$1 { - enclosing method TcoContinuationKt$foo$$inlined$map$1$2.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field L$0: java.lang.Object - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$foo$$inlined$map$1$2 - inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1$2 - inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1$2$1 - public method (p0: TcoContinuationKt$foo$$inlined$map$1$2, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$foo$$inlined$map$1$2 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$foo$$inlined$map$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - synthetic final field $this_flow$inlined: FlowCollector - synthetic final field this$0: TcoContinuationKt$foo$$inlined$map$1 - inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1$2 - inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1$2$1 - public method (p0: FlowCollector, p1: TcoContinuationKt$foo$$inlined$map$1): void - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$foo$$inlined$map$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.foo(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - synthetic final field $this_transform$inlined: Flow - inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1 - public method (p0: Flow): void - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$map$$inlined$transform$1$1 { - enclosing method TcoContinuationKt$map$$inlined$transform$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$map$$inlined$transform$1 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$1 - public method (p0: TcoContinuationKt$map$$inlined$transform$1, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -@kotlin.coroutines.jvm.internal.DebugMetadata -public final class TcoContinuationKt$map$$inlined$transform$1$2$1 { - enclosing method TcoContinuationKt$map$$inlined$transform$1$2.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field L$0: java.lang.Object - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$map$$inlined$transform$1$2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$2$1 - public method (p0: TcoContinuationKt$map$$inlined$transform$1$2, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$map$$inlined$transform$1$2 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$map$$inlined$transform$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - synthetic final field $this_flow$inlined: FlowCollector - synthetic final field this$0: TcoContinuationKt$map$$inlined$transform$1 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$2$1 - public method (p0: FlowCollector, p1: TcoContinuationKt$map$$inlined$transform$1): void - public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$map$$inlined$transform$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.map(LFlow;Lkotlin/jvm/functions/Function2;)LFlow; - synthetic final field $this_transform$inlined: Flow - synthetic final field $transformer$inlined$1: kotlin.jvm.functions.Function2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$1 - public method (p0: Flow, p1: kotlin.jvm.functions.Function2): void - public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$map$$inlined$transform$2$1 { - enclosing method TcoContinuationKt$map$$inlined$transform$2.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$map$$inlined$transform$2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2$1 - public method (p0: TcoContinuationKt$map$$inlined$transform$2, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -@kotlin.coroutines.jvm.internal.DebugMetadata -public final class TcoContinuationKt$map$$inlined$transform$2$2$1 { - enclosing method TcoContinuationKt$map$$inlined$transform$2$2.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field L$0: java.lang.Object - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$map$$inlined$transform$2$2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2$2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2$2$1 - public method (p0: TcoContinuationKt$map$$inlined$transform$2$2, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$map$$inlined$transform$2$2 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$map$$inlined$transform$2.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - synthetic final field $this_flow$inlined: FlowCollector - synthetic final field this$0: TcoContinuationKt$map$$inlined$transform$2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2$2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2$2$1 - public method (p0: FlowCollector, p1: TcoContinuationKt$map$$inlined$transform$2): void - public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$map$$inlined$transform$2 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.map(LFlow;Lkotlin/jvm/functions/Function2;)LFlow; - synthetic final field $this_transform$inlined: Flow - synthetic final field $transformer$inlined$1: kotlin.jvm.functions.Function2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2$1 - public method (p0: Flow, p1: kotlin.jvm.functions.Function2): void - public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$1$1 { - enclosing method TcoContinuationKt$transform$$inlined$flow$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$1 - public method (p0: TcoContinuationKt$transform$$inlined$flow$1, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$1$lambda$1$1 { - enclosing method TcoContinuationKt$transform$$inlined$flow$1$lambda$1.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$1$lambda$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$lambda$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$lambda$1$1 - public method (p0: TcoContinuationKt$transform$$inlined$flow$1$lambda$1, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$1$lambda$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$transform$$inlined$flow$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - synthetic final field $this_flow$inlined: FlowCollector - synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$lambda$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$lambda$1$1 - public method (p0: FlowCollector, p1: TcoContinuationKt$transform$$inlined$flow$1): void - public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.transform(LFlow;Lkotlin/jvm/functions/Function3;)LFlow; - synthetic final field $this_transform$inlined: Flow - synthetic final field $transformer$inlined: kotlin.jvm.functions.Function3 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$1 - public method (p0: Flow, p1: kotlin.jvm.functions.Function3): void - public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$2$1 { - enclosing method TcoContinuationKt$transform$$inlined$flow$2.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$2 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2$1 - public method (p0: TcoContinuationKt$transform$$inlined$flow$2, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$2$lambda$1$1 { - enclosing method TcoContinuationKt$transform$$inlined$flow$2$lambda$1.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$2$lambda$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2$lambda$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2$lambda$1$1 - public method (p0: TcoContinuationKt$transform$$inlined$flow$2$lambda$1, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$2$lambda$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$transform$$inlined$flow$2.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - synthetic final field $this_flow$inlined: FlowCollector - synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$2 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2$lambda$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2$lambda$1$1 - public method (p0: FlowCollector, p1: TcoContinuationKt$transform$$inlined$flow$2): void - public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$2 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.transform(LFlow;Lkotlin/jvm/functions/Function3;)LFlow; - synthetic final field $this_transform$inlined: Flow - synthetic final field $transformer$inlined: kotlin.jvm.functions.Function3 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2$1 - public method (p0: Flow, p1: kotlin.jvm.functions.Function3): void - public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$3$1 { - enclosing method TcoContinuationKt$transform$$inlined$flow$3.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$3 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3$1 - public method (p0: TcoContinuationKt$transform$$inlined$flow$3, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$3$lambda$1$1 { - enclosing method TcoContinuationKt$transform$$inlined$flow$3$lambda$1.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$3$lambda$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3$lambda$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3$lambda$1$1 - public method (p0: TcoContinuationKt$transform$$inlined$flow$3$lambda$1, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$3$lambda$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$transform$$inlined$flow$3.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - synthetic final field $this_flow$inlined: FlowCollector - synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$3 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3$lambda$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3$lambda$1$1 - public method (p0: FlowCollector, p1: TcoContinuationKt$transform$$inlined$flow$3): void - public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$3 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.transform(LFlow;Lkotlin/jvm/functions/Function3;)LFlow; - synthetic final field $this_transform$inlined: Flow - synthetic final field $transformer$inlined: kotlin.jvm.functions.Function3 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3$1 - public method (p0: Flow, p1: kotlin.jvm.functions.Function3): void - public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt { - // source: 'tcoContinuation.kt' - inner (anonymous) class TcoContinuationKt$collect$2 - inner (anonymous) class TcoContinuationKt$flow$1 - private final static @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: Flow, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: Flow, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.NotNull method flow(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): Flow - public final static @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.NotNull method map(@org.jetbrains.annotations.NotNull p0: Flow, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2): Flow - public final static @org.jetbrains.annotations.NotNull method transform(@org.jetbrains.annotations.NotNull p0: Flow, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function3): Flow -} diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt index 3d08806ba6a..8cf0f42e453 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt @@ -1,10 +1,9 @@ -// COMMON_COROUTINES_TEST // WITH_COROUTINES // TREAT_AS_ONE_FILE import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt index 4e030edf190..bc7e373d7e9 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt @@ -1,10 +1,9 @@ -// COMMON_COROUTINES_TEST // WITH_COROUTINES // TREAT_AS_ONE_FILE import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt index cee5926a9dc..563a801ac5f 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt @@ -1,10 +1,9 @@ -// COMMON_COROUTINES_TEST // WITH_COROUTINES // TREAT_AS_ONE_FILE import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt index 7fb114d3c2b..692157b335e 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt @@ -1,10 +1,9 @@ -// COMMON_COROUTINES_TEST // WITH_COROUTINES // TREAT_AS_ONE_FILE import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt index 2e82a2c91df..7f94c5e4cd7 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt @@ -1,10 +1,9 @@ -// COMMON_COROUTINES_TEST // WITH_COROUTINES // TREAT_AS_ONE_FILE import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt index 593b9b004de..e7dc1f37e9f 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt @@ -1,10 +1,9 @@ -// COMMON_COROUTINES_TEST // WITH_COROUTINES // TREAT_AS_ONE_FILE import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt index 8be753e320b..8e28aa5d6d1 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt @@ -1,10 +1,9 @@ -// COMMON_COROUTINES_TEST // WITH_COROUTINES // TREAT_AS_ONE_FILE import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt index e12930d9dab..ca5cf9874a8 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt @@ -1,10 +1,9 @@ -// COMMON_COROUTINES_TEST // WITH_COROUTINES // TREAT_AS_ONE_FILE import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt index 4ad238b035b..6f19e3fa680 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt @@ -1,10 +1,9 @@ -// COMMON_COROUTINES_TEST // WITH_COROUTINES // TREAT_AS_ONE_FILE import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt index d67c6a221e6..696bad3612a 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt @@ -1,10 +1,9 @@ -// COMMON_COROUTINES_TEST // WITH_COROUTINES // TREAT_AS_ONE_FILE import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt b/compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt index b014aea9f74..2cfec730688 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt @@ -1,10 +1,9 @@ -// COMMON_COROUTINES_TEST // WITH_COROUTINES // TREAT_AS_ONE_FILE import helpers.* -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* var res = "FAIL" diff --git a/compiler/testData/codegen/light-analysis/coroutines/overrideDefaultArgument.txt b/compiler/testData/codegen/light-analysis/coroutines/overrideDefaultArgument.txt index d4376077edc..1fc95fcd643 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/overrideDefaultArgument.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/overrideDefaultArgument.txt @@ -1,18 +1,18 @@ @kotlin.Metadata public final class CoroutineUtilKt { - public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): COROUTINES_PACKAGE.Continuation - public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): COROUTINES_PACKAGE.Continuation + public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: COROUTINES_PACKAGE.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.CoroutineContext): void - public synthetic method (p0: COROUTINES_PACKAGE.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): COROUTINES_PACKAGE.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -26,20 +26,20 @@ public final static class EmptyContinuation/Companion { @kotlin.Metadata public interface I { inner class I/DefaultImpls - public abstract @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public abstract @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata public final class I/DefaultImpls { inner class I/DefaultImpls - public synthetic static method foo$default(p0: I, p1: java.lang.String, p2: COROUTINES_PACKAGE.Continuation, p3: int, p4: java.lang.Object): java.lang.Object + public synthetic static method foo$default(p0: I, p1: java.lang.String, p2: kotlin.coroutines.Continuation, p3: int, p4: java.lang.Object): java.lang.Object } @kotlin.Metadata public final class O { public final static field INSTANCE: O private method (): void - public @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata @@ -56,5 +56,5 @@ public final class OverrideDefaultArgumentKt { public final static method setFinished(p0: boolean): void public final static method setProceed(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void public final static method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void - public final static @org.jetbrains.annotations.Nullable method sleep(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method sleep(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/tailOperations/tailInlining.txt b/compiler/testData/codegen/light-analysis/coroutines/tailOperations/tailInlining.txt index 1e83fca8d6f..4095b0d4189 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/tailOperations/tailInlining.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/tailOperations/tailInlining.txt @@ -1,18 +1,18 @@ @kotlin.Metadata public final class CoroutineUtilKt { - public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): COROUTINES_PACKAGE.Continuation - public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): COROUTINES_PACKAGE.Continuation + public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: COROUTINES_PACKAGE.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.CoroutineContext): void - public synthetic method (p0: COROUTINES_PACKAGE.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): COROUTINES_PACKAGE.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext): void + public synthetic method (p0: kotlin.coroutines.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -29,9 +29,9 @@ public final class TailInliningKt { private static @org.jetbrains.annotations.NotNull field proceed: kotlin.jvm.functions.Function0 private static @org.jetbrains.annotations.NotNull field result: java.lang.String public final static method async(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void - public final static @org.jetbrains.annotations.Nullable method bar(p0: int, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method bar(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String - public final static @org.jetbrains.annotations.Nullable method foo(p0: int, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method foo(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object public final static method getFinished(): boolean public final static @org.jetbrains.annotations.NotNull method getProceed(): kotlin.jvm.functions.Function0 public final static @org.jetbrains.annotations.NotNull method getResult(): java.lang.String diff --git a/compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt b/compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt index d1df3eed38a..5d1626cbf08 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt @@ -1,12 +1,11 @@ // IGNORE_BACKEND_FIR: JVM_IR -// COMMON_COROUTINES_TEST // FILE: A.kt // WITH_RUNTIME // WITH_COROUTINES package a -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* class Controller { var callback: () -> Unit = {} diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/property.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/property.fir.kt index 3c3106e6bfa..11c5a7520c2 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/property.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/property.fir.kt @@ -1,7 +1,5 @@ // SKIP_TXT -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.coroutineContext +import kotlin.coroutines.coroutineContext val c = ::coroutineContext @@ -11,4 +9,4 @@ fun test() { suspend fun test2() { c() -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/property.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/property.kt index 37fb60da24e..1d68edc5504 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/property.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/property.kt @@ -1,7 +1,5 @@ // SKIP_TXT -// COMMON_COROUTINES_TEST - -import COROUTINES_PACKAGE.coroutineContext +import kotlin.coroutines.coroutineContext val c = ::coroutineContext @@ -11,4 +9,4 @@ fun test() { suspend fun test2() { c() -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.fir.kt index ddbc650d602..10b112eae1c 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.fir.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -// COMMON_COROUTINES_TEST // WITH_COROUTINES // SKIP_TXT -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* // Function is NOT suspend diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt index 1a30239fa4d..863a608ddd4 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -// COMMON_COROUTINES_TEST // WITH_COROUTINES // SKIP_TXT -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* // Function is NOT suspend diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.fir.kt index 9577cee6faf..1274ba3fb3d 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.fir.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -NOTHING_TO_INLINE -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* interface SuspendRunnable { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt index 1b3b489fd96..9588905e908 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -NOTHING_TO_INLINE -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* interface SuspendRunnable { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.fir.kt index 6a071da0963..74f94fa1795 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.fir.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -NOTHING_TO_INLINE -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* // Function is NOT suspend diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt index d1da3576b2b..aa8036e2d2b 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -NOTHING_TO_INLINE -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* // Function is NOT suspend diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.fir.kt index 0de218dc6e9..54188b3b056 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.fir.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -NOTHING_TO_INLINE -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* interface SuspendRunnable { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt index 471649c5260..dc127f73b13 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -NOTHING_TO_INLINE -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* interface SuspendRunnable { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.fir.kt index f759654dc3a..2a6c74bef99 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.fir.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* // Function is NOT suspend diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt index cab6c85ba1a..c08b9608e54 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* // Function is NOT suspend diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.fir.kt index cb56e6f083c..da657917e87 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.fir.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -NOTHING_TO_INLINE -UNUSED_PARAMETER -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* interface SuspendRunnable { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt index 971aef074e8..7567093d39d 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -NOTHING_TO_INLINE -UNUSED_PARAMETER -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* interface SuspendRunnable { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.fir.kt index ae87366f501..3a8b813993b 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.fir.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* // Function is suspend diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt index 829171e8a3d..24e4f06072d 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* // Function is suspend diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.fir.kt index 5946e802530..ba40df50841 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.fir.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -NOTHING_TO_INLINE -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* interface SuspendRunnable { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt index a8aba21f048..96a048574b7 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -NOTHING_TO_INLINE -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* interface SuspendRunnable { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.fir.kt index 7dd80fd573c..65833bc430a 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.fir.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -NOTHING_TO_INLINE -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* // Function is suspend diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt index 9a228c61458..320e2cb495f 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -NOTHING_TO_INLINE -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* // Function is suspend diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt index e0918cd51a4..e3475839a15 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt @@ -1,10 +1,9 @@ // FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_VARIABLE -NOTHING_TO_INLINE -UNUSED_PARAMETER -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* interface SuspendRunnable { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.fir.kt index e6a297f600e..cfea83085db 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.fir.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* // Function is suspend diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt index 3a3628ddd0c..b92ea4d18fd 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* // Function is suspend diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.fir.kt index 25fcfa6329b..6501622345b 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.fir.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -NOTHING_TO_INLINE -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* interface SuspendRunnable { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt index b78b5ecf1e9..58ac52872eb 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt @@ -1,9 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -NOTHING_TO_INLINE -// COMMON_COROUTINES_TEST // SKIP_TXT // WITH_COROUTINES -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* import helpers.* interface SuspendRunnable { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.fir.kt index 1e7e7f9c3a0..5b5f961f592 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.fir.kt @@ -1,9 +1,7 @@ // FILE: 1.kt -// COMMON_COROUTINES_TEST - fun test(c: Continuation) {} // FILE: 2.kt -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun test2(c: Continuation) {} diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt index fdce1581313..cf1e9382e5e 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt @@ -1,9 +1,7 @@ // FILE: 1.kt -// COMMON_COROUTINES_TEST - fun test(c: Continuation) {} // FILE: 2.kt -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun test2(c: Continuation) {} diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.txt index 2f46b37d932..ecd5c30af16 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.txt @@ -1,4 +1,4 @@ package public fun test(/*0*/ c: [ERROR : Continuation]): kotlin.Unit -public fun test2(/*0*/ c: COROUTINES_PACKAGE.Continuation): kotlin.Unit +public fun test2(/*0*/ c: kotlin.coroutines.Continuation): kotlin.Unit diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt index 7e40a04e7cd..1800c70b0e8 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt @@ -1,13 +1,11 @@ // FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER -SUSPENSION_CALL_MUST_BE_USED_AS_RETURN_VALUE -// COMMON_COROUTINES_TEST - interface SuperInterface { suspend fun superFun() {} suspend fun String.superExtFun() {} } -@COROUTINES_PACKAGE.RestrictsSuspension +@kotlin.coroutines.RestrictsSuspension open class RestrictedController : SuperInterface { suspend fun memberFun() {} suspend fun String.memberExtFun() {} diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.txt index 05e1c15bce4..9584af8e13b 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.txt @@ -5,7 +5,7 @@ public fun generate2(/*0*/ f: suspend RestrictedController.() -> kotlin.Unit): k public fun generate3(/*0*/ f: suspend SubClass.() -> kotlin.Unit): kotlin.Unit public fun kotlin.String.test(): kotlin.Unit -@COROUTINES_PACKAGE.RestrictsSuspension public open class RestrictedController : SuperInterface { +@kotlin.coroutines.RestrictsSuspension public open class RestrictedController : SuperInterface { public constructor RestrictedController() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.fir.kt index 0645a203746..57997e3f91e 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.fir.kt @@ -1,9 +1,7 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -SUSPENSION_CALL_MUST_BE_USED_AS_RETURN_VALUE -// COMMON_COROUTINES_TEST - interface SuperInterface -@COROUTINES_PACKAGE.RestrictsSuspension +@kotlin.coroutines.RestrictsSuspension open class RestrictedController : SuperInterface class SubClass : RestrictedController() diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt index 1a0b91f8110..b3fda9f481e 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt @@ -1,9 +1,7 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -SUSPENSION_CALL_MUST_BE_USED_AS_RETURN_VALUE -// COMMON_COROUTINES_TEST - interface SuperInterface -@COROUTINES_PACKAGE.RestrictsSuspension +@kotlin.coroutines.RestrictsSuspension open class RestrictedController : SuperInterface class SubClass : RestrictedController() diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.txt index 353c47b3963..8140a0d9dba 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.txt @@ -20,7 +20,7 @@ public final class A { public final suspend fun SuperInterface.memExtSuper(): kotlin.Unit } -@COROUTINES_PACKAGE.RestrictsSuspension public open class RestrictedController : SuperInterface { +@kotlin.coroutines.RestrictsSuspension public open class RestrictedController : SuperInterface { public constructor RestrictedController() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/memberExtension.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/memberExtension.fir.kt index a48b3936b18..25cbbb7d0ef 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/memberExtension.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/memberExtension.fir.kt @@ -1,6 +1,5 @@ -// COMMON_COROUTINES_TEST // SKIP_TXT -@COROUTINES_PACKAGE.RestrictsSuspension +@kotlin.coroutines.RestrictsSuspension class RestrictedController { suspend fun member() { ext() diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/memberExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/memberExtension.kt index 629f8bdf393..59be393309e 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/memberExtension.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/memberExtension.kt @@ -1,6 +1,5 @@ -// COMMON_COROUTINES_TEST // SKIP_TXT -@COROUTINES_PACKAGE.RestrictsSuspension +@kotlin.coroutines.RestrictsSuspension class RestrictedController { suspend fun member() { ext() diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.fir.kt index 23c472769a3..ab14bac2adc 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.fir.kt @@ -1,9 +1,7 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -SUSPENSION_CALL_MUST_BE_USED_AS_RETURN_VALUE -// COMMON_COROUTINES_TEST - interface SuperInterface -@COROUTINES_PACKAGE.RestrictsSuspension +@kotlin.coroutines.RestrictsSuspension open class RestrictedController : SuperInterface class SubClass : RestrictedController() diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt index af76adccd60..82900b4b71d 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt @@ -1,9 +1,7 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -SUSPENSION_CALL_MUST_BE_USED_AS_RETURN_VALUE -// COMMON_COROUTINES_TEST - interface SuperInterface -@COROUTINES_PACKAGE.RestrictsSuspension +@kotlin.coroutines.RestrictsSuspension open class RestrictedController : SuperInterface class SubClass : RestrictedController() diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.txt index 141a4745877..ea2894e4f21 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.txt @@ -14,7 +14,7 @@ public final class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@COROUTINES_PACKAGE.RestrictsSuspension public open class RestrictedController : SuperInterface { +@kotlin.coroutines.RestrictsSuspension public open class RestrictedController : SuperInterface { public constructor RestrictedController() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.fir.kt index 18e7fdc5a87..cb175b40fce 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.fir.kt @@ -1,7 +1,5 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -SUSPENSION_CALL_MUST_BE_USED_AS_RETURN_VALUE -// COMMON_COROUTINES_TEST - -@COROUTINES_PACKAGE.RestrictsSuspension +@kotlin.coroutines.RestrictsSuspension class RestrictedController { suspend fun member() {} } diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt index 6dfbfcf511b..5d7d2a21f22 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt @@ -1,7 +1,5 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -SUSPENSION_CALL_MUST_BE_USED_AS_RETURN_VALUE -// COMMON_COROUTINES_TEST - -@COROUTINES_PACKAGE.RestrictsSuspension +@kotlin.coroutines.RestrictsSuspension class RestrictedController { suspend fun member() {} } diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.txt index 476846c3b2f..38e0ff18dc7 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.txt @@ -5,7 +5,7 @@ public fun test(): kotlin.Unit public suspend fun RestrictedController.extension(): kotlin.Unit public suspend fun RestrictedController.l(): kotlin.Unit -@COROUTINES_PACKAGE.RestrictsSuspension public final class RestrictedController { +@kotlin.coroutines.RestrictsSuspension public final class RestrictedController { public constructor RestrictedController() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.fir.kt index 877b528ccf9..8e1f2ff8c03 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.fir.kt @@ -1,5 +1,4 @@ -// COMMON_COROUTINES_TEST -@COROUTINES_PACKAGE.RestrictsSuspension +@kotlin.coroutines.RestrictsSuspension class RestrictedController suspend fun Any?.extFun() {} diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt index 41ad0852a44..296aadf0748 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt @@ -1,5 +1,4 @@ -// COMMON_COROUTINES_TEST -@COROUTINES_PACKAGE.RestrictsSuspension +@kotlin.coroutines.RestrictsSuspension class RestrictedController suspend fun Any?.extFun() {} diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.txt index 0ceda5dab23..7e1a2cfeee5 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.txt @@ -5,7 +5,7 @@ public suspend fun suspendFun(): kotlin.Unit public fun test(): kotlin.Unit public suspend fun kotlin.Any?.extFun(): kotlin.Unit -@COROUTINES_PACKAGE.RestrictsSuspension public final class RestrictedController { +@kotlin.coroutines.RestrictsSuspension public final class RestrictedController { public constructor RestrictedController() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/wrongEnclosingFunction.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/wrongEnclosingFunction.fir.kt index 60d2895331d..8c886cd1d1f 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/wrongEnclosingFunction.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/wrongEnclosingFunction.fir.kt @@ -1,6 +1,5 @@ -// COMMON_COROUTINES_TEST // SKIP_TXT -@COROUTINES_PACKAGE.RestrictsSuspension +@kotlin.coroutines.RestrictsSuspension class RestrictedController { suspend fun yield() {} } diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/wrongEnclosingFunction.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/wrongEnclosingFunction.kt index fa8c641da80..259b1ca2210 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/wrongEnclosingFunction.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/wrongEnclosingFunction.kt @@ -1,6 +1,5 @@ -// COMMON_COROUTINES_TEST // SKIP_TXT -@COROUTINES_PACKAGE.RestrictsSuspension +@kotlin.coroutines.RestrictsSuspension class RestrictedController { suspend fun yield() {} } diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt index 210edcdbf6b..8c366c6fad4 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt @@ -1,7 +1,6 @@ // FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER -NOTHING_TO_INLINE -// COMMON_COROUTINES_TEST -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* suspend fun notMember(q: Double) = 1 diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.txt index 8b482a8a964..226605fdc45 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.txt @@ -10,7 +10,7 @@ public final class Controller { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public final suspend inline fun inlineFun(/*0*/ x: kotlin.Int): kotlin.Unit public final suspend fun noParameters(): kotlin.Unit - public final suspend fun oldConvention(/*0*/ x: COROUTINES_PACKAGE.Continuation): kotlin.Unit + public final suspend fun oldConvention(/*0*/ x: kotlin.coroutines.Continuation): kotlin.Unit public final suspend fun oneParameter(/*0*/ q: kotlin.Any): kotlin.Unit public final suspend fun returnsString(/*0*/ q: kotlin.Any): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.fir.kt index d24b143c660..769fbcd6523 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.fir.kt @@ -1,4 +1,3 @@ -// COMMON_COROUTINES_TEST // FILE: I.kt interface I { @@ -8,14 +7,14 @@ interface I { // FILE: JavaClass.java public class JavaClass implements I { @Override - public String foo(int x, COROUTINES_PACKAGE.Continuation continuation) { + public String foo(int x, kotlin.coroutines.Continuation continuation) { return null; } } // FILE: main.kt -import COROUTINES_PACKAGE.Continuation +import kotlin.coroutines.Continuation class K1 : JavaClass() class K2 : JavaClass() { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.kt index 6f88bff7f1b..84b56542ce7 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.kt @@ -1,4 +1,3 @@ -// COMMON_COROUTINES_TEST // FILE: I.kt interface I { @@ -8,14 +7,14 @@ interface I { // FILE: JavaClass.java public class JavaClass implements I { @Override - public String foo(int x, COROUTINES_PACKAGE.Continuation continuation) { + public String foo(int x, kotlin.coroutines.Continuation continuation) { return null; } } // FILE: main.kt -import COROUTINES_PACKAGE.Continuation +import kotlin.coroutines.Continuation class K1 : JavaClass() class K2 : JavaClass() { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.txt index 01ec7dd2996..5555f9fc616 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.txt @@ -1,7 +1,7 @@ package public fun builder(/*0*/ block: suspend () -> kotlin.Unit): kotlin.Unit -public fun main(/*0*/ x: COROUTINES_PACKAGE.Continuation): kotlin.Unit +public fun main(/*0*/ x: kotlin.coroutines.Continuation): kotlin.Unit public interface I { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -38,7 +38,7 @@ public final class K3 : JavaClass { public constructor K3() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @java.lang.Override public open override /*1*/ suspend /*fake_override*/ fun foo(/*0*/ x: kotlin.Int): kotlin.String - public open fun foo(/*0*/ x: kotlin.Int, /*1*/ y: COROUTINES_PACKAGE.Continuation): kotlin.Any? + public open fun foo(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.coroutines.Continuation): kotlin.Any? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.fir.kt index 4e5c8968405..056131d68e4 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.fir.kt @@ -1,8 +1,7 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER // !CHECK_TYPE // !WITH_NEW_INFERENCE -// COMMON_COROUTINES_TEST -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* class Controller { suspend fun noParams() { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt index b729d7c6e91..86402fb4a75 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt @@ -1,8 +1,7 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER // !CHECK_TYPE // !WITH_NEW_INFERENCE -// COMMON_COROUTINES_TEST -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* class Controller { suspend fun noParams() { @@ -38,7 +37,7 @@ fun test() { severalParams("", 89) checkType { _() } // TODO: should we allow somehow to call with passing continuation explicitly? - severalParams("", 89, 6.9) checkType { _() } - severalParams("", 89, this as Continuation) checkType { _() } + severalParams("", 89, 6.9) checkType { _() } + severalParams("", 89, this as Continuation) checkType { _() } } } diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.fir.kt index 7c7440c533c..eae685e55c2 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.fir.kt @@ -1,4 +1,3 @@ -// COMMON_COROUTINES_TEST // FILE: I.kt interface I { @@ -7,7 +6,7 @@ interface I { // FILE: BaseJavaClass.java public class BaseJavaClass { - public Object foo(int x, COROUTINES_PACKAGE.Continuation continuation) { + public Object foo(int x, kotlin.coroutines.Continuation continuation) { return null; } } @@ -18,7 +17,7 @@ public class JavaClass extends BaseJavaClass implements I { // FILE: main.kt -import COROUTINES_PACKAGE.Continuation +import kotlin.coroutines.Continuation class K1 : JavaClass() class K2 : JavaClass() { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.kt index dee8b5cf90c..289182ebb34 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.kt @@ -1,4 +1,3 @@ -// COMMON_COROUTINES_TEST // FILE: I.kt interface I { @@ -7,7 +6,7 @@ interface I { // FILE: BaseJavaClass.java public class BaseJavaClass { - public Object foo(int x, COROUTINES_PACKAGE.Continuation continuation) { + public Object foo(int x, kotlin.coroutines.Continuation continuation) { return null; } } @@ -18,7 +17,7 @@ public class JavaClass extends BaseJavaClass implements I { // FILE: main.kt -import COROUTINES_PACKAGE.Continuation +import kotlin.coroutines.Continuation class K1 : JavaClass() class K2 : JavaClass() { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.txt index b18d4f3710b..6d986e1996c 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.txt @@ -1,12 +1,12 @@ package public fun builder(/*0*/ block: suspend () -> kotlin.Unit): kotlin.Unit -public fun main(/*0*/ x: COROUTINES_PACKAGE.Continuation): kotlin.Unit +public fun main(/*0*/ x: kotlin.coroutines.Continuation): kotlin.Unit public open class BaseJavaClass { public constructor BaseJavaClass() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun foo(/*0*/ x: kotlin.Int, /*1*/ continuation: COROUTINES_PACKAGE.Continuation!): kotlin.Any! + public open fun foo(/*0*/ x: kotlin.Int, /*1*/ continuation: kotlin.coroutines.Continuation!): kotlin.Any! public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -46,7 +46,7 @@ public final class K3 : JavaClass { public constructor K3() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ suspend /*fake_override*/ fun foo(/*0*/ x: kotlin.Int): kotlin.String - public open fun foo(/*0*/ x: kotlin.Int, /*1*/ y: COROUTINES_PACKAGE.Continuation): kotlin.Any? + public open fun foo(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.coroutines.Continuation): kotlin.Any? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.fir.kt index 0c2d26716df..2ffcd3ef844 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.fir.kt @@ -1,4 +1,3 @@ -// COMMON_COROUTINES_TEST // FILE: I.kt interface I { @@ -8,14 +7,14 @@ interface I { // FILE: JavaClass.java public class JavaClass implements I { @Override - public Object foo(int x, COROUTINES_PACKAGE.Continuation continuation) { + public Object foo(int x, kotlin.coroutines.Continuation continuation) { return null; } } // FILE: main.kt -import COROUTINES_PACKAGE.Continuation +import kotlin.coroutines.Continuation class K1 : JavaClass() class K2 : JavaClass() { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.kt index 8ba2a503022..f6c6595e108 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.kt @@ -1,4 +1,3 @@ -// COMMON_COROUTINES_TEST // FILE: I.kt interface I { @@ -8,14 +7,14 @@ interface I { // FILE: JavaClass.java public class JavaClass implements I { @Override - public Object foo(int x, COROUTINES_PACKAGE.Continuation continuation) { + public Object foo(int x, kotlin.coroutines.Continuation continuation) { return null; } } // FILE: main.kt -import COROUTINES_PACKAGE.Continuation +import kotlin.coroutines.Continuation class K1 : JavaClass() class K2 : JavaClass() { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.txt index 01ec7dd2996..5555f9fc616 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.txt @@ -1,7 +1,7 @@ package public fun builder(/*0*/ block: suspend () -> kotlin.Unit): kotlin.Unit -public fun main(/*0*/ x: COROUTINES_PACKAGE.Continuation): kotlin.Unit +public fun main(/*0*/ x: kotlin.coroutines.Continuation): kotlin.Unit public interface I { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -38,7 +38,7 @@ public final class K3 : JavaClass { public constructor K3() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @java.lang.Override public open override /*1*/ suspend /*fake_override*/ fun foo(/*0*/ x: kotlin.Int): kotlin.String - public open fun foo(/*0*/ x: kotlin.Int, /*1*/ y: COROUTINES_PACKAGE.Continuation): kotlin.Any? + public open fun foo(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.coroutines.Continuation): kotlin.Any? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendLambda.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendLambda.kt index 3bf0483cb69..d330e716728 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendLambda.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendLambda.kt @@ -1,7 +1,6 @@ // FIR_IDENTICAL -// COMMON_COROUTINES_TEST // SKIP_TXT -import COROUTINES_PACKAGE.* +import kotlin.coroutines.* fun foo(): Continuation = null!! diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt index 51fb71a4918..d6c5812ea19 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt @@ -1,8 +1,7 @@ // FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_ANONYMOUS_PARAMETER -// COMMON_COROUTINES_TEST -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun nonSuspend() {} diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt index 6fecf4646b6..6cf835ed37f 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt @@ -1,8 +1,7 @@ // FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_ANONYMOUS_PARAMETER -// COMMON_COROUTINES_TEST -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun nonSuspend() {} diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt index 3bb325029f4..c30dd8f4352 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt @@ -1,8 +1,7 @@ // FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_ANONYMOUS_PARAMETER -// COMMON_COROUTINES_TEST -import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* suspend fun baz() = 1