Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

runtime: clarify error when returning unpinned pointers #62606

Closed
wants to merge 3 commits into from
Closed

runtime: clarify error when returning unpinned pointers #62606

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cab3242
runtime: clarify fail for unpinned returns
rzhw Sep 13, 2023
d72ee02
further comment clarification
rzhw Sep 13, 2023
706facb
reword
rzhw Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/runtime/cgocall.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,13 +525,13 @@ func cgoCheckPointer(ptr any, arg any) {
}

const cgoCheckPointerFail = "cgo argument has Go pointer to unpinned Go pointer"
const cgoResultFail = "cgo result has Go pointer"
const cgoResultFail = "cgo result is unpinned Go pointer or points to unpinned Go pointer"

// cgoCheckArg is the real work of cgoCheckPointer. The argument p
// is either a pointer to the value (of type t), or the value itself,
// depending on indir. The top parameter is whether we are at the top
// level, where Go pointers are allowed. Go pointers to pinned objects are
// always allowed.
// allowed as long as they don't reference other unpinned pointers.
func cgoCheckArg(t *_type, p unsafe.Pointer, indir, top bool, msg string) {
if t.PtrBytes == 0 || p == nil {
// If the type has no pointers there is nothing to do.
Expand Down Expand Up @@ -718,8 +718,8 @@ func cgoInRange(p unsafe.Pointer, start, end uintptr) bool {
}

// cgoCheckResult is called to check the result parameter of an
// exported Go function. It panics if the result is or contains a Go
// pointer.
// exported Go function. It panics if the result is or contains any
// other pointer into unpinned Go memory.
func cgoCheckResult(val any) {
if !goexperiment.CgoCheck2 && debug.cgocheck == 0 {
return
Expand Down