diff options
author | Ian Lance Taylor <iant@golang.org> | 2016-07-11 16:15:03 -0700 |
---|---|---|
committer | Ian Lance Taylor <iant@golang.org> | 2016-07-12 16:39:00 +0000 |
commit | b30814bbd6840e1574a27c87c37515af22caa5d9 (patch) | |
tree | 0a1a21688d54caffc51fff1fd2924073e6e8a821 /src/runtime/signal_darwin.go | |
parent | 1f4e68d92b33a668f2afa2ab5f8114c1a4bee682 (diff) | |
download | go-b30814bbd6840e1574a27c87c37515af22caa5d9.tar.gz go-b30814bbd6840e1574a27c87c37515af22caa5d9.zip |
runtime: add ctxt parameter to cgocallback called from Go
The cgocallback function picked up a ctxt parameter in CL 22508.
That CL updated the assembler implementation, but there are a few
mentions in Go code that were not updated. This CL fixes that.
Fixes #16326
Change-Id: I5f68e23565c6a0b11057aff476d13990bff54a66
Reviewed-on: https://go-review.googlesource.com/24848
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Minux Ma <minux@golang.org>
Diffstat (limited to 'src/runtime/signal_darwin.go')
-rw-r--r-- | src/runtime/signal_darwin.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/runtime/signal_darwin.go b/src/runtime/signal_darwin.go index c8534ff09b..fb06de5509 100644 --- a/src/runtime/signal_darwin.go +++ b/src/runtime/signal_darwin.go @@ -70,12 +70,12 @@ func sigtrampgo(fn uintptr, infostyle, sig uint32, info *siginfo, ctx unsafe.Poi sigaltstack(nil, &st) if st.ss_flags&_SS_DISABLE != 0 { setg(nil) - cgocallback(unsafe.Pointer(funcPC(noSignalStack)), noescape(unsafe.Pointer(&sig)), unsafe.Sizeof(sig)) + cgocallback(unsafe.Pointer(funcPC(noSignalStack)), noescape(unsafe.Pointer(&sig)), unsafe.Sizeof(sig), 0) } stsp := uintptr(unsafe.Pointer(st.ss_sp)) if sp < stsp || sp >= stsp+st.ss_size { setg(nil) - cgocallback(unsafe.Pointer(funcPC(sigNotOnStack)), noescape(unsafe.Pointer(&sig)), unsafe.Sizeof(sig)) + cgocallback(unsafe.Pointer(funcPC(sigNotOnStack)), noescape(unsafe.Pointer(&sig)), unsafe.Sizeof(sig), 0) } g.m.gsignal.stack.lo = stsp g.m.gsignal.stack.hi = stsp + st.ss_size |