diff options
| author | Ian Lance Taylor <iant@golang.org> | 2010-05-30 22:22:47 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2010-05-30 22:22:47 -0700 |
| commit | b51989bcee8aa7e0742bbcf15a2940aa04f9f244 (patch) | |
| tree | d9898f7570425a4ddf009de3ae2def4a60cf14db /src | |
| parent | bfa103a2fe1fe2872e6539527d1108a501c2f1af (diff) | |
| download | golang-b51989bcee8aa7e0742bbcf15a2940aa04f9f244.tar.gz | |
Correct _cgo_free when C ABI does not pass first arg on stack.
It turns out that _cgo_malloc is used, via cmalloc in
runtime/cgocall.c, which is called by code generated by out.go
for the ·_C_CString function. I can't find a call to
_cgo_free, but given _cgo_malloc we might as well keep
_cgo_free. This patch fixes it so that it should work on
amd64.
R=rsc
CC=golang-dev
http://codereview.appspot.com/1399041
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/cgo/out.go | 2 | ||||
| -rw-r--r-- | src/libcgo/util.c | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/cmd/cgo/out.go b/src/cmd/cgo/out.go index 2fae48fe4..e58923ab2 100644 --- a/src/cmd/cgo/out.go +++ b/src/cmd/cgo/out.go @@ -568,7 +568,7 @@ const cProlog = ` #pragma dynimport libcgo_thread_start libcgo_thread_start "%s/libcgo.so" #pragma dynimport libcgo_set_scheduler libcgo_set_scheduler "%s/libcgo.so" #pragma dynimport _cgo_malloc _cgo_malloc "%s/libcgo.so" -#pragma dynimport _cgo_free free "%s/libcgo.so" +#pragma dynimport _cgo_free _cgo_free "%s/libcgo.so" void ·_C_GoString(int8 *p, String s) diff --git a/src/libcgo/util.c b/src/libcgo/util.c index a814e018b..c296b493d 100644 --- a/src/libcgo/util.c +++ b/src/libcgo/util.c @@ -4,7 +4,7 @@ #include "libcgo.h" -/* Stub for calling malloc from the other world */ +/* Stub for calling malloc from Go */ void _cgo_malloc(void *p) { @@ -16,6 +16,17 @@ _cgo_malloc(void *p) a->ret = malloc(a->n); } +/* Stub for calling from Go */ +void +_cgo_free(void *p) +{ + struct a { + void *arg; + } *a = p; + + free(a->arg); +} + /* Stub for creating a new thread */ void libcgo_thread_start(ThreadStart *arg) |