diff options
author | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-07-13 20:39:02 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-07-13 20:39:02 +0000 |
commit | 867b003fd74a1f77c9835a8c64e1dcf88f639aff (patch) | |
tree | 56301120971100639a4f923361812cb8d0b79362 /libgo | |
parent | 7264261f64fab95545cd1e5bae429fad5f2b44d7 (diff) | |
download | gcc-867b003fd74a1f77c9835a8c64e1dcf88f639aff.zip gcc-867b003fd74a1f77c9835a8c64e1dcf88f639aff.tar.gz gcc-867b003fd74a1f77c9835a8c64e1dcf88f639aff.tar.bz2 |
runtime: skip zero-sized fields in structs when converting to FFI
The libffi library doesn't understand zero-sized objects.
When we see a zero-sized field in a struct, just skip it when
converting to the FFI data structures. There is no value to pass in
any case, so not telling libffi about the field doesn't affect
anything.
The test case for this is https://golang.org/cl/123316.
Fixes golang/go#26335
Reviewed-on: https://go-review.googlesource.com/123335
From-SVN: r262651
Diffstat (limited to 'libgo')
-rw-r--r-- | libgo/go/runtime/ffi.go | 48 |
1 files changed, 45 insertions, 3 deletions
diff --git a/libgo/go/runtime/ffi.go b/libgo/go/runtime/ffi.go index 164e177..00858f1 100644 --- a/libgo/go/runtime/ffi.go +++ b/libgo/go/runtime/ffi.go @@ -225,11 +225,40 @@ func structToFFI(typ *structtype) *__ffi_type { return emptyStructToFFI() } - fields := make([]*__ffi_type, c+1) + fields := make([]*__ffi_type, 0, c+1) + checkPad := false for i, v := range typ.fields { - fields[i] = typeToFFI(v.typ) + // Skip zero-sized fields; they confuse libffi, + // and there is no value to pass in any case. + // We do have to check whether the alignment of the + // zero-sized field introduces any padding for the + // next field. + if v.typ.size == 0 { + checkPad = true + continue + } + + if checkPad { + off := uintptr(0) + for j := i - 1; j >= 0; j-- { + if typ.fields[j].typ.size > 0 { + off = typ.fields[j].offset() + typ.fields[j].typ.size + break + } + } + off += uintptr(v.typ.align) - 1 + off &^= uintptr(v.typ.align) - 1 + if off != v.offset() { + fields = append(fields, padFFI(v.offset()-off)) + } + checkPad = false + } + + fields = append(fields, typeToFFI(v.typ)) } - fields[c] = nil + + fields = append(fields, nil) + return &__ffi_type{ _type: _FFI_TYPE_STRUCT, elements: &fields[0], @@ -305,6 +334,19 @@ func emptyStructToFFI() *__ffi_type { } } +// padFFI returns a padding field of the given size +func padFFI(size uintptr) *__ffi_type { + elements := make([]*__ffi_type, size+1) + for i := uintptr(0); i < size; i++ { + elements[i] = ffi_type_uint8() + } + elements[size] = nil + return &__ffi_type{ + _type: _FFI_TYPE_STRUCT, + elements: &elements[0], + } +} + //go:linkname makeCIF reflect.makeCIF // makeCIF is used by the reflect package to allocate a CIF. |