From: Keith Randall <khr@golang.org>
Date: Tue, 15 Apr 2025 16:19:36 +0000 (-0700)
Subject: runtime: don't use cgo_unsafe_args for syscall9 wrapper
X-Git-Tag: go1.25rc1~462
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=786e62bcd3f03d73ddf0c999780ffe6f1a0319ea;p=gostls13.git

runtime: don't use cgo_unsafe_args for syscall9 wrapper

It uses less stack space this way.

Similar to CL 386719
Update #71302

Change-Id: I585bde5f681a90a6900cbd326994ab8a122fd148
Reviewed-on: https://go-review.googlesource.com/c/go/+/665695
Reviewed-by: Keith Randall <khr@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
---

diff --git a/src/runtime/sys_darwin.go b/src/runtime/sys_darwin.go
index 5c769a71ea..ad423afc60 100644
--- a/src/runtime/sys_darwin.go
+++ b/src/runtime/sys_darwin.go
@@ -70,12 +70,12 @@ func syscall6()
 //
 //go:linkname syscall_syscall9 syscall.syscall9
 //go:nosplit
-//go:cgo_unsafe_args
 func syscall_syscall9(fn, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2, err uintptr) {
+	args := struct{ fn, a1, a2, a3, a4, a5, a6, a7, a8, a9, r1, r2, err uintptr }{fn, a1, a2, a3, a4, a5, a6, a7, a8, a9, r1, r2, err}
 	entersyscall()
-	libcCall(unsafe.Pointer(abi.FuncPCABI0(syscall9)), unsafe.Pointer(&fn))
+	libcCall(unsafe.Pointer(abi.FuncPCABI0(syscall9)), unsafe.Pointer(&args))
 	exitsyscall()
-	return
+	return args.r1, args.r2, args.err
 }
 func syscall9()