Move coroutine-related runtime parts to kotlin.coroutines.experimental package

#KT-15975 Fixed

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var result = ""

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var result = false

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

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

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var log = ""

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 var result = 0
 

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var log = ""

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

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

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

@@ -4,8 +4,8 @@
 // CHECK_NOT_CALLED: suspendInline_61zpoe$
 // CHECK_NOT_CALLED: suspendInline_6r51u9$
 // CHECK_NOT_CALLED: suspendInline
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     fun withValue(v: String, x: Continuation<String>) {

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 var globalResult = ""
 var wasCalled = false

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var i = 0

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

@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // WITH_REFLECT
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun runInstanceOf(): Boolean = suspendCoroutineOrReturn { x ->

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,9 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 
-import kotlin.coroutines.intrinsics.SUSPENDED_MARKER
+import kotlin.coroutines.experimental.intrinsics.SUSPENDED_MARKER
-import kotlin.coroutines.intrinsics.suspendCoroutineOrReturn
+import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn
-import kotlin.coroutines.startCoroutine
+import kotlin.coroutines.experimental.startCoroutine
 
 class Bar(val x: Any)
 inline fun Any.map(transform: (Any) -> Any) {

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

@@ -1,6 +1,6 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.startCoroutine
+import kotlin.coroutines.experimental.startCoroutine
 
 class Controller {
     suspend inline fun suspendInlineThrow(v: String): String = throw RuntimeException(v)
@@ -22,4 +22,4 @@ fun box(): String {
     }
 
     return result
-}
+}

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var result = ""

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

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

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

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

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var ok = false

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

@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.SUSPENDED_MARKER
+import kotlin.coroutines.experimental.intrinsics.SUSPENDED_MARKER
-import kotlin.coroutines.intrinsics.suspendCoroutineOrReturn
+import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn
 
 class OkDelegate {
     operator fun getValue(receiver: Any?, property: Any?): String = "OK"
@@ -26,4 +26,4 @@ fun box(): String {
         val ok by OkDelegate()
         ok
     }
-}
+}

compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt

@@ -8,8 +8,8 @@ inline fun foo(x: String = "OK"): String {
 // FILE: main.kt
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 var result = ""
 

compiler/testData/codegen/box/coroutines/multiModule/simple.kt

@@ -4,8 +4,8 @@
 // FILE: controller.kt
 package lib
 
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
@@ -17,8 +17,8 @@ class Controller {
 // MODULE: main(controller, support)
 // FILE: main.kt
 import lib.*
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 fun builder(c: suspend Controller.() -> Unit) {
     c.startCoroutine(Controller(), EmptyContinuation)

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var lastSuspension: Continuation<String>? = null

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var lastSuspension: Continuation<String>? = null

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var lastSuspension: Continuation<String>? = null

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var lastSuspension: Continuation<String>? = null

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 var globalResult = ""
 var wasCalled = false

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 fun builder(c: suspend () -> Int): Int {

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var cResult = 0

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 class Controller {

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

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

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

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

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

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

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

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

compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): String = throw RuntimeException("OK")

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

@@ -4,8 +4,8 @@
 // CHECK_NOT_CALLED: suspendInline_61zpoe$
 // CHECK_NOT_CALLED: suspendInline_6r51u9$
 // CHECK_NOT_CALLED: suspendInline
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend inline fun suspendInline(v: String): String = v

compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere() = "OK"

compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): Int = suspendCoroutineOrReturn { x ->

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 var globalResult = ""
 suspend fun suspendWithValue(v: String): String = suspendCoroutineOrReturn { x ->

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.startCoroutine
+import kotlin.coroutines.experimental.startCoroutine
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 interface TestInterface {
     suspend fun toInt(): Int = suspendCoroutineOrReturn { x ->

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(): String = suspendThere()

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     suspend fun suspendHere(v: Int): Int = suspendCoroutineOrReturn { x ->

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

@@ -4,7 +4,7 @@
 // FILE: stuff.kt
 package stuff
 
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 object Host {
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
@@ -15,8 +15,8 @@ object Host {
 
 
 // FILE: test.kt
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 import stuff.Host.suspendHere
 
 fun builder(c: suspend () -> Unit) {

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

@@ -1,8 +1,8 @@
 // IGNORE_BACKEND: JS
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var log = ""

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

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

compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt

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

compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt

@@ -1,9 +1,9 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // TARGET_BACKEND: JVM
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.SUSPENDED_MARKER
+import kotlin.coroutines.experimental.intrinsics.SUSPENDED_MARKER
-import kotlin.coroutines.intrinsics.suspendCoroutineOrReturn
+import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn
 
 class MyTest {
     suspend fun act(value: String): String = suspendCoroutineOrReturn {

compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class A(val v: String) {
     suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x ->

compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt

@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.SUSPENDED_MARKER
+import kotlin.coroutines.experimental.intrinsics.SUSPENDED_MARKER
-import kotlin.coroutines.intrinsics.suspendCoroutineOrReturn
+import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn
 
 class MyTest {
     suspend fun act(value: String): String = suspendCoroutineOrReturn {

compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt

@@ -1,8 +1,8 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // IGNORE_BACKEND: JS
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 import kotlin.reflect.KProperty
 
 suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x ->

compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class X {
     var res = ""

compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 
 var x = true

compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt

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

compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt

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

compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt

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

compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)

compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)

compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class Controller {
     var i = 0

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

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

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class TestClass {
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 class TestClass {
     suspend fun toInt(): Int = suspendCoroutineOrReturn { x ->

compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun foo(x: Any): Int {
     return if (x == "56") suspendHere() else 13

compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun foo(x: Any): Int {
     return try {

compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun foo(x: Any): Int {
     return when {

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 var globalResult = ""
 var wasCalled = false

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
-import kotlin.coroutines.intrinsics.*
+import kotlin.coroutines.experimental.intrinsics.*
 
 var globalResult = ""
 var wasCalled = false

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

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