From 08dca4c649ba7f90f209376ba342bd46ef14ebe5 Mon Sep 17 00:00:00 2001 From: Todd Neal Date: Mon, 24 Apr 2017 11:20:09 -0400 Subject: cmd/compile: ignore types when considering tuple select for CSE Fixes #20097 Change-Id: I3c9626ccc8cd0c46a7081ea8650b2ff07a5d4fcd Reviewed-on: https://go-review.googlesource.com/41505 Run-TryBot: Todd Neal TryBot-Result: Gobot Gobot Reviewed-by: Keith Randall --- src/cmd/compile/internal/ssa/cse.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/cmd') diff --git a/src/cmd/compile/internal/ssa/cse.go b/src/cmd/compile/internal/ssa/cse.go index d852e22d5c..d931d6bf5f 100644 --- a/src/cmd/compile/internal/ssa/cse.go +++ b/src/cmd/compile/internal/ssa/cse.go @@ -322,9 +322,13 @@ func cmpVal(v, w *Value, auxIDs auxmap) types.Cmp { // that generate memory. return lt2Cmp(v.ID < w.ID) } - - if tc := v.Type.Compare(w.Type); tc != types.CMPeq { - return tc + // OpSelect is a pseudo-op. We need to be more agressive + // regarding CSE to keep multiple OpSelect's of the same + // argument from existing. + if v.Op != OpSelect0 && v.Op != OpSelect1 { + if tc := v.Type.Compare(w.Type); tc != types.CMPeq { + return tc + } } if v.Aux != w.Aux { -- cgit v1.3-5-g9baa