From a3765723c60b4cbbec3c8e62e3b2ee9e4080eb0b Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Sun, 8 May 2016 22:05:21 -0700 Subject: [PATCH] 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 Reviewed-by: Brad Fitzpatrick TryBot-Result: Gobot Gobot --- src/cmd/compile/internal/gc/inl.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/cmd/compile/internal/gc/inl.go b/src/cmd/compile/internal/gc/inl.go index 2b84dd4a668..9c346fbedfe 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 }