diff options
| author | Russ Cox <rsc@golang.org> | 2015-06-07 22:14:04 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2015-06-15 17:39:53 +0000 |
| commit | 2c2770c3d4dea11ce96f63d8fcb40ca5dd230e33 (patch) | |
| tree | fdb5f7bd97e61e9da4cc40e8c32329e61f520b70 /src | |
| parent | a3b9797baa487224c5d5e1878057ec31e1f0df88 (diff) | |
| download | go-2c2770c3d4dea11ce96f63d8fcb40ca5dd230e33.tar.xz | |
cmd/cgo: make sure pointers passed to C escape to heap
Fixes #10303.
Change-Id: Ia68d3566ba3ebeea6e18e388446bd9b8c431e156
Reviewed-on: https://go-review.googlesource.com/10814
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/cgo/out.go | 14 | ||||
| -rw-r--r-- | src/runtime/cgo.go | 16 |
2 files changed, 29 insertions, 1 deletions
diff --git a/src/cmd/cgo/out.go b/src/cmd/cgo/out.go index 87f21ed822..d2a3624693 100644 --- a/src/cmd/cgo/out.go +++ b/src/cmd/cgo/out.go @@ -79,6 +79,13 @@ func (p *Package) writeDefs() { } fmt.Fprintf(fgo2, "func _Cgo_ptr(ptr unsafe.Pointer) unsafe.Pointer { return ptr }\n\n") + if !*gccgo { + fmt.Fprintf(fgo2, "//go:linkname _Cgo_always_false runtime.cgoAlwaysFalse\n") + fmt.Fprintf(fgo2, "var _Cgo_always_false bool\n") + fmt.Fprintf(fgo2, "//go:linkname _Cgo_use runtime.cgoUse\n") + fmt.Fprintf(fgo2, "func _Cgo_use(interface{})\n") + } + typedefNames := make([]string, 0, len(typedef)) for name := range typedef { typedefNames = append(typedefNames, name) @@ -428,7 +435,7 @@ func (p *Package) writeDefsFunc(fgo2 io.Writer, n *Name) { return } - // C wrapper calls into gcc, passing a pointer to the argument frame. + // Wrapper calls into gcc, passing a pointer to the argument frame. fmt.Fprintf(fgo2, "//go:cgo_import_static %s\n", cname) fmt.Fprintf(fgo2, "//go:linkname __cgofn_%s %s\n", cname, cname) fmt.Fprintf(fgo2, "var __cgofn_%s byte\n", cname) @@ -463,6 +470,11 @@ func (p *Package) writeDefsFunc(fgo2 io.Writer, n *Name) { if n.AddError { fmt.Fprintf(fgo2, "\tif errno != 0 { r2 = syscall.Errno(errno) }\n") } + fmt.Fprintf(fgo2, "\tif _Cgo_always_false {\n") + for i := range d.Type.Params.List { + fmt.Fprintf(fgo2, "\t\t_Cgo_use(p%d)\n", i) + } + fmt.Fprintf(fgo2, "\t}\n") fmt.Fprintf(fgo2, "\treturn\n") fmt.Fprintf(fgo2, "}\n") } diff --git a/src/runtime/cgo.go b/src/runtime/cgo.go index d8ae6ec94b..169a31d4c6 100644 --- a/src/runtime/cgo.go +++ b/src/runtime/cgo.go @@ -32,3 +32,19 @@ var iscgo bool // cgoHasExtraM is set on startup when an extra M is created for cgo. // The extra M must be created before any C/C++ code calls cgocallback. var cgoHasExtraM bool + +// cgoUse is called by cgo-generated code (using go:linkname to get at +// an unexported name). The calls serve two purposes: +// 1) they are opaque to escape analysis, so the argument is considered to +// escape to the heap. +// 2) they keep the argument alive until the call site; the call is emitted after +// the end of the (presumed) use of the argument by C. +// cgoUse should not actually be called (see cgoAlwaysFalse). +func cgoUse(interface{}) { throw("cgoUse should not be called") } + +// cgoAlwaysFalse is a boolean value that is always false. +// The cgo-generated code says if cgoAlwaysFalse { cgoUse(p) }. +// The compiler cannot see that cgoAlwaysFalse is always false, +// so it emits the test and keeps the call, giving the desired +// escape analysis result. The test is cheaper than the call. +var cgoAlwaysFalse bool |
