diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-10-08 14:21:30 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-10-08 14:21:30 +0000 |
| commit | 3cbb7cbb096134746588d08a469778b11ae6ac73 (patch) | |
| tree | eff67e0dc5d748e398ea1a7ffa36f6a3bbda072b /libgo/go/reflect/makefunc_ffi.go | |
| parent | a3368b8ea1bda5edd41900096b10514bcf7c6de7 (diff) | |
| download | gcc-3cbb7cbb096134746588d08a469778b11ae6ac73.zip gcc-3cbb7cbb096134746588d08a469778b11ae6ac73.tar.gz gcc-3cbb7cbb096134746588d08a469778b11ae6ac73.tar.bz2 | |
libgo: update to Go 1.11.1 release
Reviewed-on: https://go-review.googlesource.com/c/140277
From-SVN: r264932
Diffstat (limited to 'libgo/go/reflect/makefunc_ffi.go')
| -rw-r--r-- | libgo/go/reflect/makefunc_ffi.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libgo/go/reflect/makefunc_ffi.go b/libgo/go/reflect/makefunc_ffi.go index 2acf7bb..9d9cbde 100644 --- a/libgo/go/reflect/makefunc_ffi.go +++ b/libgo/go/reflect/makefunc_ffi.go @@ -33,7 +33,7 @@ func FFICallbackGo(results unsafe.Pointer, params unsafe.Pointer, impl *makeFunc ap := params for _, rt := range ftyp.in { p := unsafe_New(rt) - memmove(p, *(*unsafe.Pointer)(ap), rt.size) + typedmemmove(rt, p, *(*unsafe.Pointer)(ap)) v := Value{rt, p, flag(rt.Kind()) | flagIndir} in = append(in, v) ap = (unsafe.Pointer)(uintptr(ap) + ptrSize) @@ -59,7 +59,7 @@ func FFICallbackGo(results unsafe.Pointer, params unsafe.Pointer, impl *makeFunc if v.flag&flagIndir == 0 && (v.kind() == Ptr || v.kind() == UnsafePointer) { *(*unsafe.Pointer)(addr) = v.ptr } else { - memmove(addr, v.ptr, typ.size) + typedmemmove(typ, addr, v.ptr) } off += typ.size } |