diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-04-08 18:36:25 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-04-08 18:36:25 +0000 |
| commit | 04862afe9f5c54a420823f95bb6ae152eec64b8b (patch) | |
| tree | 7b77ac8c94329f12ebde6ac6c869b0af05a92f85 /libgo/go/internal | |
| parent | 8108dfde82ad6ec43613107b2c156999e6a5cbe7 (diff) | |
libgo: update to Go 1.12.2
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/170706
From-SVN: r270214
Diffstat (limited to 'libgo/go/internal')
| -rw-r--r-- | libgo/go/internal/poll/fd_windows.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libgo/go/internal/poll/fd_windows.go b/libgo/go/internal/poll/fd_windows.go index 19d9a12dad8..f860b82c974 100644 --- a/libgo/go/internal/poll/fd_windows.go +++ b/libgo/go/internal/poll/fd_windows.go @@ -660,6 +660,10 @@ func (fd *FD) Write(buf []byte) (int, error) { return 0, err } defer fd.writeUnlock() + if fd.isFile || fd.isDir || fd.isConsole { + fd.l.Lock() + defer fd.l.Unlock() + } ntotal := 0 for len(buf) > 0 { @@ -670,8 +674,6 @@ func (fd *FD) Write(buf []byte) (int, error) { var n int var err error if fd.isFile || fd.isDir || fd.isConsole { - fd.l.Lock() - defer fd.l.Unlock() if fd.isConsole { n, err = fd.writeConsole(b) } else { |