compiler: add result parameter names for inlinable functions
An inlinable function body may need to refer to result parameters, so
each result parameter needs a name. We already give them all names in
start_function (via create_result_variables). Change the export data
so that for an inlinable function we use those names for the function
declaration's result parameters.
Change-Id: I14d04f4c40c7bc449df040fa61ada42f433af30a
Reviewed-on: https://go-review.googlesource.com/c/150070
Reviewed-by: Than McIntosh <thanm@google.com>
diff --git a/go/gogo.cc b/go/gogo.cc
index a5a0e56..e4bd39d 100644
--- a/go/gogo.cc
+++ b/go/gogo.cc
@@ -5487,7 +5487,7 @@
Block* block = NULL;
if (this->export_for_inlining())
block = this->block_;
- Function::export_func_with_type(exp, name, this->type_,
+ Function::export_func_with_type(exp, name, this->type_, this->results_,
this->is_method() && this->nointerface(),
block, this->location_);
}
@@ -5496,8 +5496,9 @@
void
Function::export_func_with_type(Export* exp, const std::string& name,
- const Function_type* fntype, bool nointerface,
- Block* block, Location loc)
+ const Function_type* fntype,
+ Function::Results* result_vars,
+ bool nointerface, Block* block, Location loc)
{
exp->write_c_string("func ");
@@ -5549,31 +5550,45 @@
}
exp->write_c_string(")");
- const Typed_identifier_list* results = fntype->results();
- if (results != NULL)
+ const Typed_identifier_list* result_decls = fntype->results();
+ if (result_decls != NULL)
{
- if (results->size() == 1 && results->begin()->name().empty())
+ if (result_decls->size() == 1
+ && result_decls->begin()->name().empty()
+ && block == NULL)
{
exp->write_c_string(" ");
- exp->write_type(results->begin()->type());
+ exp->write_type(result_decls->begin()->type());
}
else
{
exp->write_c_string(" (");
bool first = true;
- for (Typed_identifier_list::const_iterator p = results->begin();
- p != results->end();
- ++p)
+ Results::const_iterator pr;
+ if (result_vars != NULL)
+ pr = result_vars->begin();
+ for (Typed_identifier_list::const_iterator pd = result_decls->begin();
+ pd != result_decls->end();
+ ++pd)
{
if (first)
first = false;
else
exp->write_c_string(", ");
- exp->write_name(p->name());
- exp->write_escape(p->note());
+ // We only use pr->name, which may be artificial, if
+ // need it for inlining.
+ if (block == NULL || result_vars == NULL)
+ exp->write_name(pd->name());
+ else
+ exp->write_name((*pr)->name());
+ exp->write_escape(pd->note());
exp->write_c_string(" ");
- exp->write_type(p->type());
+ exp->write_type(pd->type());
+ if (result_vars != NULL)
+ ++pr;
}
+ if (result_vars != NULL)
+ go_assert(pr == result_vars->end());
exp->write_c_string(")");
}
}
diff --git a/go/gogo.h b/go/gogo.h
index 854d37a..0331cca 100644
--- a/go/gogo.h
+++ b/go/gogo.h
@@ -1513,8 +1513,8 @@
// Export a function with a type.
static void
export_func_with_type(Export*, const std::string& name,
- const Function_type*, bool nointerface, Block* block,
- Location);
+ const Function_type*, Results*, bool nointerface,
+ Block* block, Location);
// Import a function.
static void
@@ -1740,7 +1740,7 @@
void
export_func(Export* exp, const std::string& name) const
{
- Function::export_func_with_type(exp, name, this->fntype_,
+ Function::export_func_with_type(exp, name, this->fntype_, NULL,
this->is_method() && this->nointerface(),
NULL, this->location_);
}
