]> Cypherpunks repositories - gostls13.git/commitdiff
runtime: make gcDrainN take an int instead of uintptr
authorAustin Clements <austin@google.com>
Wed, 18 Feb 2015 21:40:31 +0000 (16:40 -0500)
committerAustin Clements <austin@google.com>
Thu, 19 Feb 2015 02:47:45 +0000 (02:47 +0000)
Nit.  There's no reason to take a uintptr and doing so just requires
casts in annoying places.

Change-Id: Ifeb9638c6d94eae619c490930cf724cc315680ba
Reviewed-on: https://go-review.googlesource.com/5230
Reviewed-by: Russ Cox <rsc@golang.org>
src/runtime/mgc.go

index 1a3e70fcdd4be38f02a56c9075bed3186db20d7f..7d68d5bf5f409cd6dae549e6dada583d5b84f81a 100644 (file)
@@ -494,9 +494,9 @@ func gcDrain(wbuf *workbuf) {
 // gcDrainN scans n objects starting with those in wbuf, blackening
 // grey objects.
 //go:nowritebarrier
-func gcDrainN(wbuf *workbuf, n uintptr) *workbuf {
+func gcDrainN(wbuf *workbuf, n int) *workbuf {
        checknocurrentwbuf()
-       for i := uintptr(0); i < n; i++ {
+       for i := 0; i < n; i++ {
                if wbuf.nobj == 0 {
                        putempty(wbuf, 544)
                        wbuf = trygetfull(545)
@@ -817,7 +817,7 @@ func gchelpwork() {
                        wbuf = trygetfull(1228)
                }
                if wbuf != nil {
-                       wbuf = gcDrainN(wbuf, uintptr(len(wbuf.obj))) // drain upto one buffer's worth of objects
+                       wbuf = gcDrainN(wbuf, len(wbuf.obj)) // drain upto one buffer's worth of objects
                        if wbuf != nil {
                                if wbuf.nobj != 0 {
                                        putfull(wbuf, 1175)