From: Daniel Morsing <daniel.morsing@gmail.com>
Date: Sun, 14 Jun 2015 22:06:39 +0000 (+0100)
Subject: [dev.ssa] fix equivalence class after aux/auxint refactor.
X-Git-Tag: go1.7beta1~1623^2^2~436
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3b817ef8f8e377e741ffa94ff3a5154bebe206cd;p=gostls13.git

[dev.ssa] fix equivalence class after aux/auxint refactor.

This caused the following code snippet to be miscompiled

	var f int
	x := g(&f)
	f = 10

Moving the store of 10 above the function call.

Change-Id: Ic6951f5e7781b122cd881df324a38e519d6d66f0
Reviewed-on: https://go-review.googlesource.com/11073
Reviewed-by: Keith Randall <khr@golang.org>
---

diff --git a/src/cmd/compile/internal/ssa/cse.go b/src/cmd/compile/internal/ssa/cse.go
index aba24aeabc..660712612a 100644
--- a/src/cmd/compile/internal/ssa/cse.go
+++ b/src/cmd/compile/internal/ssa/cse.go
@@ -26,15 +26,16 @@ func cse(f *Func) {
 	// Make initial partition based on opcode/type/aux/nargs
 	// TODO(khr): types are not canonical, so we may split unnecessarily.  Fix that.
 	type key struct {
-		op    Op
-		typ   Type
-		aux   interface{}
-		nargs int
+		op     Op
+		typ    Type
+		aux    interface{}
+		auxint int64
+		nargs  int
 	}
 	m := map[key]eqclass{}
 	for _, b := range f.Blocks {
 		for _, v := range b.Values {
-			k := key{v.Op, v.Type, v.Aux, len(v.Args)}
+			k := key{v.Op, v.Type, v.Aux, v.AuxInt, len(v.Args)}
 			m[k] = append(m[k], v)
 		}
 	}