From: Damien Neil Date: Mon, 13 Feb 2023 22:35:34 +0000 (-0800) Subject: Revert "io: detect Writers that access io.Copy's buffer after returning" X-Git-Tag: go1.21rc1~1567 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b146d7626f869901f9dd841b9253e89a227c6465;p=gostls13.git Revert "io: detect Writers that access io.Copy's buffer after returning" This reverts CL 466865. Reason for revert: Causing trybot flakiness due to net/http race, roll back until net/http is fixed. For #58168 Change-Id: I3129deb996abe6466eccf933fe93cbbaf72ae217 Reviewed-on: https://go-review.googlesource.com/c/go/+/467895 TryBot-Result: Gopher Robot Auto-Submit: Damien Neil Reviewed-by: Bryan Mills Run-TryBot: Damien Neil --- diff --git a/src/io/io.go b/src/io/io.go index 946ea5b01c..630ab73b56 100644 --- a/src/io/io.go +++ b/src/io/io.go @@ -14,7 +14,6 @@ package io import ( "errors" - "internal/race" "sync" ) @@ -428,14 +427,6 @@ func copyBuffer(dst Writer, src Reader, buf []byte) (written int64, err error) { nr, er := src.Read(buf) if nr > 0 { nw, ew := dst.Write(buf[0:nr]) - if race.Enabled { - // Write over the buffer to help the race detector - // detect Write calls that access the buffer after returning. - // Use something other than zeros to make errors more obvious. - for i := range buf[:nr] { - buf[i] = 0xdd - } - } if nw < 0 || nr < nw { nw = 0 if ew == nil {