summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2013-06-27 20:51:55 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2013-06-27 20:51:55 +0000
commit86990cac7cb5acd5d6edd28a56a59e18ae9c39a5 (patch)
tree9671a37b42e4daa0938b753c69f2e6fcc7d9ee77
parent3b76b707d7bf13d49dc4cba3f17af30a699cc08c (diff)
downloadgcc-86990cac7cb5acd5d6edd28a56a59e18ae9c39a5.tar.gz
compiler: structs inherit all methods from embedded pointer fields.
Previously if a struct S contained an embedded field *T, a method with receiver *T would not be promoted to a method with value receiver S. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@200493 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/go/gofrontend/types.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/types.cc b/gcc/go/gofrontend/types.cc
index 3fe20904493..0a86d472062 100644
--- a/gcc/go/gofrontend/types.cc
+++ b/gcc/go/gofrontend/types.cc
@@ -9396,13 +9396,18 @@ Type::find_field_or_method(const Type* type,
fnt = pf->type()->deref()->named_type();
go_assert(fnt != NULL);
+ // Methods with pointer receivers on embedded field are
+ // inherited by the pointer to struct, and also by the struct
+ // type if the field itself is a pointer.
+ bool can_be_pointer = (receiver_can_be_pointer
+ || pf->type()->points_to() != NULL);
int sublevel = level == NULL ? 1 : *level + 1;
bool sub_is_method;
std::string subambig1;
std::string subambig2;
bool subfound = Type::find_field_or_method(fnt,
name,
- receiver_can_be_pointer,
+ can_be_pointer,
seen,
&sublevel,
&sub_is_method,