Merge "[dev.ssa] Merge remote-tracking branch 'origin/master' into mergebranch" into...

author Gerrit Code Review <noreply-gerritcodereview@google.com>

Tue, 20 Oct 2015 15:46:15 +0000 (15:46 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Tue, 20 Oct 2015 15:46:15 +0000 (15:46 +0000)
author Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 20 Oct 2015 15:46:15 +0000 (15:46 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 20 Oct 2015 15:46:15 +0000 (15:46 +0000)
diff --cc src/cmd/compile/internal/gc/ssa.go
Simple merge
diff --cc src/cmd/compile/internal/ssa/gen/AMD64.rules
Simple merge
diff --cc src/cmd/compile/internal/ssa/gen/AMD64Ops.go
Simple merge
diff --cc src/cmd/compile/internal/ssa/rewriteAMD64.go
Simple merge
author	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 20 Oct 2015 15:46:15 +0000 (15:46 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 20 Oct 2015 15:46:15 +0000 (15:46 +0000)
		1	2
src/cmd/compile/internal/gc/ssa.go	patch \|	diff1 \|	diff2 \|	blob \| history
src/cmd/compile/internal/ssa/gen/AMD64.rules	patch \|	diff1 \|	diff2 \|	blob \| history
src/cmd/compile/internal/ssa/gen/AMD64Ops.go	patch \|	diff1 \|	diff2 \|	blob \| history
src/cmd/compile/internal/ssa/rewriteAMD64.go	patch \|	diff1 \|	diff2 \|	blob \| history