diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | gcc/go/gofrontend/types.cc | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index f74b5f8..ebf8cd5 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -a487c86418488f6a17dab4f9945e2a5d495e3ddb +c2fc3b83d832725accd4fa5874a5b5ca02dd90dc 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 e411456..9081af6 100644 --- a/gcc/go/gofrontend/types.cc +++ b/gcc/go/gofrontend/types.cc @@ -1003,6 +1003,16 @@ Type::get_backend(Gogo* gogo) ins.first->second.is_placeholder = false; } + // We set the has_padding field of a Struct_type when we convert + // to the backend type, so if we have multiple Struct_type's + // mapping to the same backend type we need to copy the + // has_padding field. FIXME: This is awkward. We shouldn't + // really change the type when setting the backend type, but + // there isn't any other good time to add the padding field. + if (ins.first->first->struct_type() != NULL + && ins.first->first->struct_type()->has_padding()) + this->struct_type()->set_has_padding(); + return ins.first->second.btype; } |