From: Josh Bleecher Snyder <josharian@gmail.com>
Date: Mon, 9 May 2016 05:05:21 +0000 (-0700)
Subject: cmd/compile: remove inl escape analysis hack
X-Git-Tag: go1.8beta1~1740
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a3765723c60b4cbbec3c8e62e3b2ee9e4080eb0b;p=gostls13.git

cmd/compile: remove inl escape analysis hack

Relevant issues: #5056, #9537, and #11053.
Their tests all pass.

Change-Id: Ibbe05982ed5f332149ffd2cb6a232b8d677c4454
Reviewed-on: https://go-review.googlesource.com/27464
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/cmd/compile/internal/gc/inl.go b/src/cmd/compile/internal/gc/inl.go
index 2b84dd4a66..9c346fbedf 100644
--- a/src/cmd/compile/internal/gc/inl.go
+++ b/src/cmd/compile/internal/gc/inl.go
@@ -843,13 +843,6 @@ func inlvar(var_ *Node) *Node {
 	n.Name.Curfn = Curfn // the calling function, not the called one
 	n.Addrtaken = var_.Addrtaken
 
-	// This may no longer be necessary now that we run escape analysis
-	// after wrapper generation, but for 1.5 this is conservatively left
-	// unchanged. See bugs 11053 and 9537.
-	if var_.Esc == EscHeap {
-		addrescapes(n)
-	}
-
 	Curfn.Func.Dcl = append(Curfn.Func.Dcl, n)
 	return n
 }