aboutsummaryrefslogtreecommitdiff
path: root/src/runtime/mheap.go
diff options
context:
space:
mode:
authorMichael Anthony Knyszek <mknyszek@google.com>2020-02-19 19:45:57 +0000
committerMichael Knyszek <mknyszek@google.com>2020-08-17 20:06:41 +0000
commit260dff3ca3b06385dc298523791a2079162f546e (patch)
tree971b6f5ba2829e88c126f027bb35814459762d73 /src/runtime/mheap.go
parente30fbe3757d09a22988835835c41233df7c6cd00 (diff)
downloadgo-260dff3ca3b06385dc298523791a2079162f546e.tar.gz
go-260dff3ca3b06385dc298523791a2079162f546e.zip
runtime: clean up old markrootSpans
This change removes the old markrootSpans implementation and deletes the feature flag. Updates #37487. Change-Id: Idb5a2559abcc3be5a7da6f2ccce1a86e1d7634e3 Reviewed-on: https://go-review.googlesource.com/c/go/+/221183 Run-TryBot: Michael Knyszek <mknyszek@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Michael Pratt <mpratt@google.com> Reviewed-by: Austin Clements <austin@google.com>
Diffstat (limited to 'src/runtime/mheap.go')
-rw-r--r--src/runtime/mheap.go8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/runtime/mheap.go b/src/runtime/mheap.go
index 6341375160..0807726863 100644
--- a/src/runtime/mheap.go
+++ b/src/runtime/mheap.go
@@ -52,7 +52,7 @@ const (
// The definition of this flag helps ensure that if there's a problem with
// the new markroot spans implementation and it gets turned off, that the new
// mcentral implementation also gets turned off so the runtime isn't broken.
- go115NewMCentralImpl = true && go115NewMarkrootSpans
+ go115NewMCentralImpl = true
)
// Main malloc heap.
@@ -1705,9 +1705,7 @@ func addspecial(p unsafe.Pointer, s *special) bool {
s.offset = uint16(offset)
s.next = *t
*t = s
- if go115NewMarkrootSpans {
- spanHasSpecials(span)
- }
+ spanHasSpecials(span)
unlock(&span.speciallock)
releasem(mp)
@@ -1748,7 +1746,7 @@ func removespecial(p unsafe.Pointer, kind uint8) *special {
}
t = &s.next
}
- if go115NewMarkrootSpans && span.specials == nil {
+ if span.specials == nil {
spanHasNoSpecials(span)
}
unlock(&span.speciallock)