internal/asan: match runtime.asan{read,write} len parameter type

The len parameter runtime.asan{read,write} is of type uintptr. Match its
type in Read and Write.

For #64611

Change-Id: I0be278c38a357e600521ced87c0e23038a11e8a2
Reviewed-on: https://go-review.googlesource.com/c/go/+/572755
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>

diff --git a/src/internal/asan/asan.go b/src/internal/asan/asan.go
index 0a8148e5b90ed8358de000da6c485b72b2cef409..56814ebfb244e93a46dd7a253baa51330f33070a 100644 (file)
--- a/src/internal/asan/asan.go
+++ b/src/internal/asan/asan.go
@@ -13,7 +13,7 @@ import (
 const Enabled = true
 
 //go:linkname Read runtime.asanread
-func Read(addr unsafe.Pointer, len int)
+func Read(addr unsafe.Pointer, len uintptr)
 
 //go:linkname Write runtime.asanwrite
-func Write(addr unsafe.Pointer, len int)
+func Write(addr unsafe.Pointer, len uintptr)

diff --git a/src/internal/asan/noasan.go b/src/internal/asan/noasan.go
index e01b46a1044d5ed3f7f2d010f776260dbcd3753f..c510d351460e0e4e5dfc81a7016fcaaf5634e00b 100644 (file)
--- a/src/internal/asan/noasan.go
+++ b/src/internal/asan/noasan.go
@@ -12,8 +12,6 @@ import (
 
 const Enabled = false
 
-func Read(addr unsafe.Pointer, len int) {
-}
+func Read(addr unsafe.Pointer, len uintptr) {}
 
-func Write(addr unsafe.Pointer, len int) {
-}
+func Write(addr unsafe.Pointer, len uintptr) {}

diff --git a/src/syscall/syscall_unix.go b/src/syscall/syscall_unix.go
index 79aac51c8f9a6235d1148c94b99cec9ada9eb6bb..ecd5952975a73d9b34447b5b518f6da301d06ffe 100644 (file)
--- a/src/syscall/syscall_unix.go
+++ b/src/syscall/syscall_unix.go
@@ -193,7 +193,7 @@ func Read(fd int, p []byte) (n int, err error) {
                msan.Write(unsafe.Pointer(&p[0]), uintptr(n))
        }
        if asan.Enabled && n > 0 {
-               asan.Write(unsafe.Pointer(&p[0]), n)
+               asan.Write(unsafe.Pointer(&p[0]), uintptr(n))
        }
        return
 }
@@ -217,7 +217,7 @@ func Write(fd int, p []byte) (n int, err error) {
                msan.Read(unsafe.Pointer(&p[0]), uintptr(n))
        }
        if asan.Enabled && n > 0 {
-               asan.Read(unsafe.Pointer(&p[0]), n)
+               asan.Read(unsafe.Pointer(&p[0]), uintptr(n))
        }
        return
 }
@@ -236,7 +236,7 @@ func Pread(fd int, p []byte, offset int64) (n int, err error) {
                msan.Write(unsafe.Pointer(&p[0]), uintptr(n))
        }
        if asan.Enabled && n > 0 {
-               asan.Write(unsafe.Pointer(&p[0]), n)
+               asan.Write(unsafe.Pointer(&p[0]), uintptr(n))
        }
        return
 }
@@ -253,7 +253,7 @@ func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
                msan.Read(unsafe.Pointer(&p[0]), uintptr(n))
        }
        if asan.Enabled && n > 0 {
-               asan.Read(unsafe.Pointer(&p[0]), n)
+               asan.Read(unsafe.Pointer(&p[0]), uintptr(n))
        }
        return
 }

diff --git a/src/syscall/syscall_windows.go b/src/syscall/syscall_windows.go
index 032f814304368be7c102e1ef4b078d00331cba61..59ce2b020685ecc1d5a1d54e38f5477c10ba750b 100644 (file)
--- a/src/syscall/syscall_windows.go
+++ b/src/syscall/syscall_windows.go
@@ -452,7 +452,7 @@ func ReadFile(fd Handle, p []byte, done *uint32, overlapped *Overlapped) error {
                msan.Write(unsafe.Pointer(&p[0]), uintptr(*done))
        }
        if asan.Enabled && *done > 0 {
-               asan.Write(unsafe.Pointer(&p[0]), int(*done))
+               asan.Write(unsafe.Pointer(&p[0]), uintptr(*done))
        }
        return err
 }
@@ -469,7 +469,7 @@ func WriteFile(fd Handle, p []byte, done *uint32, overlapped *Overlapped) error
                msan.Read(unsafe.Pointer(&p[0]), uintptr(*done))
        }
        if asan.Enabled && *done > 0 {
-               asan.Read(unsafe.Pointer(&p[0]), int(*done))
+               asan.Read(unsafe.Pointer(&p[0]), uintptr(*done))
        }
        return err
 }