diff options
| author | Ian Lance Taylor <iant@golang.org> | 2020-07-10 10:28:34 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-07-11 12:38:10 -0700 |
| commit | e7d6d8f9f7b687c8e7438523d7d6f7a539ec7287 (patch) | |
| tree | ef563f5aa429ee33e24e7f4abaf82f6f46387397 | |
| parent | 2b4bbc17077ac12fc9742ade4919a6de0277ac8c (diff) | |
| download | gcc-e7d6d8f9f7b687c8e7438523d7d6f7a539ec7287.zip gcc-e7d6d8f9f7b687c8e7438523d7d6f7a539ec7287.tar.gz gcc-e7d6d8f9f7b687c8e7438523d7d6f7a539ec7287.tar.bz2 | |
compiler: handle aliases to pointer types with interfaces
Test case is https://golang.org/cl/241997.
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/241998
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | gcc/go/gofrontend/types.cc | 17 |
2 files changed, 13 insertions, 6 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 64b13f4..c65fd8e 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -2ad0970e9da95024110cd3244e9e21313af70a5f +ce70fa16a73e3f162de01deab6b5d17783e6b76b 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 3459a33..7f65b4a 100644 --- a/gcc/go/gofrontend/types.cc +++ b/gcc/go/gofrontend/types.cc @@ -9208,6 +9208,7 @@ Interface_type::implements_interface(const Type* t, std::string* reason) const if (this->all_methods_ == NULL) return true; + t = t->unalias(); bool is_pointer = false; const Named_type* nt = t->named_type(); const Struct_type* st = t->struct_type(); @@ -9220,6 +9221,7 @@ Interface_type::implements_interface(const Type* t, std::string* reason) const { // If T is a pointer to a named type, then we need to look at // the type to which it points. + pt = pt->unalias(); is_pointer = true; nt = pt->named_type(); st = pt->struct_type(); @@ -10408,19 +10410,24 @@ Named_type::interface_method_table(Interface_type* interface, bool is_pointer) return Expression::make_error(this->location_); if (this->is_alias_) { - if (this->type_->named_type() != NULL) + Type* t = this->type_; + if (!is_pointer && t->points_to() != NULL) + { + t = t->points_to(); + is_pointer = true; + } + if (t->named_type() != NULL) { if (this->seen_alias_) return Expression::make_error(this->location_); this->seen_alias_ = true; - Named_type* nt = this->type_->named_type(); + Named_type* nt = t->named_type(); Expression* ret = nt->interface_method_table(interface, is_pointer); this->seen_alias_ = false; return ret; } - if (this->type_->struct_type() != NULL) - return this->type_->struct_type()->interface_method_table(interface, - is_pointer); + if (t->struct_type() != NULL) + return t->struct_type()->interface_method_table(interface, is_pointer); go_unreachable(); } return Type::interface_method_table(this, interface, is_pointer, |