all: make use of builtin clear

Change-Id: I1df0685c75fc1044ba46003a69ecc7dfc53bbc2b
Reviewed-on: https://go-review.googlesource.com/c/go/+/574675
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Than McIntosh <thanm@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>

diff --git a/src/archive/zip/reader_test.go b/src/archive/zip/reader_test.go
index 631515cf5d2d7c06c38c19581b82e8fffcab5b08..9f651da53070a66876a963c84d60439cceeadcac 100644 (file)
--- a/src/archive/zip/reader_test.go
+++ b/src/archive/zip/reader_test.go
@@ -904,9 +904,7 @@ func returnRecursiveZip() (r io.ReaderAt, size int64) {
 //     type zeros struct{}
 //
 //     func (zeros) Read(b []byte) (int, error) {
-//             for i := range b {
-//                     b[i] = 0
-//             }
+//             clear(b)
 //             return len(b), nil
 //     }
 //

diff --git a/src/archive/zip/zip_test.go b/src/archive/zip/zip_test.go
index e7661284e7371aca857d55aa776321fa02c4fb4e..5425f220336367890e2d4e54677fc9732cd845f4 100644 (file)
--- a/src/archive/zip/zip_test.go
+++ b/src/archive/zip/zip_test.go
@@ -814,8 +814,6 @@ func TestSuffixSaver(t *testing.T) {
 type zeros struct{}
 
 func (zeros) Read(p []byte) (int, error) {
-       for i := range p {
-               p[i] = 0
-       }
+       clear(p)
        return len(p), nil
 }

diff --git a/src/crypto/aes/aes_gcm.go b/src/crypto/aes/aes_gcm.go
index d1e3fade71cc53d7609b9089b52dd4d0bf94ebe6..d9a9545f120f7604863432e3d23c9298d9197635 100644 (file)
--- a/src/crypto/aes/aes_gcm.go
+++ b/src/crypto/aes/aes_gcm.go
@@ -176,9 +176,7 @@ func (g *gcmAsm) Open(dst, nonce, ciphertext, data []byte) ([]byte, error) {
        gcmAesFinish(&g.productTable, &tagMask, &expectedTag, uint64(len(ciphertext)), uint64(len(data)))
 
        if subtle.ConstantTimeCompare(expectedTag[:g.tagSize], tag) != 1 {
-               for i := range out {
-                       out[i] = 0
-               }
+               clear(out)
                return nil, errOpen
        }
 

diff --git a/src/crypto/aes/gcm_ppc64x.go b/src/crypto/aes/gcm_ppc64x.go
index 20b0eade0a1fca4e1c40236d9841dc431d601d00..3e6e9ab4c38b630f42e11c65c5d748be28c0dc99 100644 (file)
--- a/src/crypto/aes/gcm_ppc64x.go
+++ b/src/crypto/aes/gcm_ppc64x.go
@@ -212,9 +212,7 @@ func (g *gcmAsm) Open(dst, nonce, ciphertext, data []byte) ([]byte, error) {
        ret, out := sliceForAppend(dst, len(ciphertext))
 
        if subtle.ConstantTimeCompare(expectedTag[:g.tagSize], tag) != 1 {
-               for i := range out {
-                       out[i] = 0
-               }
+               clear(out)
                return nil, errOpen
        }
 

diff --git a/src/crypto/aes/gcm_s390x.go b/src/crypto/aes/gcm_s390x.go
index 01504e1815a0314c5db353172e5b1273679aa89a..9da3e1a478838a3874f120b37dd32b0b365546cf 100644 (file)
--- a/src/crypto/aes/gcm_s390x.go
+++ b/src/crypto/aes/gcm_s390x.go
@@ -271,9 +271,7 @@ func (g *gcmAsm) Open(dst, nonce, ciphertext, data []byte) ([]byte, error) {
                // so overwrites dst in the event of a tag mismatch. That
                // behavior is mimicked here in order to be consistent across
                // platforms.
-               for i := range out {
-                       out[i] = 0
-               }
+               clear(out)
                return nil, errOpen
        }
 
@@ -363,9 +361,7 @@ func (g *gcmKMA) Open(dst, nonce, ciphertext, data []byte) ([]byte, error) {
                // so overwrites dst in the event of a tag mismatch. That
                // behavior is mimicked here in order to be consistent across
                // platforms.
-               for i := range out {
-                       out[i] = 0
-               }
+               clear(out)
                return nil, errOpen
        }
 

diff --git a/src/crypto/cipher/gcm.go b/src/crypto/cipher/gcm.go
index 928771f05f979ac627639c8eaef667fa775e5a56..5b28b61f707af6963285203a0de7e74e2ab79cfc 100644 (file)
--- a/src/crypto/cipher/gcm.go
+++ b/src/crypto/cipher/gcm.go
@@ -234,9 +234,7 @@ func (g *gcm) Open(dst, nonce, ciphertext, data []byte) ([]byte, error) {
                // so overwrites dst in the event of a tag mismatch. That
                // behavior is mimicked here in order to be consistent across
                // platforms.
-               for i := range out {
-                       out[i] = 0
-               }
+               clear(out)
                return nil, errOpen
        }
 

diff --git a/src/crypto/ecdh/ecdh_test.go b/src/crypto/ecdh/ecdh_test.go
index 10da95afbb4ed9c348c957d30e9b62e966fd8bc2..49da4e81203325147f7ff0464fb5b4b8dd75f4b1 100644 (file)
--- a/src/crypto/ecdh/ecdh_test.go
+++ b/src/crypto/ecdh/ecdh_test.go
@@ -412,9 +412,7 @@ type zr struct{}
 
 // Read replaces the contents of dst with zeros. It is safe for concurrent use.
 func (zr) Read(dst []byte) (n int, err error) {
-       for i := range dst {
-               dst[i] = 0
-       }
+       clear(dst)
        return len(dst), nil
 }
 

diff --git a/src/crypto/ecdsa/ecdsa.go b/src/crypto/ecdsa/ecdsa.go
index 3ed15a888a7540e9a1427a44293fba54a0332efb..f0b682251039359e85593b10b5c8821e7417abf8 100644 (file)
--- a/src/crypto/ecdsa/ecdsa.go
+++ b/src/crypto/ecdsa/ecdsa.go
@@ -457,9 +457,7 @@ var zeroReader = zr{}
 
 // Read replaces the contents of dst with zeros. It is safe for concurrent use.
 func (zr) Read(dst []byte) (n int, err error) {
-       for i := range dst {
-               dst[i] = 0
-       }
+       clear(dst)
        return len(dst), nil
 }
 

diff --git a/src/crypto/ed25519/ed25519_test.go b/src/crypto/ed25519/ed25519_test.go
index 47c8698e2a5945b91cf3b83ec84ab324a7cbf8d4..64901328a5e8c5e5f85a96e1cae90712a13fea00 100644 (file)
--- a/src/crypto/ed25519/ed25519_test.go
+++ b/src/crypto/ed25519/ed25519_test.go
@@ -45,9 +45,7 @@ func Example_ed25519ctx() {
 type zeroReader struct{}
 
 func (zeroReader) Read(buf []byte) (int, error) {
-       for i := range buf {
-               buf[i] = 0
-       }
+       clear(buf)
        return len(buf), nil
 }
 

diff --git a/src/crypto/internal/bigmod/nat.go b/src/crypto/internal/bigmod/nat.go
index 8918fe4c8a945ee0c157e428c5ee8324fb8a4ad7..a16a24305d8e1355bd70f12aacfdbfea9a5cc512 100644 (file)
--- a/src/crypto/internal/bigmod/nat.go
+++ b/src/crypto/internal/bigmod/nat.go
@@ -76,9 +76,7 @@ func (x *Nat) expand(n int) *Nat {
                return x
        }
        extraLimbs := x.limbs[len(x.limbs):n]
-       for i := range extraLimbs {
-               extraLimbs[i] = 0
-       }
+       clear(extraLimbs)
        x.limbs = x.limbs[:n]
        return x
 }
@@ -89,9 +87,7 @@ func (x *Nat) reset(n int) *Nat {
                x.limbs = make([]uint, n)
                return x
        }
-       for i := range x.limbs {
-               x.limbs[i] = 0
-       }
+       clear(x.limbs)
        x.limbs = x.limbs[:n]
        return x
 }

diff --git a/src/crypto/tls/example_test.go b/src/crypto/tls/example_test.go
index 6389fd7fedc2d5c4a55206315f6301f124f3a30a..95e4953fb2e0c3870da41dde30ce376bf2ec593e 100644 (file)
--- a/src/crypto/tls/example_test.go
+++ b/src/crypto/tls/example_test.go
@@ -18,10 +18,7 @@ import (
 type zeroSource struct{}
 
 func (zeroSource) Read(b []byte) (n int, err error) {
-       for i := range b {
-               b[i] = 0
-       }
-
+       clear(b)
        return len(b), nil
 }
 

diff --git a/src/crypto/tls/handshake_test.go b/src/crypto/tls/handshake_test.go
index bacc8b7d4fed57805ff3eb920abab998f62c113e..ddcf9779fd358a9e3906524c3a4f182a3a463b44 100644 (file)
--- a/src/crypto/tls/handshake_test.go
+++ b/src/crypto/tls/handshake_test.go
@@ -310,10 +310,7 @@ Dialing:
 type zeroSource struct{}
 
 func (zeroSource) Read(b []byte) (n int, err error) {
-       for i := range b {
-               b[i] = 0
-       }
-
+       clear(b)
        return len(b), nil
 }
 

diff --git a/src/hash/maphash/smhasher_test.go b/src/hash/maphash/smhasher_test.go
index 28cdae0444d986b7203002f51de654de836f4a00..7fa30aa12fa40435fca1601df8c04c26f8b1287d 100644 (file)
--- a/src/hash/maphash/smhasher_test.go
+++ b/src/hash/maphash/smhasher_test.go
@@ -318,9 +318,7 @@ type bytesKey struct {
 }
 
 func (k *bytesKey) clear() {
-       for i := range k.b {
-               k.b[i] = 0
-       }
+       clear(k.b)
 }
 func (k *bytesKey) random(r *rand.Rand) {
        randBytes(r, k.b)

diff --git a/src/internal/fuzz/coverage.go b/src/internal/fuzz/coverage.go
index 0c5e17e3bb248476ccd63d9eda5ca1f8b009f40a..e214a7bf3e184695d2888d435441596af86c5b68 100644 (file)
--- a/src/internal/fuzz/coverage.go
+++ b/src/internal/fuzz/coverage.go
@@ -13,9 +13,7 @@ import (
 // source code to 0.
 func ResetCoverage() {
        cov := coverage()
-       for i := range cov {
-               cov[i] = 0
-       }
+       clear(cov)
 }
 
 // SnapshotCoverage copies the current counter values into coverageSnapshot,

diff --git a/src/internal/poll/writev.go b/src/internal/poll/writev.go
index 75c8b642b550fcab983b6ed229ba0171ec010f97..fb15c2730983094fa571c8724654ecd779a5dbfa 100644 (file)
--- a/src/internal/poll/writev.go
+++ b/src/internal/poll/writev.go
@@ -69,9 +69,7 @@ func (fd *FD) Writev(v *[][]byte) (int64, error) {
                TestHookDidWritev(int(wrote))
                n += int64(wrote)
                consume(v, int64(wrote))
-               for i := range iovecs {
-                       iovecs[i] = syscall.Iovec{}
-               }
+               clear(iovecs)
                if err != nil {
                        if err == syscall.EINTR {
                                continue

diff --git a/src/runtime/debug/garbage.go b/src/runtime/debug/garbage.go
index cb3248d64d4ab2875f65edfdfe97bb072dcc3d4f..4f11c58733b7922eb107d0f021c7a6f6a3cf3dde 100644 (file)
--- a/src/runtime/debug/garbage.go
+++ b/src/runtime/debug/garbage.go
@@ -63,9 +63,7 @@ func ReadGCStats(stats *GCStats) {
 
        if len(stats.PauseQuantiles) > 0 {
                if n == 0 {
-                       for i := range stats.PauseQuantiles {
-                               stats.PauseQuantiles[i] = 0
-                       }
+                       clear(stats.PauseQuantiles)
                } else {
                        // There's room for a second copy of the data in stats.Pause.
                        // See the allocation at the top of the function.

diff --git a/src/runtime/mbitmap_allocheaders.go b/src/runtime/mbitmap_allocheaders.go
index 1ec055352e788b2974fc48c35b0e7506644956f3..5f1f978189d3c8f79c8c6d2125a4d8c7e6c707e0 100644 (file)
--- a/src/runtime/mbitmap_allocheaders.go
+++ b/src/runtime/mbitmap_allocheaders.go
@@ -544,9 +544,7 @@ func bulkBarrierPreWriteSrcOnly(dst, src, size uintptr, typ *abi.Type) {
 func (s *mspan) initHeapBits(forceClear bool) {
        if (!s.spanclass.noscan() && heapBitsInSpan(s.elemsize)) || s.isUserArenaChunk {
                b := s.heapBits()
-               for i := range b {
-                       b[i] = 0
-               }
+               clear(b)
        }
 }
 

diff --git a/src/runtime/memmove_test.go b/src/runtime/memmove_test.go
index 587e03d38515a42d45f51357ad9380e1297e0821..0a97e39d3e2c81e9249067ae65c22fdd94decf52 100644 (file)
--- a/src/runtime/memmove_test.go
+++ b/src/runtime/memmove_test.go
@@ -240,9 +240,7 @@ func TestMemmoveAtomicity(t *testing.T) {
                                for i := range src {
                                        src[i] = &x
                                }
-                               for i := range dst {
-                                       dst[i] = nil
-                               }
+                               clear(dst)
 
                                var ready atomic.Uint32
                                go func() {

diff --git a/src/runtime/netpoll_wasip1.go b/src/runtime/netpoll_wasip1.go
index 9903726809f8909dd75612d8d450aed0f44b3064..e6b299a20fa8d4aabcd92b5da92b05534c6c284a 100644 (file)
--- a/src/runtime/netpoll_wasip1.go
+++ b/src/runtime/netpoll_wasip1.go
@@ -205,9 +205,7 @@ func netpoll(delay int64) (gList, int32) {
        }
 
        evts = evts[:len(pollsubs)]
-       for i := range evts {
-               evts[i] = event{}
-       }
+       clear(evts)
 
 retry:
        var nevents size

diff --git a/src/runtime/write_err_android.go b/src/runtime/write_err_android.go
index dd950774cb182718d1c12f322fac84d28de03a67..34de106b50924a7a3ef4710277c4af4c326592be 100644 (file)
--- a/src/runtime/write_err_android.go
+++ b/src/runtime/write_err_android.go
@@ -80,9 +80,7 @@ func writeErr(b []byte) {
                if v == '\n' || writePos == len(dst)-1 {
                        dst[writePos] = 0
                        write(writeFD, unsafe.Pointer(&writeBuf[0]), int32(hlen+writePos))
-                       for i := range dst {
-                               dst[i] = 0
-                       }
+                       clear(dst)
                        writePos = 0
                }
        }