diff options
| author | Mauri de Souza Meneguzzo <mauri870@gmail.com> | 2024-02-25 21:21:31 +0000 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2024-03-17 15:57:54 +0000 |
| commit | 0a6f05e30f58023bf45f747a79c20751db2bcfe7 (patch) | |
| tree | fb5baa857a2e30d24e456500bd6832730fea7ae3 /src/syscall/syscall_unix.go | |
| parent | 68d3a9e417344c11426f158c7a6f3197a0890ff1 (diff) | |
| download | go-0a6f05e30f58023bf45f747a79c20751db2bcfe7.tar.xz | |
syscall: use internal/asan and internal/msan
Now with internal/asan and internal/msan available we can cleanup
syscall's duplicated definitions.
For #64611
Change-Id: If714d04ed2d32a4ed27305b3e3dc64ba8cdd1b61
GitHub-Last-Rev: e52fff1513bf74305d7abd142f71a60215bb93fc
GitHub-Pull-Request: golang/go#65935
Reviewed-on: https://go-review.googlesource.com/c/go/+/566755
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: qiulaidongfeng <2645477756@qq.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Diffstat (limited to 'src/syscall/syscall_unix.go')
| -rw-r--r-- | src/syscall/syscall_unix.go | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/src/syscall/syscall_unix.go b/src/syscall/syscall_unix.go index 0d3fe31e7a..79aac51c8f 100644 --- a/src/syscall/syscall_unix.go +++ b/src/syscall/syscall_unix.go @@ -8,8 +8,10 @@ package syscall import ( errorspkg "errors" + "internal/asan" "internal/bytealg" "internal/itoa" + "internal/msan" "internal/oserror" "internal/race" "runtime" @@ -187,11 +189,11 @@ func Read(fd int, p []byte) (n int, err error) { race.Acquire(unsafe.Pointer(&ioSync)) } } - if msanenabled && n > 0 { - msanWrite(unsafe.Pointer(&p[0]), n) + if msan.Enabled && n > 0 { + msan.Write(unsafe.Pointer(&p[0]), uintptr(n)) } - if asanenabled && n > 0 { - asanWrite(unsafe.Pointer(&p[0]), n) + if asan.Enabled && n > 0 { + asan.Write(unsafe.Pointer(&p[0]), n) } return } @@ -211,11 +213,11 @@ func Write(fd int, p []byte) (n int, err error) { if race.Enabled && n > 0 { race.ReadRange(unsafe.Pointer(&p[0]), n) } - if msanenabled && n > 0 { - msanRead(unsafe.Pointer(&p[0]), n) + if msan.Enabled && n > 0 { + msan.Read(unsafe.Pointer(&p[0]), uintptr(n)) } - if asanenabled && n > 0 { - asanRead(unsafe.Pointer(&p[0]), n) + if asan.Enabled && n > 0 { + asan.Read(unsafe.Pointer(&p[0]), n) } return } @@ -230,11 +232,11 @@ func Pread(fd int, p []byte, offset int64) (n int, err error) { race.Acquire(unsafe.Pointer(&ioSync)) } } - if msanenabled && n > 0 { - msanWrite(unsafe.Pointer(&p[0]), n) + if msan.Enabled && n > 0 { + msan.Write(unsafe.Pointer(&p[0]), uintptr(n)) } - if asanenabled && n > 0 { - asanWrite(unsafe.Pointer(&p[0]), n) + if asan.Enabled && n > 0 { + asan.Write(unsafe.Pointer(&p[0]), n) } return } @@ -247,11 +249,11 @@ func Pwrite(fd int, p []byte, offset int64) (n int, err error) { if race.Enabled && n > 0 { race.ReadRange(unsafe.Pointer(&p[0]), n) } - if msanenabled && n > 0 { - msanRead(unsafe.Pointer(&p[0]), n) + if msan.Enabled && n > 0 { + msan.Read(unsafe.Pointer(&p[0]), uintptr(n)) } - if asanenabled && n > 0 { - asanRead(unsafe.Pointer(&p[0]), n) + if asan.Enabled && n > 0 { + asan.Read(unsafe.Pointer(&p[0]), n) } return } |