[TEST] Update testdata due to dropped COMMON_COROUTINE_TEST directive

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) {

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
-}
+}

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) {

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) {

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) {

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
-}
+}

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 <reified R> Flow<*>.filterIsInstance(): Flow<R> =
     filter { it is R } as Flow<R>
 
 // FILE: box.kt
-// COMMON_COROUTINES_TEST
-
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
 import helpers.*
 
 fun builder(c: suspend () -> Unit) {

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 {

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 {

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 {

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) {

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 {

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) {

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 {

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"

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"

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) {

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<T>(val x: T)
@@ -17,10 +16,8 @@ suspend inline fun test(c: Result<Int>) = c.x
 suspend inline fun test(c: Result<String>) = 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) {

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"

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) {

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"
-}
+}

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 <T, R1, R2, R3> map3(source: MyDeferred<T>, 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"
-}
+}

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 {

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 {

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 {

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) {

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 {

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"

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"

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) {

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) {

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)

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"
-}
+}

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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 <T : Any, R : Any> Flow<T>.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)

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"
-}
+}

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) {

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)

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) {

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) {

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)

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)

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"
-}
+}

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)

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)

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) {

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<T>(private val block: suspend FlowCollector<T>.() -> Unit
 }
 
 // FILE: inlineSite.kt
-// COMMON_COROUTINES_TEST
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
 import helpers.*
 
 fun Flow<String>.abc() = map { line ->

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"
-}
+}