From: Daniel Morsing <daniel.morsing@gmail.com>
Date: Fri, 5 Jul 2013 14:11:22 +0000 (+0200)
Subject: cmd/6g, cmd/8g: prevent constant propagation of non-constant LEA.
X-Git-Tag: go1.2rc2~1105
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3c3ce8e7fbe98a233cadbc59a05afdbbcacb0fe5;p=gostls13.git

cmd/6g, cmd/8g: prevent constant propagation of non-constant LEA.

Fixes #5809.

R=golang-dev, dave, rsc, nigeltao
CC=golang-dev
https://golang.org/cl/10785043
---

diff --git a/src/cmd/6g/peep.c b/src/cmd/6g/peep.c
index e77d65e873..5db9f4cf16 100644
--- a/src/cmd/6g/peep.c
+++ b/src/cmd/6g/peep.c
@@ -154,6 +154,7 @@ peep(void)
 		case ALEAQ:
 			if(regtyp(&p->to))
 			if(p->from.sym != S)
+			if(p->from.index == D_NONE || p->from.index == D_CONST)
 				conprop(r);
 			break;
 
diff --git a/src/cmd/8g/peep.c b/src/cmd/8g/peep.c
index 6b7e4363d8..e4c8afa372 100644
--- a/src/cmd/8g/peep.c
+++ b/src/cmd/8g/peep.c
@@ -147,6 +147,7 @@ peep(void)
 		case ALEAL:
 			if(regtyp(&p->to))
 			if(p->from.sym != S)
+			if(p->from.index == D_NONE || p->from.index == D_CONST)
 				conprop(r);
 			break;
 
diff --git a/test/fixedbugs/issue5809.go b/test/fixedbugs/issue5809.go
new file mode 100644
index 0000000000..ca060b55de
--- /dev/null
+++ b/test/fixedbugs/issue5809.go
@@ -0,0 +1,27 @@
+// run
+
+// Copyright 2013 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 5809: 6g and 8g attempted to constant propagate indexed LEA
+
+package main
+
+import "fmt"
+
+func main() {
+	const d16 = "0123456789ABCDEF"
+	k := 0x1234
+	var x [4]byte
+	
+	x[0] = d16[k>>12&0xf]
+	x[1] = d16[k>>8&0xf]
+	x[2] = d16[k>>4&0xf]
+	x[3] = d16[k&0xf]
+	
+	if x != [4]byte{'1','2','3','4'} {
+		fmt.Println(x)
+		panic("x != [4]byte{'1','2','3','4'}")
+	}
+}