Rename SUSPENDED_MARKER to COROUTINE_SUSPENDED

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

@@ -10,7 +10,7 @@ fun builder(c: suspend () -> Unit) {
 class A {
     suspend private fun a(): String = suspendCoroutineOrReturn { x ->
         x.resume("OK")
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     suspend fun myfun(): String {

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

@@ -40,14 +40,14 @@ class AsyncGeneratorIterator<T>: AsyncIterator<T>, AsyncGenerator<T>, Continuati
         computesNext = false
         computeContinuation = c
         nextStep!!.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     suspend fun computeNext(): T = suspendCoroutineOrReturn { c ->
         computesNext = true
         computeContinuation = c
         nextStep!!.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     @Suppress("UNCHECKED_CAST")
@@ -98,7 +98,7 @@ class AsyncGeneratorIterator<T>: AsyncIterator<T>, AsyncGenerator<T>, Continuati
         nextValue = value
         nextStep = c
         resumeIterator(null)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -40,14 +40,14 @@ class AsyncGeneratorIterator<T>: AsyncIterator<T>, AsyncGenerator<T>, Continuati
         computesNext = false
         computeContinuation = c
         nextStep!!.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     suspend fun computeNext(): T = suspendCoroutineOrReturn { c ->
         computesNext = true
         computeContinuation = c
         nextStep!!.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     @Suppress("UNCHECKED_CAST")
@@ -98,7 +98,7 @@ class AsyncGeneratorIterator<T>: AsyncIterator<T>, AsyncGenerator<T>, Continuati
         nextValue = value
         nextStep = c
         resumeIterator(null)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun <T> await(t: T): T = suspendCoroutineOrReturn { c ->
     c.resume(t)
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun builder(c: suspend () -> Unit): String {

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

@@ -9,7 +9,7 @@ class Controller {
 
     suspend fun <T> suspendWithResult(value: T): T = suspendCoroutineOrReturn { c ->
         c.resume(value)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -9,7 +9,7 @@ class Controller {
 
     suspend fun <T> suspendWithResult(value: T): T = suspendCoroutineOrReturn { c ->
         c.resume(value)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -9,7 +9,7 @@ class Controller {
 
     suspend fun <T> suspendWithResult(value: T): T = suspendCoroutineOrReturn { c ->
         c.resume(value)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -9,7 +9,7 @@ class Controller {
 
     suspend fun <T> suspendWithResult(value: T): T = suspendCoroutineOrReturn { c ->
         c.resume(value)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -9,7 +9,7 @@ class Controller {
 
     suspend fun <T> suspendWithResult(value: T): T = suspendCoroutineOrReturn { c ->
         c.resume(value)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -9,7 +9,7 @@ class Controller {
 
     suspend fun <T> suspendWithResult(value: T): T = suspendCoroutineOrReturn { c ->
         c.resume(value)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -9,7 +9,7 @@ class Controller {
     suspend fun <T> suspendAndLog(value: T): T = suspendCoroutineOrReturn { c ->
         result += "suspend($value);"
         c.resume(value)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -10,7 +10,7 @@ class Controller {
     suspend fun <T> suspendWithResult(value: T): T = suspendCoroutineOrReturn { c ->
         result += "["
         c.resume(value)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -10,14 +10,14 @@ class Controller {
     suspend fun <T> suspendAndLog(value: T): T = suspendCoroutineOrReturn { c ->
         result += "suspend($value);"
         c.resume(value)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     // Tail calls are not allowed to be Nothing typed. See KT-15051
     suspend fun suspendLogAndThrow(exception: Throwable): Any? = suspendCoroutineOrReturn { c ->
         result += "throw(${exception.message});"
         c.resumeWithException(exception)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -10,7 +10,7 @@ class Controller {
     suspend fun <T> suspendAndLog(value: T): T = suspendCoroutineOrReturn { c ->
         result += "suspend($value);"
         c.resume(value)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -9,7 +9,7 @@ class Controller {
 
     suspend fun <T> suspendWithResult(value: T): T = suspendCoroutineOrReturn { c ->
         c.resume(value)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -7,7 +7,7 @@ class Controller {
     var result = false
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
         x.resume("OK")
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     fun foo() {

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // IGNORE_BACKEND: JS
 import kotlin.coroutines.experimental.*
-import kotlin.coroutines.experimental.intrinsics.SUSPENDED_MARKER
+import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED
 
 fun runCustomLambdaAsCoroutine(e: Throwable? = null, x: (Continuation<String>) -> Any?): String {
     var result = "fail"
@@ -69,7 +69,7 @@ fun runCustomLambdaAsCoroutine(e: Throwable? = null, x: (Continuation<String>) -
 fun box(): String {
     val x = runCustomLambdaAsCoroutine {
         it.resume("OK")
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     if (x != "OK") return "fail 1: $x"

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(a: String = "abc", i: Int = 2): String = suspendCoroutineOrReturn { x ->
         x.resume(a + "#" + (i + 1))
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -10,13 +10,13 @@ class Controller {
     suspend fun <T> suspendWithValue(value: T): T = suspendCoroutineOrReturn { continuation ->
         log += "suspend($value);"
         continuation.resume(value)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     suspend fun suspendWithException(value: String): Unit = suspendCoroutineOrReturn { continuation ->
         log += "error($value);"
         continuation.resumeWithException(RuntimeException(value))
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -9,7 +9,7 @@ class Controller {
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
         result++
         x.resume("OK")
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun <T> suspendHere(v: T): T = suspendCoroutineOrReturn { x ->
         x.resume(v)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -57,6 +57,6 @@ class GeneratedIterator<T>(block: suspend Generator<T>.() -> Unit) : AbstractIte
         setNext(value)
         nextStep = c
 
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }

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

@@ -12,7 +12,7 @@ class Controller {
             x.resume(v)
         }
 
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     suspend fun suspendWithException(e: Exception): String = suspendCoroutineOrReturn { x ->
@@ -20,7 +20,7 @@ class Controller {
             x.resumeWithException(e)
         }
 
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     fun run(c: suspend Controller.() -> Unit) {

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
     x.resume("OK")
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun builder(c: suspend () -> Unit) {

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

@@ -9,7 +9,7 @@ class Controller {
     suspend fun <T> suspendAndLog(value: T): T = suspendCoroutineOrReturn { x ->
         log += "suspend($value);"
         x.resume(value)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
     x.resume(Unit)
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun builder1(c: suspend () -> Unit) {

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

@@ -14,7 +14,7 @@ class Controller {
 
     suspend inline fun suspendInline(v: String): String = suspendCoroutineOrReturn { x ->
         withValue(v, x)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     suspend inline fun suspendInline(crossinline b: () -> String): String = suspendInline(b())

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

@@ -13,7 +13,7 @@ class Controller {
             x.resume(v)
         }
 
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     suspend fun suspendWithException(e: Exception): String = suspendCoroutineOrReturn { x ->
@@ -21,7 +21,7 @@ class Controller {
             x.resumeWithException(e)
         }
 
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     fun run(c: suspend Controller.() -> String) {

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

@@ -7,7 +7,7 @@ class Controller {
     var i = 0
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
         x.resume((i++).toString())
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -8,13 +8,13 @@ class Controller {
     suspend fun runInstanceOf(): Boolean = suspendCoroutineOrReturn { x ->
         val y: Any = x
         x.resume(x is Continuation<*>)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     suspend fun runCast(): Boolean = suspendCoroutineOrReturn { x ->
         val y: Any = x
         x.resume(Continuation::class.isInstance(y as Continuation<*>))
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
         x.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
         x.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
         x.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
         x.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
         x.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
         x.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -7,7 +7,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
         x.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
         x.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -7,7 +7,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
         x.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
         x.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
         x.resume("OK")
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun <V> suspendHere(v: V): V = suspendCoroutineOrReturn { x ->
     x.resume(v)
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun builder(c: suspend () -> String): String {

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 
-import kotlin.coroutines.experimental.intrinsics.SUSPENDED_MARKER
+import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED
 import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn
 import kotlin.coroutines.experimental.startCoroutine
 
@@ -24,7 +24,7 @@ class Foo(val value: Any) {
 
 suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
     x.resume("OK")
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun builder(c: suspend () -> Unit) {

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

@@ -9,7 +9,7 @@ class Controller {
     suspend fun suspendHere(v: String): Unit = suspendCoroutineOrReturn { x ->
         result += v
         x.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -5,7 +5,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
     x.resume("OK")
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun builder(c: suspend () -> Unit) {

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

@@ -5,7 +5,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
     x.resume("OK")
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun builder(c: suspend () -> Unit) {

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

@@ -9,7 +9,7 @@ class Controller {
     suspend fun suspendHere(v: String): Unit = suspendCoroutineOrReturn { x ->
         this.v = v
         x.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 import kotlin.coroutines.experimental.*
-import kotlin.coroutines.experimental.intrinsics.SUSPENDED_MARKER
+import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED
 import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn
 
 class OkDelegate {
@@ -10,7 +10,7 @@ class OkDelegate {
 
 suspend fun <T> suspendWithValue(value: T): T = suspendCoroutineOrReturn { c ->
     c.resume(value)
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun launch(c: suspend () -> String): String {

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

@@ -10,7 +10,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
         x.resume("OK")
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -8,7 +8,7 @@ class Controller {
     var result = "fail"
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
         lastSuspension = x
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     fun hasNext() = lastSuspension != null

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

@@ -8,7 +8,7 @@ class Controller {
     var result = "fail"
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
         lastSuspension = x
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     fun hasNext() = lastSuspension != null

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

@@ -8,7 +8,7 @@ class Controller {
     var result = "fail"
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
         lastSuspension = x
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     fun hasNext() = lastSuspension != null

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

@@ -8,7 +8,7 @@ class Controller {
     var result = "fail"
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
         lastSuspension = x
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     fun hasNext() = lastSuspension != null

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

@@ -13,7 +13,7 @@ class Controller {
             x.resume(v)
         }
 
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     suspend fun suspendWithException(e: Exception): String = suspendCoroutineOrReturn { x ->
@@ -21,7 +21,7 @@ class Controller {
             x.resumeWithException(e)
         }
 
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     fun run(c: suspend Controller.() -> String) {

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

@@ -7,7 +7,7 @@ class Controller {
     var cResult = 0
     suspend fun suspendHere(v: Int): Int = suspendCoroutineOrReturn { x ->
         x.resume(v * 2)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -8,7 +8,7 @@ class Controller {
     var cResult = 0
     suspend fun suspendHere(v: Int): Int = suspendCoroutineOrReturn { x ->
         x.resume(v * 2)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -5,7 +5,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
     x.resume("OK")
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun builder(c: suspend () -> Int): Int {

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

@@ -5,7 +5,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
     x.resume("OK")
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun builder(c: suspend () -> Unit) {

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
         x.resumeWithException(RuntimeException("OK"))
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -5,7 +5,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
     x.resume("OK")
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun builder(c: suspend () -> Int): Int {

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 var globalResult = ""
 suspend fun suspendWithValue(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun builder(c: suspend () -> String) {

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 interface TestInterface {
     suspend fun toInt(): Int = suspendCoroutineOrReturn { x ->
         x.resume(56)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -8,7 +8,7 @@ class Controller {
 
     suspend fun suspendThere(): String = suspendCoroutineOrReturn { x ->
         x.resume("OK")
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(v: Int): Int = suspendCoroutineOrReturn { x ->
         x.resume(v * 2)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -9,7 +9,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 object Host {
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
         x.resume("OK")
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -11,13 +11,13 @@ class Controller {
     suspend fun <T> suspendWithValue(value: T): T = suspendCoroutineOrReturn { continuation ->
         log += "suspend($value);"
         continuation.resume(value)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     suspend fun suspendWithException(value: String): Unit = suspendCoroutineOrReturn { continuation ->
         log += "error($value);"
         continuation.resumeWithException(RuntimeException(value))
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -12,7 +12,7 @@ class Controller {
             x.resume(v)
         }
 
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     suspend fun suspendWithException(e: Exception): String = suspendCoroutineOrReturn { x ->
@@ -20,7 +20,7 @@ class Controller {
             x.resumeWithException(e)
         }
 
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     fun run(c: suspend Controller.() -> Unit) {
@@ -50,7 +50,7 @@ fun commonThrow(t: Throwable) {
 suspend fun justContinue(): Unit = suspendCoroutineOrReturn { x ->
     x.resume(Unit)
 
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 suspend fun Controller.test1() {

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

@@ -5,7 +5,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 suspend inline fun suspendHere(crossinline block: () -> String): String {

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

@@ -2,13 +2,13 @@
 // WITH_COROUTINES
 // TARGET_BACKEND: JVM
 import kotlin.coroutines.experimental.*
-import kotlin.coroutines.experimental.intrinsics.SUSPENDED_MARKER
+import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED
 import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn
 
 class MyTest {
     suspend fun act(value: String): String = suspendCoroutineOrReturn {
         it.resume(value)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class A(val v: String) {
     suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x ->
         x.resume(v)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     suspend fun suspendHere(): String = suspendThere("O") + suspendThere(v)

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

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

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

@@ -7,7 +7,7 @@ import kotlin.reflect.KProperty
 
 suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 class A(val x: String) {
@@ -21,13 +21,13 @@ class A(val x: String) {
         if (value != "56") return@suspendCoroutineOrReturn Unit
         isSetValueCalled = true
         x.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     operator suspend fun provideDelegate(host: Any?, p: Any): A = suspendCoroutineOrReturn { x ->
         isProvideDelegateCalled = true
         x.resume(this)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     operator suspend fun plus(y: String) = suspendThere(x + y)
@@ -36,14 +36,14 @@ class A(val x: String) {
     operator suspend fun inc(): A = suspendCoroutineOrReturn { x ->
         isProvideDelegateCalled = true
         x.resume(this)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     operator suspend fun minusAssign(y: String): Unit = suspendCoroutineOrReturn { x ->
         if (y != "56") return@suspendCoroutineOrReturn Unit
         isMinusAssignCalled = true
         x.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -23,7 +23,7 @@ class X {
 
 suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun builder(c: suspend X.() -> Unit) {

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

@@ -9,7 +9,7 @@ private suspend fun foo(): String  {
     if (x) {
         return suspendCoroutineOrReturn<String> {
             it.resume("OK")
-            SUSPENDED_MARKER
+            COROUTINE_SUSPENDED
         }
     }
 

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

@@ -5,7 +5,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 suspend fun suspendHere(suspend: Boolean): String {

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

@@ -5,7 +5,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 suspend fun suspendHere(): String = suspendThere("O") + suspendThere("K")

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

@@ -5,7 +5,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 suspend fun suspendHere(): String {

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

@@ -5,7 +5,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun builder(c: suspend () -> Unit) {

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

@@ -5,7 +5,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun builder(c: suspend () -> Unit) {

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

@@ -5,7 +5,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(v: String): String = suspendCoroutineOrReturn { x ->
     x.resume(v)
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun builder(c: suspend () -> Unit) {

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

@@ -7,11 +7,11 @@ class Controller {
     var i = 0
     suspend fun suspendHere(): Int = suspendCoroutineOrReturn { x ->
         x.resume(i++)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
     suspend fun suspendThere(): String = suspendCoroutineOrReturn { x ->
         x.resume("?")
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -6,17 +6,17 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
         x.resume("K")
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     suspend fun suspendWithArgument(v: String): String = suspendCoroutineOrReturn { x ->
         x.resume(v)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     suspend fun suspendWithDouble(v: Double): Double = suspendCoroutineOrReturn { x ->
         x.resume(v)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class TestClass {
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
         x.resume("K")
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class TestClass {
     suspend fun toInt(): Int = suspendCoroutineOrReturn { x ->
         x.resume(14)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -9,7 +9,7 @@ suspend fun foo(x: Any): Int {
 
 suspend fun suspendHere(): Int = suspendCoroutineOrReturn { x ->
     x.resume(56)
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun builder(c: suspend () -> Unit) {

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

@@ -13,7 +13,7 @@ suspend fun foo(x: Any): Int {
 
 suspend fun suspendHere(): Int = suspendCoroutineOrReturn { x ->
     x.resume(56)
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun builder(c: suspend () -> Unit) {

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

@@ -12,7 +12,7 @@ suspend fun foo(x: Any): Int {
 
 suspend fun suspendHere(): Int = suspendCoroutineOrReturn { x ->
     x.resume(56)
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun builder(c: suspend () -> Unit) {

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

@@ -13,7 +13,7 @@ class Controller {
             x.resume(v)
         }
 
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     suspend fun suspendWithException(e: Exception): String = suspendCoroutineOrReturn { x ->
@@ -21,7 +21,7 @@ class Controller {
             x.resumeWithException(e)
         }
 
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     fun run(c: suspend Controller.() -> String) {

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

@@ -13,7 +13,7 @@ class Controller {
             x.resume(v)
         }
 
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     suspend fun suspendWithException(e: Exception): String = suspendCoroutineOrReturn { x ->
@@ -21,7 +21,7 @@ class Controller {
             x.resumeWithException(e)
         }
 
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     fun run(c: suspend Controller.() -> String) {

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

@@ -7,7 +7,7 @@ class Controller {
     suspend fun suspendHere(v: String): String = suspendCoroutineOrReturn { x ->
         x.resume(v)
 
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -13,7 +13,7 @@ class Controller {
             x.resume(v)
         }
 
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     suspend fun suspendWithException(e: Exception): String = suspendCoroutineOrReturn { x ->
@@ -21,7 +21,7 @@ class Controller {
             x.resumeWithException(e)
         }
 
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     fun run(c: suspend Controller.() -> String) {

compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt

@@ -5,7 +5,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
     x.resume("OK")
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun builder(c: suspend () -> Unit) {

compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt

@@ -5,7 +5,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 
 suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
     x.resume("OK")
-    SUSPENDED_MARKER
+    COROUTINE_SUSPENDED
 }
 
 fun builder(c: suspend () -> Unit) {

compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt

@@ -16,7 +16,7 @@ suspend fun suspendHere(x: Int): Unit {
     result = "OK"
     return suspendCoroutineOrReturn { x ->
         x.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt

@@ -10,7 +10,7 @@ suspend fun suspendHere(x: Int): Unit {
     result = "OK"
     return suspendCoroutineOrReturn { x ->
         x.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
         x.resume("OK")
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -6,7 +6,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(): String = suspendCoroutineOrReturn { x ->
         x.resume("OK")
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -7,7 +7,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
         x.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -7,7 +7,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
         x.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }
 

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

@@ -7,7 +7,7 @@ import kotlin.coroutines.experimental.intrinsics.*
 class Controller {
     suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x ->
         x.resume(Unit)
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 }