Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
compiler: permit duplicate methods from embedded interfaces
This is a language change for Go 1.14.

Updates golang/go#6977

Change-Id: Ia8b8dc446c4dd700caccf59ca0444a380c49ba15
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/214240
Reviewed-by: Than McIntosh <thanm@google.com>
  • Loading branch information
ianlancetaylor committed Jan 10, 2020
1 parent 92ee4c2 commit 98c4c21
Showing 1 changed file with 17 additions and 9 deletions.
26 changes: 17 additions & 9 deletions go/types.cc
Expand Up @@ -8943,8 +8943,12 @@ Interface_type::finalize_methods()
continue;
}

const Typed_identifier_list* imethods = it->parse_methods_;
if (imethods == NULL)
continue;

Named_type* nt = t->named_type();
if (nt != NULL && it->parse_methods_ != NULL)
if (nt != NULL)
{
std::vector<Named_type*>::const_iterator q;
for (q = seen.begin(); q != seen.end(); ++q)
Expand All @@ -8960,22 +8964,26 @@ Interface_type::finalize_methods()
seen.push_back(nt);
}

const Typed_identifier_list* imethods = it->parse_methods_;
if (imethods == NULL)
continue;
for (Typed_identifier_list::const_iterator q = imethods->begin();
q != imethods->end();
++q)
{
if (q->name().empty())
inherit.push_back(*q);
else if (this->find_method(q->name()) == NULL)
this->all_methods_->push_back(Typed_identifier(q->name(),
q->type(), tl));
else
go_error_at(tl, "inherited method %qs is ambiguous",
Gogo::message_name(q->name()).c_str());
{
const Typed_identifier* oldm = this->find_method(q->name());
if (oldm == NULL)
this->all_methods_->push_back(Typed_identifier(q->name(),
q->type(), tl));
else if (!Type::are_identical(q->type(), oldm->type(),
Type::COMPARE_TAGS, NULL))
go_error_at(tl, "duplicate method %qs",
Gogo::message_name(q->name()).c_str());
}
}

seen.pop_back();
}

if (!this->all_methods_->empty())
Expand Down

0 comments on commit 98c4c21

Please sign in to comment.