git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compiler: Fix parameter references in method expressions. 

From-SVN: r183825
This commit is contained in:
Ian Lance Taylor 2012-02-02 06:24:07 +00:00
parent 4e15881eeb
commit 3375a6c94c
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11711,10 +11711,21 @@ Selector_expression::lower_method_expression(Gogo* gogo)
const Typed_identifier_list* method_parameters = method_type->parameters(); const Typed_identifier_list* method_parameters = method_type->parameters();
if (method_parameters != NULL) if (method_parameters != NULL)
{ {
int i = 0;
for (Typed_identifier_list::const_iterator p = method_parameters->begin(); for (Typed_identifier_list::const_iterator p = method_parameters->begin();
p != method_parameters->end(); p != method_parameters->end();
++p) ++p, ++i)
{
if (!p->name().empty() && p->name() != Import::import_marker)
parameters->push_back(*p); parameters->push_back(*p);
else
{
char buf[20];
snprintf(buf, sizeof buf, "$param%d", i);
parameters->push_back(Typed_identifier(buf, p->type(),
p->location()));
}
}
} }
const Typed_identifier_list* method_results = method_type->results(); const Typed_identifier_list* method_results = method_type->results();
@ -11774,14 +11785,14 @@ Selector_expression::lower_method_expression(Gogo* gogo)
} }
Expression_list* args; Expression_list* args;
if (method_parameters == NULL) if (parameters->size() <= 1)
args = NULL; args = NULL;
else else
{ {
args = new Expression_list(); args = new Expression_list();
for (Typed_identifier_list::const_iterator p = method_parameters->begin(); Typed_identifier_list::const_iterator p = parameters->begin();
p != method_parameters->end(); ++p;
++p) for (; p != parameters->end(); ++p)
{ {
vno = gogo->lookup(p->name(), NULL); vno = gogo->lookup(p->name(), NULL);
go_assert(vno != NULL); go_assert(vno != NULL);