aboutsummaryrefslogtreecommitdiff
path: root/src/runtime/stack.go
diff options
context:
space:
mode:
authorAustin Clements <austin@google.com>2017-12-04 10:58:15 -0500
committerAustin Clements <austin@google.com>2018-02-15 21:12:14 +0000
commita90f9a00ca34251dcee80eacff241871c43ac18f (patch)
tree1972b0b2143b676ccc085da741835914b039ecba /src/runtime/stack.go
parent058bb7ea278d8e073be1e1c73d01fbfd74c170fd (diff)
downloadgo-a90f9a00ca34251dcee80eacff241871c43ac18f.tar.xz
runtime: consolidate mheap.lookup* and spanOf*
I think we'd forgotten about the mheap.lookup APIs when we introduced spanOf*, but, at any rate, the spanOf* functions are used far more widely at this point, so this CL eliminates the mheap.lookup* functions in favor of spanOf*. Change-Id: I15facd0856e238bb75d990e838a092b5bef5bdfc Reviewed-on: https://go-review.googlesource.com/85879 Run-TryBot: Austin Clements <austin@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Rick Hudson <rlh@golang.org>
Diffstat (limited to 'src/runtime/stack.go')
-rw-r--r--src/runtime/stack.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/runtime/stack.go b/src/runtime/stack.go
index 6149838b6d..9ed6b1d774 100644
--- a/src/runtime/stack.go
+++ b/src/runtime/stack.go
@@ -209,7 +209,7 @@ func stackpoolalloc(order uint8) gclinkptr {
// Adds stack x to the free pool. Must be called with stackpoolmu held.
func stackpoolfree(x gclinkptr, order uint8) {
- s := mheap_.lookup(unsafe.Pointer(x))
+ s := spanOfUnchecked(uintptr(x))
if s.state != _MSpanManual {
throw("freeing stack not in a stack span")
}
@@ -455,7 +455,7 @@ func stackfree(stk stack) {
c.stackcache[order].size += n
}
} else {
- s := mheap_.lookup(v)
+ s := spanOfUnchecked(uintptr(v))
if s.state != _MSpanManual {
println(hex(s.base()), v)
throw("bad span state")