diff options
| author | Keith Randall <khr@golang.org> | 2016-09-06 21:08:21 -0700 |
|---|---|---|
| committer | Keith Randall <khr@golang.org> | 2016-09-07 06:59:22 +0000 |
| commit | 83c73a85db84a04c8e60e52cfa348fc6b675fbf7 (patch) | |
| tree | cc78294649df5a1b122e46eb499ffb4f2dbbe523 /src | |
| parent | ca264cdc6247141a1e042f38c83fff4783f03324 (diff) | |
| download | go-83c73a85db84a04c8e60e52cfa348fc6b675fbf7.tar.xz | |
cmd/compile: ignore contentEscapes for marking nodes as escaping
Redo of CL 28575 with fixed test.
We're in a pre-KeepAlive world for a bit yet, the old tests
were in a client which was in a post-KeepAlive world.
Change-Id: I114fd630339d761ab3306d1d99718d3cb973678d
Reviewed-on: https://go-review.googlesource.com/28582
Run-TryBot: Keith Randall <khr@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/compile/internal/gc/esc.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmd/compile/internal/gc/esc.go b/src/cmd/compile/internal/gc/esc.go index c5597d7f48..0fd514fbaf 100644 --- a/src/cmd/compile/internal/gc/esc.go +++ b/src/cmd/compile/internal/gc/esc.go @@ -1572,7 +1572,7 @@ func esccall(e *EscState, n *Node, up *Node) { } if haspointers(t.Type) { - if escassignfromtag(e, note, nE.Escretval, src) == EscNone && up.Op != ODEFER && up.Op != OPROC { + if escassignfromtag(e, note, nE.Escretval, src)&EscMask == EscNone && up.Op != ODEFER && up.Op != OPROC { a := src for a.Op == OCONVNOP { a = a.Left |