From 700b73975e9a925584773e6df85b175371cf9d95 Mon Sep 17 00:00:00 2001 From: Cherry Zhang Date: Mon, 25 Jan 2021 17:13:51 -0500 Subject: [PATCH] runtime: use entersyscall in syscall_syscallX on Darwin CL 197938 changed syscall* functions to call entersyscall, instead of entersyscallblock. It missed syscall_syscallX, probably because it was in sys_darwin_64.go, not sys_darwin.go like others. Change that one as well. Found during the review of CL 270380 (thanks Joel). Change-Id: I0884fc766703f555a3895be332dccfa7d2431374 Reviewed-on: https://go-review.googlesource.com/c/go/+/286435 Trust: Cherry Zhang Run-TryBot: Cherry Zhang TryBot-Result: Go Bot Reviewed-by: Ian Lance Taylor --- src/runtime/sys_darwin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/runtime/sys_darwin.go b/src/runtime/sys_darwin.go index dacce2ee1a..4ae259ac63 100644 --- a/src/runtime/sys_darwin.go +++ b/src/runtime/sys_darwin.go @@ -27,7 +27,7 @@ func syscall() //go:nosplit //go:cgo_unsafe_args func syscall_syscallX(fn, a1, a2, a3 uintptr) (r1, r2, err uintptr) { - entersyscallblock() + entersyscall() libcCall(unsafe.Pointer(funcPC(syscallX)), unsafe.Pointer(&fn)) exitsyscall() return -- 2.48.1