diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2015-11-23 21:17:45 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2015-11-23 21:17:45 +0000 |
| commit | 8c61286797664f445db424050ea4c73cf265b242 (patch) | |
| tree | d37869769756562cc2596cd4783de2c387baf6b9 | |
| parent | cbd03aee24f57b42a82a119e4182b442ef3b8db3 (diff) | |
| download | gcc-8c61286797664f445db424050ea4c73cf265b242.zip gcc-8c61286797664f445db424050ea4c73cf265b242.tar.gz gcc-8c61286797664f445db424050ea4c73cf265b242.tar.bz2 | |
re PR go/68496 ([libgo] reflect test fails on Linux x86-64)
PR go/68496
reflect: Allocate space for FFI functions returning a zero-sized type.
The libffi library does not understand zero-sized types. We represent
them as a struct with a single field of type void. If such a type is
returned from a function, libffi will copy 1 byte of data. Allocate
space for that byte, although we won't use it.
Fixes https://gcc.gnu.org/PR68496.
Reviewed-on: https://go-review.googlesource.com/17175
From-SVN: r230776
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/runtime/go-reflect-call.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 9ee3535..9fe9d5e 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -97ec885c715b3922b0866c081554899b8d50933a +0d979f0b860cfd879754150e0ae5e1018b94d7c4 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/runtime/go-reflect-call.c b/libgo/runtime/go-reflect-call.c index 29e814a..2a14d6c 100644 --- a/libgo/runtime/go-reflect-call.c +++ b/libgo/runtime/go-reflect-call.c @@ -81,6 +81,12 @@ go_results_size (const struct __go_func_type *func) off = (off + maxalign - 1) & ~ (maxalign - 1); + // The libffi library doesn't understand a struct with no fields. + // We generate a struct with a single field of type void. When used + // as a return value, libffi will think that requires a byte. + if (off == 0) + off = 1; + return off; } |