From 0a6f05e30f58023bf45f747a79c20751db2bcfe7 Mon Sep 17 00:00:00 2001 From: Mauri de Souza Meneguzzo Date: Sun, 25 Feb 2024 21:21:31 +0000 Subject: 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 Auto-Submit: Ian Lance Taylor Reviewed-by: qiulaidongfeng <2645477756@qq.com> Reviewed-by: Ian Lance Taylor Reviewed-by: Cherry Mui --- src/syscall/syscall_windows.go | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/syscall/syscall_windows.go') diff --git a/src/syscall/syscall_windows.go b/src/syscall/syscall_windows.go index bfd0d50fa7..032f814304 100644 --- a/src/syscall/syscall_windows.go +++ b/src/syscall/syscall_windows.go @@ -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 } -- cgit v1.3-6-g1900