azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move coroutine intrinsics to kotlin.coroutine.intrinsics package

Browse Source 
Also rename val SUSPENDED to SUSPENDED_MARKER

 #KT-15698 Fixed
This commit is contained in:
Denis Zharkov
2017-01-13 15:43:50 +03:00
parent e0fa11b0c1
commit 2cb9d3a8ad
119 changed files with 446 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/runtime.jvm/src/kotlin/jvm/internal/CoroutineImpl.kt
+3 -2
View File
@@ -17,6 +17,7 @@
package kotlin.jvm.internal
import kotlin.coroutines.*
import kotlin.coroutines.intrinsics.SUSPENDED_MARKER
private const val INTERCEPT_BIT_SET = 1 shl 31
private const val INTERCEPT_BIT_CLEAR = INTERCEPT_BIT_SET.inv()
@@ -73,7 +74,7 @@ abstract class RestrictedCoroutineImpl : Lambda, Continuation<Any?> {
override fun resume(value: Any?) {
try {
val result = doResume(value, null)
if (result != CoroutineIntrinsics.SUSPENDED)
if (result != SUSPENDED_MARKER)
completion!!.resume(result)
} catch (e: Throwable) {
completion!!.resumeWithException(e)
@@ -83,7 +84,7 @@ abstract class RestrictedCoroutineImpl : Lambda, Continuation<Any?> {
override fun resumeWithException(exception: Throwable) {
try {
val result = doResume(null, exception)
if (result != CoroutineIntrinsics.SUSPENDED)
if (result != SUSPENDED_MARKER)
completion!!.resume(result)
} catch (e: Throwable) {
completion!!.resumeWithException(e)