[dev.garbage] all: merge dev.cc into dev.garbage

[gostls13.git] / src / runtime / select.go

diff --git a/src/runtime/select.go b/src/runtime/select.go
index d703e1d79bedb8048973e30c62c412f71eceb0e8..e918b734a8e80bd7ca2445a61785185e03416f8c 100644 (file)
--- a/src/runtime/select.go
+++ b/src/runtime/select.go
@@ -167,8 +167,8 @@ func selunlock(sel *_select) {
        }
 }
 
-func selparkcommit(gp *g, sel *_select) bool {
-       selunlock(sel)
+func selparkcommit(gp *g, sel unsafe.Pointer) bool {
+       selunlock((*_select)(sel))
        return true
 }
 
@@ -363,7 +363,7 @@ loop:
 
        // wait for someone to wake us up
        gp.param = nil
-       gopark(unsafe.Pointer(funcPC(selparkcommit)), unsafe.Pointer(sel), "select")
+       gopark(selparkcommit, unsafe.Pointer(sel), "select")
 
        // someone woke us up
        sellock(sel)