From cc995bf1d58da6744576de77220f21b885726109 Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Mon, 10 Sep 2018 17:53:48 +0300 Subject: [PATCH] Remove workaround for `COROUTINE_SUSPENDED` property --- .../js/src/kotlin/coroutines/intrinsics/IntrinsicsJs.kt | 3 --- .../src/kotlin/coroutines/intrinsics/IntrinsicsJvm.kt | 9 --------- .../src/kotlin/coroutines/intrinsics/Intrinsics.kt | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/libraries/stdlib/coroutines/js/src/kotlin/coroutines/intrinsics/IntrinsicsJs.kt b/libraries/stdlib/coroutines/js/src/kotlin/coroutines/intrinsics/IntrinsicsJs.kt index 626e1f9e5e4..02054e9ef10 100644 --- a/libraries/stdlib/coroutines/js/src/kotlin/coroutines/intrinsics/IntrinsicsJs.kt +++ b/libraries/stdlib/coroutines/js/src/kotlin/coroutines/intrinsics/IntrinsicsJs.kt @@ -127,6 +127,3 @@ private inline fun createCoroutineFromSuspendFunction( } } } - -@SinceKotlin("1.3") -public actual val COROUTINE_SUSPENDED: Any = CoroutineSingletons.COROUTINE_SUSPENDED \ No newline at end of file diff --git a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/intrinsics/IntrinsicsJvm.kt b/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/intrinsics/IntrinsicsJvm.kt index c04626c1a61..0e804afed17 100644 --- a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/intrinsics/IntrinsicsJvm.kt +++ b/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/intrinsics/IntrinsicsJvm.kt @@ -195,12 +195,3 @@ private inline fun createCoroutineFromSuspendFunction( } } } - -/** - * This value is used as a return value of [suspendCoroutineOrReturn] `block` argument to state that - * the execution was suspended and will not return any result immediately. - */ -// It is implemented as property with getter to avoid ProGuard problem with multifile IntrinsicsKt class -@SinceKotlin("1.3") -public actual val COROUTINE_SUSPENDED: Any - get() = CoroutineSingletons.COROUTINE_SUSPENDED diff --git a/libraries/stdlib/coroutines/src/kotlin/coroutines/intrinsics/Intrinsics.kt b/libraries/stdlib/coroutines/src/kotlin/coroutines/intrinsics/Intrinsics.kt index df5f0932fce..d2db2241900 100644 --- a/libraries/stdlib/coroutines/src/kotlin/coroutines/intrinsics/Intrinsics.kt +++ b/libraries/stdlib/coroutines/src/kotlin/coroutines/intrinsics/Intrinsics.kt @@ -45,7 +45,7 @@ public suspend inline fun suspendCoroutineUninterceptedOrReturn(crossinline */ // It is implemented as property with getter to avoid ProGuard problem with multifile IntrinsicsKt class @SinceKotlin("1.3") -public expect val COROUTINE_SUSPENDED: Any +public val COROUTINE_SUSPENDED: Any get() = CoroutineSingletons.COROUTINE_SUSPENDED // Using enum here ensures two important properties: // 1. It makes SafeContinuation serializable with all kinds of serialization frameworks (since all of them natively support enums)