From cd15d0fad805ab709f95a21a4a7806f430ccdbee Mon Sep 17 00:00:00 2001 From: Aoang Date: Mon, 11 Mar 2024 21:05:38 +0800 Subject: [PATCH] Fix: update calls to `runtime.fastrand` to use `cheaprand` for compatibility with Go 1.22 In Golang 1.22, the `runtime.fastrand` method was renamed to `cheaprand`. This commit updates all occurrences of `runtime.fastrand` in the project to use the new `cheaprand` method to maintain compatibility with the latest Golang version and address performance concerns. Refer: https://gist.github.com/Aoang/3dc06f127f3f54507b7e06b7b6550c28 --- src/x/unsafe/rand.go | 7 ------- src/x/unsafe/runtime.go | 31 +++++++++++++++++++++++++++++++ src/x/unsafe/runtime_1.22.go | 31 +++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 7 deletions(-) create mode 100644 src/x/unsafe/runtime.go create mode 100644 src/x/unsafe/runtime_1.22.go diff --git a/src/x/unsafe/rand.go b/src/x/unsafe/rand.go index 03da8bf2dc..5b8f4d8593 100644 --- a/src/x/unsafe/rand.go +++ b/src/x/unsafe/rand.go @@ -21,13 +21,6 @@ // Package unsafe contains operations that step around the type safety of Go programs. package unsafe -import ( - _ "unsafe" // needed for go:linkname hack -) - -//go:linkname fastrand runtime.fastrand -func fastrand() uint32 - // Fastrandn returns a uint32 in range of 0..n, like rand() % n, but faster not as precise, // https://lemire.me/blog/2016/06/27/a-fast-alternative-to-the-modulo-reduction/ func Fastrandn(n uint32) uint32 { diff --git a/src/x/unsafe/runtime.go b/src/x/unsafe/runtime.go new file mode 100644 index 0000000000..5cd1789cd7 --- /dev/null +++ b/src/x/unsafe/runtime.go @@ -0,0 +1,31 @@ +//go:build !go1.22 + +// Copyright (c) 2020 Uber Technologies, Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +// Package unsafe contains operations that step around the type safety of Go programs. +package unsafe + +import ( + _ "unsafe" // needed for go:linkname hack +) + +//go:linkname fastrand runtime.fastrand +func fastrand() uint32 diff --git a/src/x/unsafe/runtime_1.22.go b/src/x/unsafe/runtime_1.22.go new file mode 100644 index 0000000000..5b8e9deb73 --- /dev/null +++ b/src/x/unsafe/runtime_1.22.go @@ -0,0 +1,31 @@ +//go:build go1.22 + +// Copyright (c) 2020 Uber Technologies, Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +// Package unsafe contains operations that step around the type safety of Go programs. +package unsafe + +import ( + _ "unsafe" // needed for go:linkname hack +) + +//go:linkname fastrand runtime.cheaprand +func fastrand() uint32