From 1d09433ec072c2acff27335c2d05ce44bb501ecc Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Wed, 26 Sep 2018 15:36:28 -0400 Subject: runtime: undo manual inlining of mbits.setMarked Since atomic.Or8 is now an intrinsic (and has been for some time), markBits.setMarked is inlinable. Undo the manual inlining of it. Change-Id: I8e37ccf0851ad1d3088d9c8ae0f6f0c439d7eb2d Reviewed-on: https://go-review.googlesource.com/c/138659 Run-TryBot: Austin Clements TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- src/runtime/mgcmark.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/runtime/mgcmark.go') diff --git a/src/runtime/mgcmark.go b/src/runtime/mgcmark.go index d4dcfb6cb9..14f09700ee 100644 --- a/src/runtime/mgcmark.go +++ b/src/runtime/mgcmark.go @@ -1228,8 +1228,7 @@ func greyobject(obj, base, off uintptr, span *mspan, gcw *gcWork, objIndex uintp if mbits.isMarked() { return } - // mbits.setMarked() // Avoid extra call overhead with manual inlining. - atomic.Or8(mbits.bytep, mbits.mask) + mbits.setMarked() // If this is a noscan object, fast-track it to black // instead of greying it. if span.spanclass.noscan() { -- cgit v1.3-5-g9baa