From abcdc1fcbffbc684f42d23a0ab126815cc03b7e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sun, 12 Nov 2023 10:51:52 +0000 Subject: [PATCH] re-generate go_std_tables.go with Go master Two new packages linknamed with the runtime package, one new intrinsic function, and one that is being removed in Go 1.22 but we want to keep around as long as we support Go 1.21. Also note that, since math/rand/v2 simply does not exist until Go 1.22, we need to adjust appendListedPackages to not fail on older versions. --- go_std_tables.go | 7 +++++-- scripts/gen-go-std-tables.sh | 1 + shared.go | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/go_std_tables.go b/go_std_tables.go index 8556eff..d3c6e19 100644 --- a/go_std_tables.go +++ b/go_std_tables.go @@ -1,6 +1,6 @@ // Code generated by scripts/gen-go-std-tables.sh; DO NOT EDIT. -// Generated from Go version devel go1.21-3637132233 Sat Jun 3 01:13:08 2023 +0000. +// Generated from Go version devel go1.22-8da6405e0d Sat Nov 11 02:02:35 2023 +0000. package main @@ -31,8 +31,10 @@ var runtimeLinknamed = []string{ "internal/poll", "internal/reflectlite", "internal/syscall/unix", + "internal/syscall/windows", "maps", "math/rand", + "math/rand/v2", "net", "os", "os/signal", @@ -63,6 +65,7 @@ var compilerIntrinsicsPkgs = map[string]bool{ } var compilerIntrinsicsFuncs = map[string]bool{ + "runtime.mulUintptr": true, // Existed in Go 1.21; removed in Go 1.22. "math.Abs": true, "math/big.mulWW": true, "math/bits.Add": true, @@ -150,6 +153,7 @@ var compilerIntrinsicsFuncs = map[string]bool{ "runtime/internal/atomic.Xchgint32": true, "runtime/internal/atomic.Xchgint64": true, "runtime/internal/atomic.Xchguintptr": true, + "runtime/internal/math.Add64": true, "runtime/internal/math.Mul64": true, "runtime/internal/math.MulUintptr": true, "runtime/internal/sys.Bswap32": true, @@ -162,7 +166,6 @@ var compilerIntrinsicsFuncs = map[string]bool{ "runtime/internal/sys.TrailingZeros32": true, "runtime/internal/sys.TrailingZeros64": true, "runtime/internal/sys.TrailingZeros8": true, - "runtime.mulUintptr": true, "runtime.publicationBarrier": true, "sync/atomic.AddInt32": true, "sync/atomic.AddInt64": true, diff --git a/scripts/gen-go-std-tables.sh b/scripts/gen-go-std-tables.sh index 1c9fa46..6274524 100755 --- a/scripts/gen-go-std-tables.sh +++ b/scripts/gen-go-std-tables.sh @@ -49,6 +49,7 @@ done) } var compilerIntrinsicsFuncs = map[string]bool{ + "runtime.mulUintptr": true, // Existed in Go 1.21; removed in Go 1.22. $(while read path name; do echo "\"${path}.${name}\": true," done <<<"${compiler_intrinsics_table}") diff --git a/shared.go b/shared.go index 526e918..2ebc2df 100644 --- a/shared.go +++ b/shared.go @@ -267,7 +267,9 @@ func appendListedPackages(packages []string, mainBuild bool) error { // like crypto/internal/boring/fipstls with boringcrypto, // so any pkg.Error should be ignored when the build tag isn't set. } else if pkg.ImportPath == "maps" && semver.Compare(sharedCache.GoVersionSemver, "v1.21") < 0 { - // "maps" was added in Go 1.21, so Go 1.20 runs into a "not found" error. + // added in Go 1.21, so Go 1.20 runs into a "not found" error. + } else if pkg.ImportPath == "math/rand/v2" && semver.Compare(sharedCache.GoVersionSemver, "v1.22") < 0 { + // added in Go 1.22, so Go 1.21 runs into a "not found" error. } else { if pkgErrors.Len() > 0 { pkgErrors.WriteString("\n")