diff options
| author | Michael Pratt <mpratt@google.com> | 2021-02-18 15:29:15 -0800 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-02-18 15:30:58 -0800 |
| commit | f80a857a4f5f57908c64a22f5de0e07df722227d (patch) | |
| tree | bd74f0ed6e6fa060d08f6276d88a38bbe9a1ebc8 /pkg/sync | |
| parent | ec20f4f38ef49efc8756595e6ec3fb3e578cc097 (diff) | |
Bump build constraints to Go 1.18
These are bumped to allow early testing of Go 1.17. Use will be audited closer
to the 1.17 release.
PiperOrigin-RevId: 358278615
Diffstat (limited to 'pkg/sync')
| -rw-r--r-- | pkg/sync/goyield_unsafe.go | 2 | ||||
| -rw-r--r-- | pkg/sync/mutex_unsafe.go | 2 | ||||
| -rw-r--r-- | pkg/sync/runtime_unsafe.go | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/pkg/sync/goyield_unsafe.go b/pkg/sync/goyield_unsafe.go index 672ee274d..f3cc12163 100644 --- a/pkg/sync/goyield_unsafe.go +++ b/pkg/sync/goyield_unsafe.go @@ -4,7 +4,7 @@ // license that can be found in the LICENSE file. // +build go1.14 -// +build !go1.17 +// +build !go1.18 // Check go:linkname function signatures when updating Go version. diff --git a/pkg/sync/mutex_unsafe.go b/pkg/sync/mutex_unsafe.go index 21084b857..4e49a9b89 100644 --- a/pkg/sync/mutex_unsafe.go +++ b/pkg/sync/mutex_unsafe.go @@ -4,7 +4,7 @@ // license that can be found in the LICENSE file. // +build go1.13 -// +build !go1.17 +// +build !go1.18 // When updating the build constraint (above), check that syncMutex matches the // standard library sync.Mutex definition. diff --git a/pkg/sync/runtime_unsafe.go b/pkg/sync/runtime_unsafe.go index e925e2e5b..119ff832a 100644 --- a/pkg/sync/runtime_unsafe.go +++ b/pkg/sync/runtime_unsafe.go @@ -4,9 +4,10 @@ // license that can be found in the LICENSE file. // +build go1.13 -// +build !go1.17 +// +build !go1.18 -// Check function signatures and constants when updating Go version. +// Check go:linkname function signatures, type definitions, and constants when +// updating Go version. package sync @@ -95,6 +96,7 @@ func MapKeyHasher(m interface{}) func(unsafe.Pointer, uintptr) uintptr { return mtyp.hasher } +// maptype is equivalent to the beginning of runtime.maptype. type maptype struct { size uintptr ptrdata uintptr |