diff options
author | Ian Lance Taylor <iant@golang.org> | 2016-05-19 16:27:23 -0700 |
---|---|---|
committer | Ian Lance Taylor <iant@golang.org> | 2016-05-25 23:22:24 +0000 |
commit | a5d1a72a40b59db0d2f3f5d3fbb2ed60aafb7fdf (patch) | |
tree | b6edf8790228d3dfe3381b2d1764b0c1e61b863d /src/runtime/cgocall.go | |
parent | 10c8b2374f413ef6225555893cad5d2a530f77d5 (diff) | |
download | go-a5d1a72a40b59db0d2f3f5d3fbb2ed60aafb7fdf.tar.gz go-a5d1a72a40b59db0d2f3f5d3fbb2ed60aafb7fdf.zip |
cmd/cgo, runtime, runtime/cgo: TSAN support for malloc
Acquire and release the TSAN synchronization point when calling malloc,
just as we do when calling any other C function. If we don't do this,
TSAN will report false positive errors about races calling malloc and
free.
We used to have a special code path for malloc and free, going through
the runtime functions cmalloc and cfree. The special code path for cfree
was no longer used even before this CL. This CL stops using the special
code path for malloc, because there is no place along that path where we
could conditionally insert the TSAN synchronization. This CL removes
the support for the special code path for both functions.
Instead, cgo now automatically generates the malloc function as though
it were referenced as C.malloc. We need to automatically generate it
even if C.malloc is not called, even if malloc and size_t are not
declared, to support cgo-provided functions like C.CString.
Change-Id: I829854ec0787a80f33fa0a8a0dc2ee1d617830e2
Reviewed-on: https://go-review.googlesource.com/23260
Reviewed-by: Dmitry Vyukov <dvyukov@google.com>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Austin Clements <austin@google.com>
Diffstat (limited to 'src/runtime/cgocall.go')
-rw-r--r-- | src/runtime/cgocall.go | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/runtime/cgocall.go b/src/runtime/cgocall.go index 1e0d4c7f19..0f8386b10f 100644 --- a/src/runtime/cgocall.go +++ b/src/runtime/cgocall.go @@ -145,25 +145,6 @@ func endcgo(mp *m) { unlockOSThread() // invalidates mp } -// Helper functions for cgo code. - -func cmalloc(n uintptr) unsafe.Pointer { - var args struct { - n uint64 - ret unsafe.Pointer - } - args.n = uint64(n) - cgocall(_cgo_malloc, unsafe.Pointer(&args)) - if args.ret == nil { - throw("C malloc failed") - } - return args.ret -} - -func cfree(p unsafe.Pointer) { - cgocall(_cgo_free, p) -} - // Call from C back to Go. //go:nosplit func cgocallbackg(ctxt uintptr) { |