Move coroutines to kotlin.coroutines package: tests

Introduce COMMON_COROUTINES_TEST directive.
Every test with this directive is run twice: one time with
language version 1.2 and kotlin.coroutines.experimental package
and the other time with language version 1.3 and kotlin.coroutines
package. Each run is a separate method: with suffixes _1_2 and _1_3
respectively.
However, since codegen of release coroutines is not supported in JS
backend, we generate only one method: with suffix _1_2.
 #KT-23362

build.gradle.kts

@@ -12,7 +12,7 @@ import proguard.gradle.ProGuardTask
 buildscript {
     extra["defaultSnapshotVersion"] = "1.2-SNAPSHOT"
 
-    kotlinBootstrapFrom(BootstrapOption.TeamCity("1.2.50-dev-310", onlySuccessBootstrap = false))
+    kotlinBootstrapFrom(BootstrapOption.TeamCity("1.2.50-dev-697", onlySuccessBootstrap = false))
 
     val mirrorRepo: String? = findProperty("maven.repository.mirror")?.toString()
 

compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt

@@ -1,8 +1,10 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
+
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 
 class Controller {

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

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

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

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

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

@@ -1,8 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 interface AsyncGenerator<in T> {
     suspend fun yield(value: T)

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

@@ -1,8 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 interface AsyncGenerator<in T> {
     suspend fun yield(value: T)

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

@@ -1,8 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 interface AsyncGenerator<in T> {
     suspend fun yield(value: T)

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

@@ -1,9 +1,10 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 // FILE: promise.kt
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 class Promise<T>(private val executor: ((T) -> Unit) -> Unit) {
     private var value: Any? = null
@@ -51,8 +52,8 @@ fun processQueue() {
 
 // FILE: await.kt
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 private var log = ""
 
@@ -97,8 +98,8 @@ fun <T> asyncOperation(resultSupplier: () -> T) = Promise<T> { resolve ->
 fun getLog() = log
 
 // FILE: main.kt
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 private fun test() = async<String> {
     val o = await(asyncOperation { "O" })

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

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

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

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

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

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

compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt

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

compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt

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

compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt

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

compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt

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

compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt

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

compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt

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

compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt

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

compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt

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

compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt

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

compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt

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

compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt

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

compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt

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

compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt

@@ -1,8 +1,10 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.Continuation
+import COROUTINES_PACKAGE.intrinsics.*
 
 
 class Controller {

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

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

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

@@ -1,7 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
 
 inline fun inlinedLambda(block: () -> Unit) {
     return block()

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

@@ -1,10 +1,11 @@
 // TARGET_BACKEND: JVM
 // WITH_REFLECT
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 class A<T : String> {
     suspend fun foo() {}
@@ -29,5 +30,5 @@ fun box(): String {
         result = A<String>().bar()
     }
 
-    return if (result == "(kotlin.coroutines.experimental.Continuation<T>) -> kotlin.Any?") "OK" else "Fail: $result"
+    return if (result == "(COROUTINES_PACKAGE.Continuation<T>) -> kotlin.Any?") "OK" else "Fail: $result"
 }

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

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

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

@@ -1,7 +1,8 @@
 // WITH_RUNTIME
 // IGNORE_BACKEND: JS
-import kotlin.coroutines.experimental.*
+// COMMON_COROUTINES_TEST
-import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED
+import COROUTINES_PACKAGE.*
+import COROUTINES_PACKAGE.intrinsics.COROUTINE_SUSPENDED
 
 fun runCustomLambdaAsCoroutine(e: Throwable? = null, x: (Continuation<String>) -> Any?): String {
     var result = "fail"

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

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

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

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

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

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

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

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

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

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

compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt

@@ -1,9 +1,10 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 // IGNORE_BACKEND: NATIVE
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 class A {
     var result = mutableListOf("O", "K", null)

compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt

@@ -1,8 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
 import kotlin.properties.Delegates
 
 class Pipe {

compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt

@@ -1,8 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 data class A(val o: String) {
     operator fun component2(): String = "K"

compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt

@@ -1,8 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 import kotlin.test.assertEquals
 
 class A(val w: String) {

compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt

@@ -1,8 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 import kotlin.test.assertEquals
 
 class A(val w: String) {

compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt

@@ -1,8 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 data class A(val o: String) {
     operator suspend fun component2(): String = suspendCoroutineOrReturn { x ->

compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt

@@ -1,9 +1,10 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
 
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 suspend fun suspendThere(v: A): A = suspendCoroutineOrReturn { x ->
     x.resume(v)

compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt

@@ -1,9 +1,10 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
 
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 suspend fun suspendThere(v: A): A = suspendCoroutineOrReturn { x ->
     x.resume(v)

compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt

@@ -1,9 +1,10 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
 
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 suspend fun suspendThere(v: A): A = suspendCoroutineOrReturn { x ->
     x.resume(v)

compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt

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

compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt

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

compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt

@@ -1,8 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 import kotlin.test.assertEquals
 
 suspend fun ArrayList<Int>.yield(v: Int): Unit = suspendCoroutineOrReturn { x ->

compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt

@@ -1,9 +1,10 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 // DONT_RUN_GENERATED_CODE: JS
 
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
 
 tailrec suspend infix fun Int.test(x : Int) : Int {
     if (this > 1) {

compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt

@@ -1,9 +1,10 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 // DONT_RUN_GENERATED_CODE: JS
 
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
 
 tailrec suspend infix fun Int.foo(x: Int) {
     if (x == 0) return

compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt

@@ -1,8 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 // DONT_RUN_GENERATED_CODE: JS
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
 
 tailrec suspend fun <T, A> Iterator<T>.foldl(acc : A, foldFunction : (e : T, acc : A) -> A) : A =
         if (!hasNext()) acc

compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt

@@ -1,7 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
 
 suspend fun escapeChar(c : Char) : String? = when (c) {
     '\\' -> "\\\\"

compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt

@@ -1,8 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // DONT_RUN_GENERATED_CODE: JS
+// COMMON_COROUTINES_TEST
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
 
 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,8 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 // DONT_RUN_GENERATED_CODE: JS
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
 
 tailrec suspend fun foo(x: Int) {
     if (x == 0) return

compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt

@@ -1,8 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 // DONT_RUN_GENERATED_CODE: JS
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
 
 tailrec suspend fun sum(x: Long, sum: Long): Long {
     if (x == 0.toLong()) return sum

compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt

@@ -1,8 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 // DONT_RUN_GENERATED_CODE: JS
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
 
 tailrec suspend fun foo(x: Int) {
     return if (x > 0) {

compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt

@@ -1,8 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 // DONT_RUN_GENERATED_CODE: JS
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
 
 tailrec suspend fun foo(x: Int) {
     if (x == 0) return

compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt

@@ -1,8 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 // DONT_RUN_GENERATED_CODE: JS
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
 
 tailrec suspend fun withWhen(counter : Int, d : Any) : Int =
     if (counter == 0) {

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

@@ -1,9 +1,10 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
 // FULL_JDK
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 fun box(): String {
     val x = gen().joinToString()

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

@@ -1,8 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 class Controller {
     var exception: Throwable? = null

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

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

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

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

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

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

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

@@ -1,9 +1,10 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
 // TARGET_BACKEND: JVM
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
     x.resume(Unit)

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

@@ -1,8 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 var stopped = false
 var log = ""

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

@@ -1,8 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 suspend fun suspendThere(v: Any?): String = suspendCoroutineOrReturn { x ->
     x.resume(v?.toString() ?: "<empty>")

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

@@ -1,9 +1,10 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // WITH_REFLECT
+// COMMON_COROUTINES_TEST
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)

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

@@ -1,13 +1,14 @@
 // IGNORE_BACKEND: NATIVE
 // 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 kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 class Controller {
     fun withValue(v: String, x: Continuation<String>) {

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

@@ -1,8 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 var globalResult = ""
 var wasCalled = false

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

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

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

@@ -1,10 +1,11 @@
 // IGNORE_BACKEND: NATIVE
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
 // WITH_REFLECT
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 class Controller {
     suspend fun runInstanceOf(): Boolean = suspendCoroutineOrReturn { x ->

compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt

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

compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt

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

compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt

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

compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt

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

compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt

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

compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt

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

compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt

@@ -1,9 +1,10 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
 // TARGET_BACKEND: JVM
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->

compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt

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

compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt

@@ -1,9 +1,10 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
 // TARGET_BACKEND: JVM
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->

compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt

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

compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt

@@ -1,3 +1,4 @@
+// !API_VERSION: 1.2
 // WITH_RUNTIME
 // WITH_COROUTINES
 import helpers.*

compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt

@@ -1,3 +1,4 @@
+// !API_VERSION: 1.2
 // WITH_RUNTIME
 // WITH_COROUTINES
 import helpers.*

compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt

@@ -1,3 +1,4 @@
+// !API_VERSION: 1.2
 // WITH_RUNTIME
 // WITH_COROUTINES
 import helpers.*

compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt

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

compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt

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

compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt

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

compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt

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

compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt

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

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

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

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

@@ -1,9 +1,10 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
 // WITH_CONTINUATION
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 suspend fun <V> suspendHere(v: V): V = suspendCoroutineOrReturn { x ->
     x.resume(v)

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

@@ -1,10 +1,11 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
 
-import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED
+import COROUTINES_PACKAGE.intrinsics.COROUTINE_SUSPENDED
-import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn
+import COROUTINES_PACKAGE.intrinsics.suspendCoroutineOrReturn
-import kotlin.coroutines.experimental.startCoroutine
+import COROUTINES_PACKAGE.startCoroutine
 
 class Bar(val x: Any)
 inline fun Any.map(transform: (Any) -> Any) {

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

@@ -1,7 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
-import kotlin.coroutines.experimental.startCoroutine
+import COROUTINES_PACKAGE.startCoroutine
 
 class Controller {
     suspend inline fun suspendInlineThrow(v: String): String = throw RuntimeException(v)

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

@@ -1,9 +1,10 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 
 import helpers.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
 
 class A {
     var isMinusAssignCalled = false

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,9 +1,10 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED
+import COROUTINES_PACKAGE.intrinsics.COROUTINE_SUSPENDED
-import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn
+import COROUTINES_PACKAGE.intrinsics.suspendCoroutineOrReturn
 
 class OkDelegate {
     operator fun getValue(receiver: Any?, property: Any?): String = "OK"

compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt

@@ -1,9 +1,10 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
+// COMMON_COROUTINES_TEST
 
 import helpers.*
-import kotlin.coroutines.experimental.*
+import COROUTINES_PACKAGE.*
-import kotlin.coroutines.experimental.intrinsics.*
+import COROUTINES_PACKAGE.intrinsics.*
 
 suspend fun callLocal(a: String, b: String): String {
     suspend fun local() = suspendCoroutineOrReturn<String> {