[TEST] Update testdata due to dropped COMMON_COROUTINE_TEST directive

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

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

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

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

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 
 class Controller {

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 
 class Controller {

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

compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt

@@ -1,9 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// COMMON_COROUTINES_TEST
 import helpers.*
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(

compiler/testData/codegen/box/coroutines/accessorForSuspend.kt

@@ -1,9 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// COMMON_COROUTINES_TEST
 import helpers.*
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
     c.startCoroutine(EmptyContinuation)

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 fun foo(): CompletableFuture<String> = CompletableFuture.supplyAsync { "foo" }
 fun bar(v: String): CompletableFuture<String> = CompletableFuture.supplyAsync { "bar with $v" }

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 fun exception(v: String): CompletableFuture<String> = CompletableFuture.supplyAsync { throw RuntimeException(v) }
 

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 class Promise<T>(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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 private var log = ""
 
@@ -99,8 +98,8 @@ fun <T> asyncOperation(resultSupplier: () -> T) = Promise<T> { resolve ->
 fun getLog() = log
 
 // FILE: main.kt
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 private fun test() = async<String> {
     val o = await(asyncOperation { "O" })

compiler/testData/codegen/box/coroutines/beginWithException.kt

@@ -1,9 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// COMMON_COROUTINES_TEST
 import helpers.*
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 suspend fun suspendHere(): Any = suspendCoroutineUninterceptedOrReturn { x -> }
 

compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt

@@ -1,9 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// COMMON_COROUTINES_TEST
 import helpers.*
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 suspend fun suspendHere(): Any = suspendCoroutineUninterceptedOrReturn { x ->}
 
 fun builder(c: suspend () -> Unit) {

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<A, B> {
     suspend fun f(a: A, b: B): String

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)

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)

compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt

@@ -1,10 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// COMMON_COROUTINES_TEST
-
 import helpers.*
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 suspend fun suspendHere(): String {
     var z = "fail1"
@@ -28,4 +26,4 @@ fun box(): String {
     }
 
     return result
-}
+}

compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt

@@ -1,9 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// COMMON_COROUTINES_TEST
 import helpers.*
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+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() }
-}
+}

compiler/testData/codegen/box/coroutines/coercionToUnit.kt

@@ -1,9 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// COMMON_COROUTINES_TEST
 import helpers.*
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 
 suspend fun <T> await(t: T): T = suspendCoroutineUninterceptedOrReturn { c ->

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 
 class Controller {

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 
 class Controller {

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 class Controller {
     var result = ""

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 
 class Controller {

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+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"
-}
+}

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+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() }
-}
+}

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 
 class Controller {

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 
 class Controller {

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 
 class Controller {

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 
 class Controller {

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit): Unit {
     c.startCoroutine(handleResultContinuation {

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 class Controller {
     var result = ""

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+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"
-}
+}

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 class Controller {
     var result = ""

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 // KT-36897
 
@@ -26,4 +25,4 @@ fun box(): String {
     }
 
     return result
-}
+}

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 
 class Controller {

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 
 class Controller {

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+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"
-}
+}

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 
 class Controller {

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 var result = ""
 
@@ -44,4 +43,4 @@ fun box():String {
     id("b")
     if (result != "a012b") return "FAIL: $result"
     return "OK"
-}
+}

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.Continuation
+import kotlin.coroutines.Continuation
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 
 class Controller {

compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt

@@ -1,9 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// COMMON_COROUTINES_TEST
 import helpers.*
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 class Controller {
     var result = false

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

compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt

@@ -1,9 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// COMMON_COROUTINES_TEST
 import helpers.*
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
     val x = c.createCoroutine(EmptyContinuation)

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 import helpers.ContinuationAdapter
 
 fun runCustomLambdaAsCoroutine(e: Throwable? = null, x: (Continuation<String>) -> Any?): String {

compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt

@@ -1,9 +1,8 @@
 // WITH_RUNTIME
-// COMMON_COROUTINES_TEST
 // WITH_COROUTINES
 import helpers.*
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 interface Consumer { fun consume(s: String) }
 

compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt

@@ -1,9 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// COMMON_COROUTINES_TEST
 import helpers.*
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(a: String = "abc", i: Int = 2): String = suspendCoroutineUninterceptedOrReturn { x ->

compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt

@@ -1,10 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// COMMON_COROUTINES_TEST
-
 import helpers.*
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 var result = "fail"
 
@@ -29,4 +27,4 @@ fun box(): String {
     }
 
     return result
-}
+}

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 class Controller {
     var log = ""

compiler/testData/codegen/box/coroutines/emptyClosure.kt

@@ -1,9 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// COMMON_COROUTINES_TEST
 import helpers.*
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 var result = 0
 

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

compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt

@@ -1,9 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// COMMON_COROUTINES_TEST
 import helpers.*
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 class Controller {
     suspend fun <T> suspendHere(v: T): T = suspendCoroutineUninterceptedOrReturn { x ->

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 class A {
     var result = mutableListOf("O", "K", null)

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 
 fun builder(c: suspend () -> Unit) {

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 {

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 data class A(val o: String) {
     operator fun component2(): String = "K"

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 
 class Controller {

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 class A(val w: String) {
     suspend fun String.ext(): String = suspendCoroutineUninterceptedOrReturn {

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 class A(val w: String) {
     suspend fun Long.ext(): String = suspendCoroutineUninterceptedOrReturn {

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 data class A(val o: String) {
     operator suspend fun component2(): String = suspendCoroutineUninterceptedOrReturn { x ->

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 
 class Controller {

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 suspend fun suspendThere(v: A): A = suspendCoroutineUninterceptedOrReturn { x ->
     x.resume(v)

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 suspend fun suspendThere(v: A): A = suspendCoroutineUninterceptedOrReturn { x ->
     x.resume(v)

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 suspend fun suspendThere(v: A): A = suspendCoroutineUninterceptedOrReturn { x ->
     x.resume(v)

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<T, out R>(private val underlying: Iterator<T>, private val transform: suspend (e: T) -> Iterator<R>) {
     private var currentIt: Iterator<R> = object : Iterator<R> {
@@ -40,4 +38,4 @@ fun box(): String {
         }
     }
     return res
-}
+}

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<T, out R>(private val underlying: Iterator<T>, private val transform: suspend (e: T) -> Iterator<R>) {
     private var currentIt: Iterator<R> = object : Iterator<R> {
@@ -40,4 +38,4 @@ fun box(): String {
         }
     }
     return res
-}
+}

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 import kotlin.test.assertEquals
 
 suspend fun ArrayList<Int>.yield(v: Int): Unit = suspendCoroutineUninterceptedOrReturn { x ->

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

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

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 <T, A> Iterator<T>.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"
-}
+}

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) {
     '\\' -> "\\\\"

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

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

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

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

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

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

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 fun box(): String {
     val x = gen().joinToString()

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 class Controller {
     var exception: Throwable? = null

compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt

@@ -1,9 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// COMMON_COROUTINES_TEST
 import helpers.*
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 
 fun builder(c: suspend () -> Unit): String {

compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt

@@ -1,9 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// COMMON_COROUTINES_TEST
 import helpers.*
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 
 suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x ->

compiler/testData/codegen/box/coroutines/handleResultSuspended.kt

@@ -1,9 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// COMMON_COROUTINES_TEST
 import helpers.*
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 class Controller {
     var log = ""

compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt

@@ -1,9 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// COMMON_COROUTINES_TEST
 import helpers.*
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 var stopped = false
 var log = ""
@@ -48,4 +47,4 @@ fun box(): String {
 
     if (log != "123") return "fail: $log"
     return result
-}
+}

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
     c.startCoroutine(EmptyContinuation)

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
     c.startCoroutine(EmptyContinuation)

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
     c.startCoroutine(EmptyContinuation)

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
     c.startCoroutine(EmptyContinuation)

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
     c.startCoroutine(EmptyContinuation)

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
     c.startCoroutine(EmptyContinuation)

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
     c.startCoroutine(EmptyContinuation)

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
     c.startCoroutine(EmptyContinuation)

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
     c.startCoroutine(EmptyContinuation)

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

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

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+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
-}
+}

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
     c.startCoroutine(EmptyContinuation)

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
     c.startCoroutine(EmptyContinuation)

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
     c.startCoroutine(EmptyContinuation)

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
     c.startCoroutine(EmptyContinuation)

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 kotlin.coroutines.*
-import COROUTINES_PACKAGE.intrinsics.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
     c.startCoroutine(EmptyContinuation)