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

compiler: make escape analysis work with imported inlineable functions 

The escape analysis was written before we import inlineable
    function bodies, and in some places it skipped functions that are
    not in the local package. Now that there are imported function
    bodies, make the escape analysis work with them.
    
    Note that it is necessary for the escape analysis to run on
    imported function bodies, even if they are already tagged. The
    tags only have the information of the parameters (receiver,
    results), but not the internal nodes, e.g. local variables. We
    still need to do the analysis to get all the information. (In the
    future maybe we could export/import escape info for internal
    nodes also, then we don't need to redo the analysis.)
    
    Also add assertions to ensure that if we analyze the same
    function in multiple places, they'd better agree with each other.
    
    Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/181537

From-SVN: r272124
This commit is contained in:
Ian Lance Taylor 2019-06-10 19:30:21 +00:00
parent f359611b36
commit c2f879e1fe
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/go/gofrontend/MERGE
View File

@ -1,4 +1,4 @@
b79e9e79fddc9040ab58c7c518eb08454f308def
a32739aadf0c7a65fcd5d5b6d0a0d206bff24a4f
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.

14
gcc/go/gofrontend/escape.cc
View File

@ -2773,15 +2773,8 @@ Gogo::assign_connectivity(Escape_context* context, Named_object* fn)
if (!p->type()->has_pointer())
continue;
// External function? Parameters must escape unless //go:noescape is set.
// TODO(cmang): Implement //go:noescape directive.
if (fn->package() != NULL)
param_node->set_encoding(Node::ESCAPE_HEAP);
else
{
param_node->set_encoding(Node::ESCAPE_NONE);
context->track(param_node);
}
param_node->set_encoding(Node::ESCAPE_NONE);
context->track(param_node);
}
Escape_analysis_loop el;
@ -3319,9 +3312,6 @@ Escape_analysis_tag::tag(Named_object* fn)
{
// External functions are assumed unsafe
// unless //go:noescape is given before the declaration.
if (fn->package() != NULL)
return;
if (fn->is_function_declaration())
{
Function_declaration* fdcl = fn->func_declaration_value();

7
gcc/go/gofrontend/types.h
View File

@ -1494,7 +1494,12 @@ class Typed_identifier
// Set the escape note.
void
set_note(const std::string& note)
{ this->note_ = new std::string(note); }
{
if (this->note_ != NULL)
go_assert(*this->note_ == note);
else
this->note_ = new std::string(note);
}
private:
// Identifier name.