From: Michael Pratt <mpratt@google.com>
Date: Thu, 25 Sep 2025 17:12:12 +0000 (-0700)
Subject: [release-branch.go1.24] sync/atomic: correct Uintptr.Or return doc
X-Git-Tag: go1.24.8~14
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=6998277471f65ecf997814a3b64d35b4ffc58c4d;p=gostls13.git

[release-branch.go1.24] sync/atomic: correct Uintptr.Or return doc

Uintptr.Or returns the old value, just like all of the other Or
functions. This was a typo in the original CL 544455.

For #75607.
Fixes #75609.

Change-Id: I260959e7e32e51f1152b5271df6cc51adfa02a4d
Reviewed-on: https://go-review.googlesource.com/c/go/+/706816
Reviewed-by: Michael Knyszek <mknyszek@google.com>
Reviewed-by: Mauri de Souza Meneguzzo <mauri870@gmail.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Michael Pratt <mpratt@google.com>
(cherry picked from commit d70ad4e740e24b4b76961c4b56d698fa23668aa2)
Reviewed-on: https://go-review.googlesource.com/c/go/+/706855
Reviewed-by: Carlos Amedee <carlos@golang.org>
---

diff --git a/src/sync/atomic/type.go b/src/sync/atomic/type.go
index f487cb9c5f..56da592dc2 100644
--- a/src/sync/atomic/type.go
+++ b/src/sync/atomic/type.go
@@ -218,7 +218,7 @@ func (x *Uintptr) Add(delta uintptr) (new uintptr) { return AddUintptr(&x.v, del
 func (x *Uintptr) And(mask uintptr) (old uintptr) { return AndUintptr(&x.v, mask) }
 
 // Or atomically performs a bitwise OR operation on x using the bitmask
-// provided as mask and returns the updated value after the OR operation.
+// provided as mask and returns the old value.
 func (x *Uintptr) Or(mask uintptr) (old uintptr) { return OrUintptr(&x.v, mask) }
 
 // noCopy may be added to structs which must not be copied