diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-08-29 00:20:25 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-08-29 00:20:25 +0000 |
| commit | 347462bfeecb8db177df72dc5b3c6f2eb263c452 (patch) | |
| tree | 258b35cc7e9d07a9c277d1923316c1720f93d862 /gcc/go | |
| parent | d16c446e0b24e78a5025cf88531d7967615eefd6 (diff) | |
| download | gcc-347462bfeecb8db177df72dc5b3c6f2eb263c452.zip gcc-347462bfeecb8db177df72dc5b3c6f2eb263c452.tar.gz gcc-347462bfeecb8db177df72dc5b3c6f2eb263c452.tar.bz2 | |
compiler, runtime: remove hmap field from maptypes
This is the gofrontend version of https://golang.org/cl/91796.
This is part of that CL, just the compiler change and required runtime
changes, in preparation for updating libgo to 1.11.
Relevant part of original CL description:
The hmap field in the maptype is only used by the runtime to check the sizes of
the hmap structure created by the compiler and runtime agree.
Comments are already present about the hmap structure definitions in the
compiler and runtime needing to be in sync.
Reviewed-on: https://go-review.googlesource.com/130976
From-SVN: r263941
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)); |