Update

vendor/gvisor.dev/gvisor/pkg/bits/bits32.go

@@ -1,33 +0,0 @@
-package bits
-
-// IsOn returns true if *all* bits set in 'bits' are set in 'mask'.
-func IsOn32(mask, bits uint32) bool {
-	return mask&bits == bits
-}
-
-// IsAnyOn returns true if *any* bit set in 'bits' is set in 'mask'.
-func IsAnyOn32(mask, bits uint32) bool {
-	return mask&bits != 0
-}
-
-// Mask returns a T with all of the given bits set.
-func Mask32(is ...int) uint32 {
-	ret := uint32(0)
-	for _, i := range is {
-		ret |= MaskOf32(i)
-	}
-	return ret
-}
-
-// MaskOf is like Mask, but sets only a single bit (more efficiently).
-func MaskOf32(i int) uint32 {
-	return uint32(1) << uint32(i)
-}
-
-// IsPowerOfTwo returns true if v is power of 2.
-func IsPowerOfTwo32(v uint32) bool {
-	if v == 0 {
-		return false
-	}
-	return v&(v-1) == 0
-}

vendor/gvisor.dev/gvisor/pkg/bits/bits64.go

@@ -1,33 +0,0 @@
-package bits
-
-// IsOn returns true if *all* bits set in 'bits' are set in 'mask'.
-func IsOn64(mask, bits uint64) bool {
-	return mask&bits == bits
-}
-
-// IsAnyOn returns true if *any* bit set in 'bits' is set in 'mask'.
-func IsAnyOn64(mask, bits uint64) bool {
-	return mask&bits != 0
-}
-
-// Mask returns a T with all of the given bits set.
-func Mask64(is ...int) uint64 {
-	ret := uint64(0)
-	for _, i := range is {
-		ret |= MaskOf64(i)
-	}
-	return ret
-}
-
-// MaskOf is like Mask, but sets only a single bit (more efficiently).
-func MaskOf64(i int) uint64 {
-	return uint64(1) << uint64(i)
-}
-
-// IsPowerOfTwo returns true if v is power of 2.
-func IsPowerOfTwo64(v uint64) bool {
-	if v == 0 {
-		return false
-	}
-	return v&(v-1) == 0
-}

vendor/gvisor.dev/gvisor/pkg/bits/bits_template.go

@@ -0,0 +1,51 @@
+// Copyright 2018 The gVisor Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package bits
+
+import "golang.org/x/exp/constraints"
+
+// Non-atomic bit operations on integral types.
+
+// IsOn returns true if *all* bits set in 'bits' are set in 'mask'.
+func IsOn[T constraints.Integer](mask, bits T) bool {
+	return mask&bits == bits
+}
+
+// IsAnyOn returns true if *any* bit set in 'bits' is set in 'mask'.
+func IsAnyOn[T constraints.Integer](mask, bits T) bool {
+	return mask&bits != 0
+}
+
+// Mask returns a T with all of the given bits set.
+func Mask[T constraints.Integer](is ...int) T {
+	ret := T(0)
+	for _, i := range is {
+		ret |= MaskOf[T](i)
+	}
+	return ret
+}
+
+// MaskOf is like Mask, but sets only a single bit (more efficiently).
+func MaskOf[T constraints.Integer](i int) T {
+	return T(1) << T(i)
+}
+
+// IsPowerOfTwo returns true if v is power of 2.
+func IsPowerOfTwo[T constraints.Integer](v T) bool {
+	if v == 0 {
+		return false
+	}
+	return v&(v-1) == 0
+}

vendor/gvisor.dev/gvisor/pkg/bits/uint64_arch.go

@@ -32,6 +32,6 @@ func ForEachSetBit64(x uint64, f func(i int)) {
 	for x != 0 {
 		i := TrailingZeros64(x)
 		f(i)
-		x &^= MaskOf64(i)
+		x &^= MaskOf[uint64](i)
 	}
 }