From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Tue, 9 Jan 2018 23:43:23 +0000 (+0000)
Subject: compiler: set captured variable address to nonescape until further flooded
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4a59d4472b9a0a4c25c4483a03c71def7cb3aa8c;p=gcc.git

compiler: set captured variable address to nonescape until further flooded

    The escape analysis models closures by flowing captured variable
    address to the closure node. However, the escape state for the
    address expressions remained unset as ESCAPE_UNKNOWN. This
    caused later passes to conclude that the address escapes. Fix this by
    setting its escape state to ESCAPE_NONE first. If it escapes
    (because the closure escapes), the flood phase will set its
    escape state properly.

    Reviewed-on: https://go-review.googlesource.com/86240

From-SVN: r256411
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 80ccaf3b3b9..fc2e65d5259 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-7c5e4d67041e3529a055a923b2b9f5ef09aa72a3
+bea521d1d8688bea5b14b1ae2a03aec949f48a44
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/gcc/go/gofrontend/escape.cc b/gcc/go/gofrontend/escape.cc
index 65ccf9bd0db..2e9798ea741 100644
--- a/gcc/go/gofrontend/escape.cc
+++ b/gcc/go/gofrontend/escape.cc
@@ -1774,9 +1774,7 @@ Escape_analysis_assign::expression(Expression** pexpr)
 	    for (; p != sce->vals()->end(); ++p)
 	      {
 		Node* enclosed_node = Node::make_node(*p);
-		Node::Escape_state* state =
-		  enclosed_node->state(this->context_, NULL);
-		state->loop_depth = this->context_->loop_depth();
+		this->context_->track(enclosed_node);
 		this->assign(closure_node, enclosed_node);
 	      }
 	  }