]> Cypherpunks repositories - gostls13.git/commitdiff
runtime: use entersyscall in syscall_syscallX on Darwin
authorCherry Zhang <cherryyz@google.com>
Mon, 25 Jan 2021 22:13:51 +0000 (17:13 -0500)
committerCherry Zhang <cherryyz@google.com>
Mon, 1 Mar 2021 22:49:36 +0000 (22:49 +0000)
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 <cherryyz@google.com>
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
src/runtime/sys_darwin.go

index dacce2ee1abb5149c21f4b4239b41f81c851659f..4ae259ac6350dc25ce64230f76a0abb0846e8832 100644 (file)
@@ -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