From: Michael Munday <mike.munday@ibm.com>
Date: Sat, 30 Jun 2018 09:14:49 +0000 (+0100)
Subject: cmd/compile: keep autos whose address reaches a phi
X-Git-Tag: go1.11beta2~228
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=adfa8b86915296d1e98ce695420fc6d1faba6eb6;p=gostls13.git

cmd/compile: keep autos whose address reaches a phi

If the address of an auto reaches a phi then any further stores to
the pointer represented by the phi probably need to be kept. This
is because stores to the other arguments to the phi may be visible
to the program.

Fixes #26153.

Change-Id: Ic506c6c543bf70d792e5b1a64bdde1e5fdf1126a
Reviewed-on: https://go-review.googlesource.com/121796
Run-TryBot: Michael Munday <mike.munday@ibm.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Heschi Kreinick <heschi@google.com>
---

diff --git a/src/cmd/compile/internal/ssa/deadstore.go b/src/cmd/compile/internal/ssa/deadstore.go
index 4b2f57dcd9..e92521a79c 100644
--- a/src/cmd/compile/internal/ssa/deadstore.go
+++ b/src/cmd/compile/internal/ssa/deadstore.go
@@ -203,7 +203,8 @@ func elimDeadAutosGeneric(f *Func) {
 
 		// If the address of the auto reaches a memory or control
 		// operation not covered above then we probably need to keep it.
-		if v.Type.IsMemory() || v.Type.IsFlags() || (v.Op != OpPhi && v.MemoryArg() != nil) {
+		// We also need to keep autos if they reach Phis (issue #26153).
+		if v.Type.IsMemory() || v.Type.IsFlags() || v.Op == OpPhi || v.MemoryArg() != nil {
 			for _, a := range args {
 				if n, ok := addr[a]; ok {
 					if !used[n] {
diff --git a/test/fixedbugs/issue26153.go b/test/fixedbugs/issue26153.go
new file mode 100644
index 0000000000..53f53cf8a6
--- /dev/null
+++ b/test/fixedbugs/issue26153.go
@@ -0,0 +1,29 @@
+// run
+
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Issue 26153. The write to ps was incorrectly
+// removed by the dead auto elimination pass.
+
+package main
+
+const hello = "hello world"
+
+func main() {
+	var s string
+	mangle(&s)
+	if s != hello {
+		panic("write incorrectly elided")
+	}
+}
+
+//go:noinline
+func mangle(ps *string) {
+	if ps == nil {
+		var s string
+		ps = &s
+	}
+	*ps = hello
+}