Skip to content

Commit 0a6f05e

Browse files
mauri870gopherbot
authored andcommitted
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: e52fff1 GitHub-Pull-Request: #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>
1 parent 68d3a9e commit 0a6f05e

File tree

6 files changed

+28
-106
lines changed

6 files changed

+28
-106
lines changed

src/syscall/asan.go

-22
This file was deleted.

src/syscall/asan0.go

-19
This file was deleted.

src/syscall/msan.go

-22
This file was deleted.

src/syscall/msan0.go

-19
This file was deleted.

src/syscall/syscall_unix.go

+18-16
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ package syscall
88

99
import (
1010
errorspkg "errors"
11+
"internal/asan"
1112
"internal/bytealg"
1213
"internal/itoa"
14+
"internal/msan"
1315
"internal/oserror"
1416
"internal/race"
1517
"runtime"
@@ -187,11 +189,11 @@ func Read(fd int, p []byte) (n int, err error) {
187189
race.Acquire(unsafe.Pointer(&ioSync))
188190
}
189191
}
190-
if msanenabled && n > 0 {
191-
msanWrite(unsafe.Pointer(&p[0]), n)
192+
if msan.Enabled && n > 0 {
193+
msan.Write(unsafe.Pointer(&p[0]), uintptr(n))
192194
}
193-
if asanenabled && n > 0 {
194-
asanWrite(unsafe.Pointer(&p[0]), n)
195+
if asan.Enabled && n > 0 {
196+
asan.Write(unsafe.Pointer(&p[0]), n)
195197
}
196198
return
197199
}
@@ -211,11 +213,11 @@ func Write(fd int, p []byte) (n int, err error) {
211213
if race.Enabled && n > 0 {
212214
race.ReadRange(unsafe.Pointer(&p[0]), n)
213215
}
214-
if msanenabled && n > 0 {
215-
msanRead(unsafe.Pointer(&p[0]), n)
216+
if msan.Enabled && n > 0 {
217+
msan.Read(unsafe.Pointer(&p[0]), uintptr(n))
216218
}
217-
if asanenabled && n > 0 {
218-
asanRead(unsafe.Pointer(&p[0]), n)
219+
if asan.Enabled && n > 0 {
220+
asan.Read(unsafe.Pointer(&p[0]), n)
219221
}
220222
return
221223
}
@@ -230,11 +232,11 @@ func Pread(fd int, p []byte, offset int64) (n int, err error) {
230232
race.Acquire(unsafe.Pointer(&ioSync))
231233
}
232234
}
233-
if msanenabled && n > 0 {
234-
msanWrite(unsafe.Pointer(&p[0]), n)
235+
if msan.Enabled && n > 0 {
236+
msan.Write(unsafe.Pointer(&p[0]), uintptr(n))
235237
}
236-
if asanenabled && n > 0 {
237-
asanWrite(unsafe.Pointer(&p[0]), n)
238+
if asan.Enabled && n > 0 {
239+
asan.Write(unsafe.Pointer(&p[0]), n)
238240
}
239241
return
240242
}
@@ -247,11 +249,11 @@ func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
247249
if race.Enabled && n > 0 {
248250
race.ReadRange(unsafe.Pointer(&p[0]), n)
249251
}
250-
if msanenabled && n > 0 {
251-
msanRead(unsafe.Pointer(&p[0]), n)
252+
if msan.Enabled && n > 0 {
253+
msan.Read(unsafe.Pointer(&p[0]), uintptr(n))
252254
}
253-
if asanenabled && n > 0 {
254-
asanRead(unsafe.Pointer(&p[0]), n)
255+
if asan.Enabled && n > 0 {
256+
asan.Read(unsafe.Pointer(&p[0]), n)
255257
}
256258
return
257259
}

src/syscall/syscall_windows.go

+10-8
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ package syscall
88

99
import (
1010
errorspkg "errors"
11+
"internal/asan"
1112
"internal/bytealg"
1213
"internal/itoa"
14+
"internal/msan"
1315
"internal/oserror"
1416
"internal/race"
1517
"runtime"
@@ -446,11 +448,11 @@ func ReadFile(fd Handle, p []byte, done *uint32, overlapped *Overlapped) error {
446448
}
447449
race.Acquire(unsafe.Pointer(&ioSync))
448450
}
449-
if msanenabled && *done > 0 {
450-
msanWrite(unsafe.Pointer(&p[0]), int(*done))
451+
if msan.Enabled && *done > 0 {
452+
msan.Write(unsafe.Pointer(&p[0]), uintptr(*done))
451453
}
452-
if asanenabled && *done > 0 {
453-
asanWrite(unsafe.Pointer(&p[0]), int(*done))
454+
if asan.Enabled && *done > 0 {
455+
asan.Write(unsafe.Pointer(&p[0]), int(*done))
454456
}
455457
return err
456458
}
@@ -463,11 +465,11 @@ func WriteFile(fd Handle, p []byte, done *uint32, overlapped *Overlapped) error
463465
if race.Enabled && *done > 0 {
464466
race.ReadRange(unsafe.Pointer(&p[0]), int(*done))
465467
}
466-
if msanenabled && *done > 0 {
467-
msanRead(unsafe.Pointer(&p[0]), int(*done))
468+
if msan.Enabled && *done > 0 {
469+
msan.Read(unsafe.Pointer(&p[0]), uintptr(*done))
468470
}
469-
if asanenabled && *done > 0 {
470-
asanRead(unsafe.Pointer(&p[0]), int(*done))
471+
if asan.Enabled && *done > 0 {
472+
asan.Read(unsafe.Pointer(&p[0]), int(*done))
471473
}
472474
return err
473475
}

0 commit comments

Comments
 (0)