From 731a015ab8c8f44c7196123fd65b184a63d6835a Mon Sep 17 00:00:00 2001 From: Cherry Zhang Date: Mon, 3 May 2021 18:17:38 -0400 Subject: [PATCH] internal/syscall/unix: use internal/abi.FuncPC for syscall wrapper Following CL 313230, this is for internal/syscall/unix package. Updates #45702. Change-Id: Ie6d8c1923dfeae56896212393c5c2a6e257648d2 Reviewed-on: https://go-review.googlesource.com/c/go/+/316649 Trust: Cherry Zhang Run-TryBot: Cherry Zhang Reviewed-by: Than McIntosh TryBot-Result: Go Bot --- src/internal/syscall/unix/getentropy_darwin.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/internal/syscall/unix/getentropy_darwin.go b/src/internal/syscall/unix/getentropy_darwin.go index 6da6f84d95..e1a410a454 100644 --- a/src/internal/syscall/unix/getentropy_darwin.go +++ b/src/internal/syscall/unix/getentropy_darwin.go @@ -5,6 +5,7 @@ package unix import ( + "internal/abi" "syscall" "unsafe" ) @@ -15,7 +16,7 @@ func libc_getentropy_trampoline() // GetEntropy calls the macOS getentropy system call. func GetEntropy(p []byte) error { - _, _, errno := syscall_syscall(funcPC(libc_getentropy_trampoline), + _, _, errno := syscall_syscall(abi.FuncPCABI0(libc_getentropy_trampoline), uintptr(unsafe.Pointer(&p[0])), uintptr(len(p)), 0) @@ -27,6 +28,3 @@ func GetEntropy(p []byte) error { //go:linkname syscall_syscall syscall.syscall func syscall_syscall(fn, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno) - -//go:linkname funcPC runtime.funcPC -func funcPC(f interface{}) uintptr -- 2.48.1