Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

syscall: use internal/asan and internal/msan

Browse source 
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:
Mauri de Souza Meneguzzo 2024-02-25 21:21:31 +00:00 • committed by Gopher Robot
parent 68d3a9e417
commit 0a6f05e30f
6 changed files with 28 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/syscall/asan.go
View file

@ -1,22 +0,0 @@
// Copyright 2021 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
//go:build asan
package syscall
import (
"runtime"
"unsafe"
)
const asanenabled = true
func asanRead(addr unsafe.Pointer, len int) {
runtime.ASanRead(addr, len)
}
func asanWrite(addr unsafe.Pointer, len int) {
runtime.ASanWrite(addr, len)
}

19
src/syscall/asan0.go
View file

@ -1,19 +0,0 @@
// Copyright 2021 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
//go:build !asan
package syscall
import (
"unsafe"
)
const asanenabled = false
func asanRead(addr unsafe.Pointer, len int) {
}
func asanWrite(addr unsafe.Pointer, len int) {
}

22
src/syscall/msan.go
View file

@ -1,22 +0,0 @@
// Copyright 2015 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
//go:build msan
package syscall
import (
"runtime"
"unsafe"
)
const msanenabled = true
func msanRead(addr unsafe.Pointer, len int) {
runtime.MSanRead(addr, len)
}
func msanWrite(addr unsafe.Pointer, len int) {
runtime.MSanWrite(addr, len)
}

19
src/syscall/msan0.go
View file

@ -1,19 +0,0 @@
// Copyright 2015 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
//go:build !msan
package syscall
import (
"unsafe"
)
const msanenabled = false
func msanRead(addr unsafe.Pointer, len int) {
}
func msanWrite(addr unsafe.Pointer, len int) {
}

34
src/syscall/syscall_unix.go
View file

@ -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
}

18
src/syscall/syscall_windows.go
View file

@ -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
}