Use common SharedImmutable declaration from stdlib
diff --git a/kotlinx-coroutines-core/common/src/CancellableContinuationImpl.kt b/kotlinx-coroutines-core/common/src/CancellableContinuationImpl.kt
index f5b5900..27c8325 100644
--- a/kotlinx-coroutines-core/common/src/CancellableContinuationImpl.kt
+++ b/kotlinx-coroutines-core/common/src/CancellableContinuationImpl.kt
@@ -9,6 +9,7 @@
import kotlin.coroutines.*
import kotlin.coroutines.intrinsics.*
import kotlin.jvm.*
+import kotlin.native.concurrent.*
private const val UNDECIDED = 0
private const val SUSPENDED = 1
diff --git a/kotlinx-coroutines-core/common/src/EventLoop.common.kt b/kotlinx-coroutines-core/common/src/EventLoop.common.kt
index a4984b5..83959af 100644
--- a/kotlinx-coroutines-core/common/src/EventLoop.common.kt
+++ b/kotlinx-coroutines-core/common/src/EventLoop.common.kt
@@ -8,6 +8,7 @@
import kotlinx.coroutines.internal.*
import kotlin.coroutines.*
import kotlin.jvm.*
+import kotlin.native.concurrent.*
/**
* Extended by [CoroutineDispatcher] implementations that have event loop inside and can
diff --git a/kotlinx-coroutines-core/common/src/JobSupport.kt b/kotlinx-coroutines-core/common/src/JobSupport.kt
index eb0d823..c7a7195 100644
--- a/kotlinx-coroutines-core/common/src/JobSupport.kt
+++ b/kotlinx-coroutines-core/common/src/JobSupport.kt
@@ -13,6 +13,7 @@
import kotlin.coroutines.intrinsics.*
import kotlin.js.*
import kotlin.jvm.*
+import kotlin.native.concurrent.*
/**
* A concrete implementation of [Job]. It is optionally a child to a parent job.
diff --git a/kotlinx-coroutines-core/common/src/channels/AbstractChannel.kt b/kotlinx-coroutines-core/common/src/channels/AbstractChannel.kt
index f701644..b9bd83b 100644
--- a/kotlinx-coroutines-core/common/src/channels/AbstractChannel.kt
+++ b/kotlinx-coroutines-core/common/src/channels/AbstractChannel.kt
@@ -11,6 +11,7 @@
import kotlinx.coroutines.selects.*
import kotlin.coroutines.*
import kotlin.jvm.*
+import kotlin.native.concurrent.*
/**
* Abstract send channel. It is a base class for all send channel implementations.
diff --git a/kotlinx-coroutines-core/common/src/channels/ConflatedBroadcastChannel.kt b/kotlinx-coroutines-core/common/src/channels/ConflatedBroadcastChannel.kt
index a3e72a9..74fc444 100644
--- a/kotlinx-coroutines-core/common/src/channels/ConflatedBroadcastChannel.kt
+++ b/kotlinx-coroutines-core/common/src/channels/ConflatedBroadcastChannel.kt
@@ -10,6 +10,7 @@
import kotlinx.coroutines.intrinsics.*
import kotlinx.coroutines.selects.*
import kotlin.jvm.*
+import kotlin.native.concurrent.*
/**
* Broadcasts the most recently sent element (aka [value]) to all [openSubscription] subscribers.
diff --git a/kotlinx-coroutines-core/common/src/flow/internal/NullSurrogate.kt b/kotlinx-coroutines-core/common/src/flow/internal/NullSurrogate.kt
index c6ff12f..97faee0 100644
--- a/kotlinx-coroutines-core/common/src/flow/internal/NullSurrogate.kt
+++ b/kotlinx-coroutines-core/common/src/flow/internal/NullSurrogate.kt
@@ -6,6 +6,7 @@
import kotlinx.coroutines.internal.*
import kotlin.jvm.*
+import kotlin.native.concurrent.*
/**
* This value is used a a surrogate `null` value when needed.
diff --git a/kotlinx-coroutines-core/common/src/internal/Atomic.kt b/kotlinx-coroutines-core/common/src/internal/Atomic.kt
index 8a1185a..1fb4cef 100644
--- a/kotlinx-coroutines-core/common/src/internal/Atomic.kt
+++ b/kotlinx-coroutines-core/common/src/internal/Atomic.kt
@@ -7,6 +7,7 @@
import kotlinx.atomicfu.atomic
import kotlinx.coroutines.*
import kotlin.jvm.*
+import kotlin.native.concurrent.*
/**
* The most abstract operation that can be in process. Other threads observing an instance of this
diff --git a/kotlinx-coroutines-core/common/src/internal/Concurrent.common.kt b/kotlinx-coroutines-core/common/src/internal/Concurrent.common.kt
index 6b096f0..d23d09c 100644
--- a/kotlinx-coroutines-core/common/src/internal/Concurrent.common.kt
+++ b/kotlinx-coroutines-core/common/src/internal/Concurrent.common.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2016-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
*/
package kotlinx.coroutines.internal
@@ -22,7 +22,3 @@
internal expect inline fun <T> ReentrantLock.withLock(action: () -> T): T
internal expect fun <E> identitySet(expectedSize: Int): MutableSet<E>
-
-@ExperimentalMultiplatform
-@OptionalExpectation
-internal expect annotation class SharedImmutable()
diff --git a/kotlinx-coroutines-core/common/src/internal/DispatchedContinuation.kt b/kotlinx-coroutines-core/common/src/internal/DispatchedContinuation.kt
index f04dde1..2369f18 100644
--- a/kotlinx-coroutines-core/common/src/internal/DispatchedContinuation.kt
+++ b/kotlinx-coroutines-core/common/src/internal/DispatchedContinuation.kt
@@ -8,6 +8,7 @@
import kotlinx.coroutines.internal.*
import kotlin.coroutines.*
import kotlin.jvm.*
+import kotlin.native.concurrent.*
@SharedImmutable
private val UNDEFINED = Symbol("UNDEFINED")
diff --git a/kotlinx-coroutines-core/common/src/internal/LockFreeLinkedList.common.kt b/kotlinx-coroutines-core/common/src/internal/LockFreeLinkedList.common.kt
index 39dc1d2..2ba7d98 100644
--- a/kotlinx-coroutines-core/common/src/internal/LockFreeLinkedList.common.kt
+++ b/kotlinx-coroutines-core/common/src/internal/LockFreeLinkedList.common.kt
@@ -5,6 +5,7 @@
package kotlinx.coroutines.internal
import kotlin.jvm.*
+import kotlin.native.concurrent.*
/** @suppress **This is unstable API and it is subject to change.** */
public expect open class LockFreeLinkedListNode() {
diff --git a/kotlinx-coroutines-core/common/src/selects/Select.kt b/kotlinx-coroutines-core/common/src/selects/Select.kt
index 63e4dfa..1725d12 100644
--- a/kotlinx-coroutines-core/common/src/selects/Select.kt
+++ b/kotlinx-coroutines-core/common/src/selects/Select.kt
@@ -13,6 +13,7 @@
import kotlin.coroutines.*
import kotlin.coroutines.intrinsics.*
import kotlin.jvm.*
+import kotlin.native.concurrent.*
/**
* Scope for [select] invocation.
@@ -213,6 +214,7 @@
fun next() = number.incrementAndGet()
}
+@SharedImmutable
private val selectOpSequenceNumber = SeqNumber()
@PublishedApi
diff --git a/kotlinx-coroutines-core/common/src/sync/Mutex.kt b/kotlinx-coroutines-core/common/src/sync/Mutex.kt
index ea4a510..4a22355 100644
--- a/kotlinx-coroutines-core/common/src/sync/Mutex.kt
+++ b/kotlinx-coroutines-core/common/src/sync/Mutex.kt
@@ -11,6 +11,7 @@
import kotlinx.coroutines.selects.*
import kotlin.coroutines.*
import kotlin.jvm.*
+import kotlin.native.concurrent.*
/**
* Mutual exclusion for coroutines.
diff --git a/kotlinx-coroutines-core/common/src/sync/Semaphore.kt b/kotlinx-coroutines-core/common/src/sync/Semaphore.kt
index b6ebc50..d72f989 100644
--- a/kotlinx-coroutines-core/common/src/sync/Semaphore.kt
+++ b/kotlinx-coroutines-core/common/src/sync/Semaphore.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright 2016-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ */
+
package kotlinx.coroutines.sync
import kotlinx.atomicfu.*
@@ -6,6 +10,7 @@
import kotlin.coroutines.*
import kotlin.jvm.*
import kotlin.math.*
+import kotlin.native.concurrent.*
/**
* A counting semaphore for coroutines that logically maintains a number of available permits.
diff --git a/kotlinx-coroutines-core/native/src/CoroutineContext.kt b/kotlinx-coroutines-core/native/src/CoroutineContext.kt
index 41d2c88..debdc97 100644
--- a/kotlinx-coroutines-core/native/src/CoroutineContext.kt
+++ b/kotlinx-coroutines-core/native/src/CoroutineContext.kt
@@ -1,10 +1,11 @@
/*
- * Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2016-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
*/
package kotlinx.coroutines
import kotlin.coroutines.*
+import kotlin.native.concurrent.*
private fun takeEventLoop(): EventLoopImpl =
ThreadLocalEventLoop.currentOrNull() as? EventLoopImpl ?:
@@ -26,6 +27,7 @@
internal actual fun createDefaultDispatcher(): CoroutineDispatcher =
DefaultExecutor
+@SharedImmutable
internal actual val DefaultDelay: Delay = DefaultExecutor
public actual fun CoroutineScope.newCoroutineContext(context: CoroutineContext): CoroutineContext {
diff --git a/kotlinx-coroutines-core/native/src/internal/Concurrent.kt b/kotlinx-coroutines-core/native/src/internal/Concurrent.kt
index 546d6af..84d5d34 100644
--- a/kotlinx-coroutines-core/native/src/internal/Concurrent.kt
+++ b/kotlinx-coroutines-core/native/src/internal/Concurrent.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2016-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
*/
package kotlinx.coroutines.internal
@@ -16,6 +16,3 @@
internal actual fun <E> subscriberList(): MutableList<E> = CopyOnWriteList<E>()
internal actual fun <E> identitySet(expectedSize: Int): MutableSet<E> = HashSet()
-
-@Suppress("ACTUAL_WITHOUT_EXPECT")
-internal actual typealias SharedImmutable = kotlin.native.concurrent.SharedImmutable