OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

compiler: Another correction to hidden fields in composite literals.

Browse Source 
From-SVN: r182154
This commit is contained in:
Ian Lance Taylor 2011-12-09 05:04:12 +00:00
parent 14f2a7e2b1
commit c573faf5e4
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gcc/go/gofrontend/expressions.cc
View File

@ -12818,16 +12818,20 @@ Composite_literal_expression::lower_struct(Gogo* gogo, Type* type)
Struct_type* st = type->struct_type();
if (this->vals_ == NULL || !this->has_keys_)
{
if (this->vals_ != NULL && !this->vals_->empty())
if (this->vals_ != NULL
&& !this->vals_->empty()
&& type->named_type() != NULL
&& type->named_type()->named_object()->package() != NULL)
{
std::string reason;
if (type->has_hidden_fields(NULL, &reason))
for (Struct_field_list::const_iterator pf = st->fields()->begin();
pf != st->fields()->end();
++pf)
{
if (reason.empty())
if (Gogo::is_hidden_name(pf->field_name()))
error_at(this->location(),
"implicit assignment of hidden field");
else
error_at(this->location(), "%s", reason.c_str());
"assignment of unexported field %qs in %qs literal",
Gogo::message_name(pf->field_name()).c_str(),
type->named_type()->message_name().c_str());
}
}