diff options
| author | Martin Liska <mliska@suse.cz> | 2021-12-30 14:34:08 +0100 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2021-12-30 14:34:08 +0100 |
| commit | 3710ef43346d9c666fa8175812806d20ebd4e380 (patch) | |
| tree | a4921408674e35db5c07786bf949e9fc9bf8f096 /gcc/go | |
| parent | 50c93d3fa3f1394dbe992e287a934e2a523b787c (diff) | |
| parent | 73898bc006ee9bec1a5eed4bfdd4eb0b158b7838 (diff) | |
| download | gcc-3710ef43346d9c666fa8175812806d20ebd4e380.zip gcc-3710ef43346d9c666fa8175812806d20ebd4e380.tar.gz gcc-3710ef43346d9c666fa8175812806d20ebd4e380.tar.bz2 | |
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'gcc/go')
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | gcc/go/gofrontend/types.cc | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 05e47ec..2d04f4b 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -3e9f4ee16683883ccfb8661d99318c74bb7a4bef +d3be41f0a1fca20e241e1db62b4b0f5262caac55 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/gcc/go/gofrontend/types.cc b/gcc/go/gofrontend/types.cc index 0f66661..57c02a9 100644 --- a/gcc/go/gofrontend/types.cc +++ b/gcc/go/gofrontend/types.cc @@ -6454,9 +6454,18 @@ get_backend_struct_fields(Gogo* gogo, Struct_type* type, bool use_placeholder, ? p->type()->get_backend_placeholder(gogo) : p->type()->get_backend(gogo)); (*bfields)[i].location = p->location(); - lastsize = gogo->backend()->type_size((*bfields)[i].btype); - if (lastsize != 0) - saw_nonzero = true; + int64_t size = gogo->backend()->type_size((*bfields)[i].btype); + if (size != 0) + saw_nonzero = true; + + if (size > 0 || !Gogo::is_sink_name(p->field_name())) + lastsize = size; + else + { + // There is an unreferenceable field of zero size. This + // doesn't affect whether we may need zero padding, so leave + // lastsize unchanged. + } } go_assert(i == fields->size()); if (saw_nonzero && lastsize == 0 && !type->is_results_struct()) |