Attempt to select SelectInstance in onReceiveOrClosed before starting a coroutine to avoid double resume

Fixed #1584

Author: qwwdfsad

kotlinx-coroutines-core/common/src/channels/AbstractChannel.kt

@@ -747,7 +747,7 @@ internal abstract class AbstractChannel<E> : AbstractSendChannel<E>(), Channel<E
                         }
                     }
                     else -> {
-                        // selected successfully
+                        // selected successfully, pollSelectInternal is responsible for the select
                         block.startCoroutineUnintercepted(pollResult as E, select.completion)
                         return
                     }
@@ -776,10 +776,12 @@ internal abstract class AbstractChannel<E> : AbstractSendChannel<E>(), Channel<E
                     pollResult === POLL_FAILED -> {} // retry
                     pollResult === RETRY_ATOMIC -> {} // retry
                     pollResult is Closed<*> -> {
-                        block.startCoroutineUnintercepted(ValueOrClosed.closed(pollResult.closeCause), select.completion)
+                        if (select.trySelect())
+                            block.startCoroutineUnintercepted(ValueOrClosed.closed(pollResult.closeCause), select.completion)
+                        return
                     }
                     else -> {
-                        // selected successfully
+                        // selected successfully, pollSelectInternal is responsible for the select
                         block.startCoroutineUnintercepted(ValueOrClosed.value(pollResult as E), select.completion)
                         return
                     }

kotlinx-coroutines-core/common/test/selects/SelectArrayChannelTest.kt

@@ -388,4 +388,35 @@ class SelectArrayChannelTest : TestBase() {
         if (!trySelect()) return
         block.startCoroutineUnintercepted(this)
     }
+
+    @Test
+    fun testSelectReceiveOrClosedForClosedChannel() = runTest {
+        val channel = Channel<Int>(1)
+        channel.close()
+        expect(1)
+        select<Unit> {
+            expect(2)
+            channel.onReceiveOrClosed {
+                assertTrue(it.isClosed)
+                assertNull(it.closeCause)
+                finish(3)
+            }
+        }
+    }
+
+    @Test
+    fun testSelectReceiveOrClosedForClosedChannelWithValue() = runTest {
+        val channel = Channel<Int>(1)
+        channel.send(42)
+        channel.close()
+        expect(1)
+        select<Unit> {
+            expect(2)
+            channel.onReceiveOrClosed {
+                assertFalse(it.isClosed)
+                assertEquals(42, it.value)
+                finish(3)
+            }
+        }
+    }
 }

kotlinx-coroutines-core/common/test/selects/SelectRendezvousChannelTest.kt

@@ -347,6 +347,21 @@ class SelectRendezvousChannelTest : TestBase() {
         finish(6)
     }
 
+    @Test
+    fun testSelectReceiveOrClosedForClosedChannel() = runTest {
+        val channel = Channel<Unit>()
+        channel.close()
+        expect(1)
+        select<Unit> {
+            expect(2)
+            channel.onReceiveOrClosed {
+                assertTrue(it.isClosed)
+                assertNull(it.closeCause)
+                finish(3)
+            }
+        }
+    }
+
     @Test
     fun testSelectReceiveOrClosed() = runTest {
         val channel = Channel<Int>(Channel.RENDEZVOUS)