diff options
Diffstat (limited to 'gcc/go')
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | gcc/go/gofrontend/types.cc | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 8fc3878..9495882 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -8deaafd14414bb5cbbdf3e2673f61b6d836d7d2a +da249ffd264154cc992e76ff03f91f700d3bf53e 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 2fb6706..00098da 100644 --- a/gcc/go/gofrontend/types.cc +++ b/gcc/go/gofrontend/types.cc @@ -7975,12 +7975,11 @@ Map_type::make_map_type_descriptor_type() Type* bool_type = Type::lookup_bool_type(); Struct_type* sf = - Type::make_builtin_struct_type(12, + Type::make_builtin_struct_type(11, "", tdt, "key", ptdt, "elem", ptdt, "bucket", ptdt, - "hmap", ptdt, "keysize", uint8_type, "indirectkey", bool_type, "valuesize", uint8_type, @@ -8065,11 +8064,6 @@ Map_type::do_type_descriptor(Gogo* gogo, Named_type* name) vals->push_back(Expression::make_type_descriptor(bucket_type, bloc)); ++p; - go_assert(p->is_field_name("hmap")); - Type* hmap_type = this->hmap_type(bucket_type); - vals->push_back(Expression::make_type_descriptor(hmap_type, bloc)); - - ++p; go_assert(p->is_field_name("keysize")); if (keysize > Map_type::max_key_size) vals->push_back(Expression::make_integer_int64(ptrsize, uint8_type, bloc)); |