mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
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: e52fff1513
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>
This commit is contained in:
parent
68d3a9e417
commit
0a6f05e30f
6 changed files with 28 additions and 106 deletions
|
|
@ -8,8 +8,10 @@ package syscall
|
|||
|
||||
import (
|
||||
errorspkg "errors"
|
||||
"internal/asan"
|
||||
"internal/bytealg"
|
||||
"internal/itoa"
|
||||
"internal/msan"
|
||||
"internal/oserror"
|
||||
"internal/race"
|
||||
"runtime"
|
||||
|
|
@ -446,11 +448,11 @@ func ReadFile(fd Handle, p []byte, done *uint32, overlapped *Overlapped) error {
|
|||
}
|
||||
race.Acquire(unsafe.Pointer(&ioSync))
|
||||
}
|
||||
if msanenabled && *done > 0 {
|
||||
msanWrite(unsafe.Pointer(&p[0]), int(*done))
|
||||
if msan.Enabled && *done > 0 {
|
||||
msan.Write(unsafe.Pointer(&p[0]), uintptr(*done))
|
||||
}
|
||||
if asanenabled && *done > 0 {
|
||||
asanWrite(unsafe.Pointer(&p[0]), int(*done))
|
||||
if asan.Enabled && *done > 0 {
|
||||
asan.Write(unsafe.Pointer(&p[0]), int(*done))
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
|
@ -463,11 +465,11 @@ func WriteFile(fd Handle, p []byte, done *uint32, overlapped *Overlapped) error
|
|||
if race.Enabled && *done > 0 {
|
||||
race.ReadRange(unsafe.Pointer(&p[0]), int(*done))
|
||||
}
|
||||
if msanenabled && *done > 0 {
|
||||
msanRead(unsafe.Pointer(&p[0]), int(*done))
|
||||
if msan.Enabled && *done > 0 {
|
||||
msan.Read(unsafe.Pointer(&p[0]), uintptr(*done))
|
||||
}
|
||||
if asanenabled && *done > 0 {
|
||||
asanRead(unsafe.Pointer(&p[0]), int(*done))
|
||||
if asan.Enabled && *done > 0 {
|
||||
asan.Read(unsafe.Pointer(&p[0]), int(*done))
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue