cmd/compile: fix bad generated format strings in test

We were generating format strings containing
a lone %. Vet legitimately complains:

cmd/compile/internal/gc/constFold_test.go:339: unrecognized printf verb ' '

The fix doesn't make for very readable code,
but it is simple and obviously correct.

Updates #11041

Change-Id: I90bd2d1d140887f5229752a279f7e46921472fbb
Reviewed-on: https://go-review.googlesource.com/27115
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

2 files changed, 2302 insertions, 2302 deletions

diff --git a/src/cmd/compile/internal/gc/constFold_test.go b/src/cmd/compile/internal/gc/constFold_test.go
index ef6a3c115d..fe57717907 100644
--- a/src/cmd/compile/internal/gc/constFold_test.go
+++ b/src/cmd/compile/internal/gc/constFold_test.go
@@ -8,85 +8,85 @@ func TestConstFolduint64add(t *testing.T) {
 	y = 0
 	r = x + y
 	if r != 0 {
-		t.Errorf("0 + 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 1 {
-		t.Errorf("0 + 1 = %d, want 1", r)
+		t.Errorf("0 %s 1 = %d, want 1", "+", r)
 	}
 	y = 4294967296
 	r = x + y
 	if r != 4294967296 {
-		t.Errorf("0 + 4294967296 = %d, want 4294967296", r)
+		t.Errorf("0 %s 4294967296 = %d, want 4294967296", "+", r)
 	}
 	y = 18446744073709551615
 	r = x + y
 	if r != 18446744073709551615 {
-		t.Errorf("0 + 18446744073709551615 = %d, want 18446744073709551615", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 18446744073709551615", "+", r)
 	}
 	x = 1
 	y = 0
 	r = x + y
 	if r != 1 {
-		t.Errorf("1 + 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 2 {
-		t.Errorf("1 + 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "+", r)
 	}
 	y = 4294967296
 	r = x + y
 	if r != 4294967297 {
-		t.Errorf("1 + 4294967296 = %d, want 4294967297", r)
+		t.Errorf("1 %s 4294967296 = %d, want 4294967297", "+", r)
 	}
 	y = 18446744073709551615
 	r = x + y
 	if r != 0 {
-		t.Errorf("1 + 18446744073709551615 = %d, want 0", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 0", "+", r)
 	}
 	x = 4294967296
 	y = 0
 	r = x + y
 	if r != 4294967296 {
-		t.Errorf("4294967296 + 0 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 0 = %d, want 4294967296", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 4294967297 {
-		t.Errorf("4294967296 + 1 = %d, want 4294967297", r)
+		t.Errorf("4294967296 %s 1 = %d, want 4294967297", "+", r)
 	}
 	y = 4294967296
 	r = x + y
 	if r != 8589934592 {
-		t.Errorf("4294967296 + 4294967296 = %d, want 8589934592", r)
+		t.Errorf("4294967296 %s 4294967296 = %d, want 8589934592", "+", r)
 	}
 	y = 18446744073709551615
 	r = x + y
 	if r != 4294967295 {
-		t.Errorf("4294967296 + 18446744073709551615 = %d, want 4294967295", r)
+		t.Errorf("4294967296 %s 18446744073709551615 = %d, want 4294967295", "+", r)
 	}
 	x = 18446744073709551615
 	y = 0
 	r = x + y
 	if r != 18446744073709551615 {
-		t.Errorf("18446744073709551615 + 0 = %d, want 18446744073709551615", r)
+		t.Errorf("18446744073709551615 %s 0 = %d, want 18446744073709551615", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 0 {
-		t.Errorf("18446744073709551615 + 1 = %d, want 0", r)
+		t.Errorf("18446744073709551615 %s 1 = %d, want 0", "+", r)
 	}
 	y = 4294967296
 	r = x + y
 	if r != 4294967295 {
-		t.Errorf("18446744073709551615 + 4294967296 = %d, want 4294967295", r)
+		t.Errorf("18446744073709551615 %s 4294967296 = %d, want 4294967295", "+", r)
 	}
 	y = 18446744073709551615
 	r = x + y
 	if r != 18446744073709551614 {
-		t.Errorf("18446744073709551615 + 18446744073709551615 = %d, want 18446744073709551614", r)
+		t.Errorf("18446744073709551615 %s 18446744073709551615 = %d, want 18446744073709551614", "+", r)
 	}
 }
 func TestConstFolduint64sub(t *testing.T) {
@@ -95,85 +95,85 @@ func TestConstFolduint64sub(t *testing.T) {
 	y = 0
 	r = x - y
 	if r != 0 {
-		t.Errorf("0 - 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 18446744073709551615 {
-		t.Errorf("0 - 1 = %d, want 18446744073709551615", r)
+		t.Errorf("0 %s 1 = %d, want 18446744073709551615", "-", r)
 	}
 	y = 4294967296
 	r = x - y
 	if r != 18446744069414584320 {
-		t.Errorf("0 - 4294967296 = %d, want 18446744069414584320", r)
+		t.Errorf("0 %s 4294967296 = %d, want 18446744069414584320", "-", r)
 	}
 	y = 18446744073709551615
 	r = x - y
 	if r != 1 {
-		t.Errorf("0 - 18446744073709551615 = %d, want 1", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 1", "-", r)
 	}
 	x = 1
 	y = 0
 	r = x - y
 	if r != 1 {
-		t.Errorf("1 - 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 0 {
-		t.Errorf("1 - 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", "-", r)
 	}
 	y = 4294967296
 	r = x - y
 	if r != 18446744069414584321 {
-		t.Errorf("1 - 4294967296 = %d, want 18446744069414584321", r)
+		t.Errorf("1 %s 4294967296 = %d, want 18446744069414584321", "-", r)
 	}
 	y = 18446744073709551615
 	r = x - y
 	if r != 2 {
-		t.Errorf("1 - 18446744073709551615 = %d, want 2", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 2", "-", r)
 	}
 	x = 4294967296
 	y = 0
 	r = x - y
 	if r != 4294967296 {
-		t.Errorf("4294967296 - 0 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 0 = %d, want 4294967296", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 4294967295 {
-		t.Errorf("4294967296 - 1 = %d, want 4294967295", r)
+		t.Errorf("4294967296 %s 1 = %d, want 4294967295", "-", r)
 	}
 	y = 4294967296
 	r = x - y
 	if r != 0 {
-		t.Errorf("4294967296 - 4294967296 = %d, want 0", r)
+		t.Errorf("4294967296 %s 4294967296 = %d, want 0", "-", r)
 	}
 	y = 18446744073709551615
 	r = x - y
 	if r != 4294967297 {
-		t.Errorf("4294967296 - 18446744073709551615 = %d, want 4294967297", r)
+		t.Errorf("4294967296 %s 18446744073709551615 = %d, want 4294967297", "-", r)
 	}
 	x = 18446744073709551615
 	y = 0
 	r = x - y
 	if r != 18446744073709551615 {
-		t.Errorf("18446744073709551615 - 0 = %d, want 18446744073709551615", r)
+		t.Errorf("18446744073709551615 %s 0 = %d, want 18446744073709551615", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 18446744073709551614 {
-		t.Errorf("18446744073709551615 - 1 = %d, want 18446744073709551614", r)
+		t.Errorf("18446744073709551615 %s 1 = %d, want 18446744073709551614", "-", r)
 	}
 	y = 4294967296
 	r = x - y
 	if r != 18446744069414584319 {
-		t.Errorf("18446744073709551615 - 4294967296 = %d, want 18446744069414584319", r)
+		t.Errorf("18446744073709551615 %s 4294967296 = %d, want 18446744069414584319", "-", r)
 	}
 	y = 18446744073709551615
 	r = x - y
 	if r != 0 {
-		t.Errorf("18446744073709551615 - 18446744073709551615 = %d, want 0", r)
+		t.Errorf("18446744073709551615 %s 18446744073709551615 = %d, want 0", "-", r)
 	}
 }
 func TestConstFolduint64div(t *testing.T) {
@@ -182,65 +182,65 @@ func TestConstFolduint64div(t *testing.T) {
 	y = 1
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "/", r)
 	}
 	y = 4294967296
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", "/", r)
 	}
 	y = 18446744073709551615
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 18446744073709551615 = %d, want 0", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 0", "/", r)
 	}
 	x = 1
 	y = 1
 	r = x / y
 	if r != 1 {
-		t.Errorf("1 / 1 = %d, want 1", r)
+		t.Errorf("1 %s 1 = %d, want 1", "/", r)
 	}
 	y = 4294967296
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / 4294967296 = %d, want 0", r)
+		t.Errorf("1 %s 4294967296 = %d, want 0", "/", r)
 	}
 	y = 18446744073709551615
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / 18446744073709551615 = %d, want 0", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 0", "/", r)
 	}
 	x = 4294967296
 	y = 1
 	r = x / y
 	if r != 4294967296 {
-		t.Errorf("4294967296 / 1 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 1 = %d, want 4294967296", "/", r)
 	}
 	y = 4294967296
 	r = x / y
 	if r != 1 {
-		t.Errorf("4294967296 / 4294967296 = %d, want 1", r)
+		t.Errorf("4294967296 %s 4294967296 = %d, want 1", "/", r)
 	}
 	y = 18446744073709551615
 	r = x / y
 	if r != 0 {
-		t.Errorf("4294967296 / 18446744073709551615 = %d, want 0", r)
+		t.Errorf("4294967296 %s 18446744073709551615 = %d, want 0", "/", r)
 	}
 	x = 18446744073709551615
 	y = 1
 	r = x / y
 	if r != 18446744073709551615 {
-		t.Errorf("18446744073709551615 / 1 = %d, want 18446744073709551615", r)
+		t.Errorf("18446744073709551615 %s 1 = %d, want 18446744073709551615", "/", r)
 	}
 	y = 4294967296
 	r = x / y
 	if r != 4294967295 {
-		t.Errorf("18446744073709551615 / 4294967296 = %d, want 4294967295", r)
+		t.Errorf("18446744073709551615 %s 4294967296 = %d, want 4294967295", "/", r)
 	}
 	y = 18446744073709551615
 	r = x / y
 	if r != 1 {
-		t.Errorf("18446744073709551615 / 18446744073709551615 = %d, want 1", r)
+		t.Errorf("18446744073709551615 %s 18446744073709551615 = %d, want 1", "/", r)
 	}
 }
 func TestConstFolduint64mul(t *testing.T) {
@@ -249,85 +249,85 @@ func TestConstFolduint64mul(t *testing.T) {
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "*", r)
 	}
 	y = 4294967296
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", "*", r)
 	}
 	y = 18446744073709551615
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 18446744073709551615 = %d, want 0", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 0", "*", r)
 	}
 	x = 1
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("1 * 0 = %d, want 0", r)
+		t.Errorf("1 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 1 {
-		t.Errorf("1 * 1 = %d, want 1", r)
+		t.Errorf("1 %s 1 = %d, want 1", "*", r)
 	}
 	y = 4294967296
 	r = x * y
 	if r != 4294967296 {
-		t.Errorf("1 * 4294967296 = %d, want 4294967296", r)
+		t.Errorf("1 %s 4294967296 = %d, want 4294967296", "*", r)
 	}
 	y = 18446744073709551615
 	r = x * y
 	if r != 18446744073709551615 {
-		t.Errorf("1 * 18446744073709551615 = %d, want 18446744073709551615", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 18446744073709551615", "*", r)
 	}
 	x = 4294967296
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("4294967296 * 0 = %d, want 0", r)
+		t.Errorf("4294967296 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 4294967296 {
-		t.Errorf("4294967296 * 1 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 1 = %d, want 4294967296", "*", r)
 	}
 	y = 4294967296
 	r = x * y
 	if r != 0 {
-		t.Errorf("4294967296 * 4294967296 = %d, want 0", r)
+		t.Errorf("4294967296 %s 4294967296 = %d, want 0", "*", r)
 	}
 	y = 18446744073709551615
 	r = x * y
 	if r != 18446744069414584320 {
-		t.Errorf("4294967296 * 18446744073709551615 = %d, want 18446744069414584320", r)
+		t.Errorf("4294967296 %s 18446744073709551615 = %d, want 18446744069414584320", "*", r)
 	}
 	x = 18446744073709551615
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("18446744073709551615 * 0 = %d, want 0", r)
+		t.Errorf("18446744073709551615 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 18446744073709551615 {
-		t.Errorf("18446744073709551615 * 1 = %d, want 18446744073709551615", r)
+		t.Errorf("18446744073709551615 %s 1 = %d, want 18446744073709551615", "*", r)
 	}
 	y = 4294967296
 	r = x * y
 	if r != 18446744069414584320 {
-		t.Errorf("18446744073709551615 * 4294967296 = %d, want 18446744069414584320", r)
+		t.Errorf("18446744073709551615 %s 4294967296 = %d, want 18446744069414584320", "*", r)
 	}
 	y = 18446744073709551615
 	r = x * y
 	if r != 1 {
-		t.Errorf("18446744073709551615 * 18446744073709551615 = %d, want 1", r)
+		t.Errorf("18446744073709551615 %s 18446744073709551615 = %d, want 1", "*", r)
 	}
 }
 func TestConstFolduint64mod(t *testing.T) {
@@ -336,65 +336,65 @@ func TestConstFolduint64mod(t *testing.T) {
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "%", r)
 	}
 	y = 4294967296
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", "%", r)
 	}
 	y = 18446744073709551615
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 18446744073709551615 = %d, want 0", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 0", "%", r)
 	}
 	x = 1
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("1 % 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", "%", r)
 	}
 	y = 4294967296
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % 4294967296 = %d, want 1", r)
+		t.Errorf("1 %s 4294967296 = %d, want 1", "%", r)
 	}
 	y = 18446744073709551615
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % 18446744073709551615 = %d, want 1", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 1", "%", r)
 	}
 	x = 4294967296
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("4294967296 % 1 = %d, want 0", r)
+		t.Errorf("4294967296 %s 1 = %d, want 0", "%", r)
 	}
 	y = 4294967296
 	r = x % y
 	if r != 0 {
-		t.Errorf("4294967296 % 4294967296 = %d, want 0", r)
+		t.Errorf("4294967296 %s 4294967296 = %d, want 0", "%", r)
 	}
 	y = 18446744073709551615
 	r = x % y
 	if r != 4294967296 {
-		t.Errorf("4294967296 % 18446744073709551615 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 18446744073709551615 = %d, want 4294967296", "%", r)
 	}
 	x = 18446744073709551615
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("18446744073709551615 % 1 = %d, want 0", r)
+		t.Errorf("18446744073709551615 %s 1 = %d, want 0", "%", r)
 	}
 	y = 4294967296
 	r = x % y
 	if r != 4294967295 {
-		t.Errorf("18446744073709551615 % 4294967296 = %d, want 4294967295", r)
+		t.Errorf("18446744073709551615 %s 4294967296 = %d, want 4294967295", "%", r)
 	}
 	y = 18446744073709551615
 	r = x % y
 	if r != 0 {
-		t.Errorf("18446744073709551615 % 18446744073709551615 = %d, want 0", r)
+		t.Errorf("18446744073709551615 %s 18446744073709551615 = %d, want 0", "%", r)
 	}
 }
 func TestConstFoldint64add(t *testing.T) {
@@ -403,415 +403,415 @@ func TestConstFoldint64add(t *testing.T) {
 	y = -9223372036854775808
 	r = x + y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 + -9223372036854775808 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s -9223372036854775808 = %d, want 0", "+", r)
 	}
 	y = -9223372036854775807
 	r = x + y
 	if r != 1 {
-		t.Errorf("-9223372036854775808 + -9223372036854775807 = %d, want 1", r)
+		t.Errorf("-9223372036854775808 %s -9223372036854775807 = %d, want 1", "+", r)
 	}
 	y = -4294967296
 	r = x + y
 	if r != 9223372032559808512 {
-		t.Errorf("-9223372036854775808 + -4294967296 = %d, want 9223372032559808512", r)
+		t.Errorf("-9223372036854775808 %s -4294967296 = %d, want 9223372032559808512", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != 9223372036854775807 {
-		t.Errorf("-9223372036854775808 + -1 = %d, want 9223372036854775807", r)
+		t.Errorf("-9223372036854775808 %s -1 = %d, want 9223372036854775807", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != -9223372036854775808 {
-		t.Errorf("-9223372036854775808 + 0 = %d, want -9223372036854775808", r)
+		t.Errorf("-9223372036854775808 %s 0 = %d, want -9223372036854775808", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != -9223372036854775807 {
-		t.Errorf("-9223372036854775808 + 1 = %d, want -9223372036854775807", r)
+		t.Errorf("-9223372036854775808 %s 1 = %d, want -9223372036854775807", "+", r)
 	}
 	y = 4294967296
 	r = x + y
 	if r != -9223372032559808512 {
-		t.Errorf("-9223372036854775808 + 4294967296 = %d, want -9223372032559808512", r)
+		t.Errorf("-9223372036854775808 %s 4294967296 = %d, want -9223372032559808512", "+", r)
 	}
 	y = 9223372036854775806
 	r = x + y
 	if r != -2 {
-		t.Errorf("-9223372036854775808 + 9223372036854775806 = %d, want -2", r)
+		t.Errorf("-9223372036854775808 %s 9223372036854775806 = %d, want -2", "+", r)
 	}
 	y = 9223372036854775807
 	r = x + y
 	if r != -1 {
-		t.Errorf("-9223372036854775808 + 9223372036854775807 = %d, want -1", r)
+		t.Errorf("-9223372036854775808 %s 9223372036854775807 = %d, want -1", "+", r)
 	}
 	x = -9223372036854775807
 	y = -9223372036854775808
 	r = x + y
 	if r != 1 {
-		t.Errorf("-9223372036854775807 + -9223372036854775808 = %d, want 1", r)
+		t.Errorf("-9223372036854775807 %s -9223372036854775808 = %d, want 1", "+", r)
 	}
 	y = -9223372036854775807
 	r = x + y
 	if r != 2 {
-		t.Errorf("-9223372036854775807 + -9223372036854775807 = %d, want 2", r)
+		t.Errorf("-9223372036854775807 %s -9223372036854775807 = %d, want 2", "+", r)
 	}
 	y = -4294967296
 	r = x + y
 	if r != 9223372032559808513 {
-		t.Errorf("-9223372036854775807 + -4294967296 = %d, want 9223372032559808513", r)
+		t.Errorf("-9223372036854775807 %s -4294967296 = %d, want 9223372032559808513", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != -9223372036854775808 {
-		t.Errorf("-9223372036854775807 + -1 = %d, want -9223372036854775808", r)
+		t.Errorf("-9223372036854775807 %s -1 = %d, want -9223372036854775808", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != -9223372036854775807 {
-		t.Errorf("-9223372036854775807 + 0 = %d, want -9223372036854775807", r)
+		t.Errorf("-9223372036854775807 %s 0 = %d, want -9223372036854775807", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != -9223372036854775806 {
-		t.Errorf("-9223372036854775807 + 1 = %d, want -9223372036854775806", r)
+		t.Errorf("-9223372036854775807 %s 1 = %d, want -9223372036854775806", "+", r)
 	}
 	y = 4294967296
 	r = x + y
 	if r != -9223372032559808511 {
-		t.Errorf("-9223372036854775807 + 4294967296 = %d, want -9223372032559808511", r)
+		t.Errorf("-9223372036854775807 %s 4294967296 = %d, want -9223372032559808511", "+", r)
 	}
 	y = 9223372036854775806
 	r = x + y
 	if r != -1 {
-		t.Errorf("-9223372036854775807 + 9223372036854775806 = %d, want -1", r)
+		t.Errorf("-9223372036854775807 %s 9223372036854775806 = %d, want -1", "+", r)
 	}
 	y = 9223372036854775807
 	r = x + y
 	if r != 0 {
-		t.Errorf("-9223372036854775807 + 9223372036854775807 = %d, want 0", r)
+		t.Errorf("-9223372036854775807 %s 9223372036854775807 = %d, want 0", "+", r)
 	}
 	x = -4294967296
 	y = -9223372036854775808
 	r = x + y
 	if r != 9223372032559808512 {
-		t.Errorf("-4294967296 + -9223372036854775808 = %d, want 9223372032559808512", r)
+		t.Errorf("-4294967296 %s -9223372036854775808 = %d, want 9223372032559808512", "+", r)
 	}
 	y = -9223372036854775807
 	r = x + y
 	if r != 9223372032559808513 {
-		t.Errorf("-4294967296 + -9223372036854775807 = %d, want 9223372032559808513", r)
+		t.Errorf("-4294967296 %s -9223372036854775807 = %d, want 9223372032559808513", "+", r)
 	}
 	y = -4294967296
 	r = x + y
 	if r != -8589934592 {
-		t.Errorf("-4294967296 + -4294967296 = %d, want -8589934592", r)
+		t.Errorf("-4294967296 %s -4294967296 = %d, want -8589934592", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != -4294967297 {
-		t.Errorf("-4294967296 + -1 = %d, want -4294967297", r)
+		t.Errorf("-4294967296 %s -1 = %d, want -4294967297", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != -4294967296 {
-		t.Errorf("-4294967296 + 0 = %d, want -4294967296", r)
+		t.Errorf("-4294967296 %s 0 = %d, want -4294967296", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != -4294967295 {
-		t.Errorf("-4294967296 + 1 = %d, want -4294967295", r)
+		t.Errorf("-4294967296 %s 1 = %d, want -4294967295", "+", r)
 	}
 	y = 4294967296
 	r = x + y
 	if r != 0 {
-		t.Errorf("-4294967296 + 4294967296 = %d, want 0", r)
+		t.Errorf("-4294967296 %s 4294967296 = %d, want 0", "+", r)
 	}
 	y = 9223372036854775806
 	r = x + y
 	if r != 9223372032559808510 {
-		t.Errorf("-4294967296 + 9223372036854775806 = %d, want 9223372032559808510", r)
+		t.Errorf("-4294967296 %s 9223372036854775806 = %d, want 9223372032559808510", "+", r)
 	}
 	y = 9223372036854775807
 	r = x + y
 	if r != 9223372032559808511 {
-		t.Errorf("-4294967296 + 9223372036854775807 = %d, want 9223372032559808511", r)
+		t.Errorf("-4294967296 %s 9223372036854775807 = %d, want 9223372032559808511", "+", r)
 	}
 	x = -1
 	y = -9223372036854775808
 	r = x + y
 	if r != 9223372036854775807 {
-		t.Errorf("-1 + -9223372036854775808 = %d, want 9223372036854775807", r)
+		t.Errorf("-1 %s -9223372036854775808 = %d, want 9223372036854775807", "+", r)
 	}
 	y = -9223372036854775807
 	r = x + y
 	if r != -9223372036854775808 {
-		t.Errorf("-1 + -9223372036854775807 = %d, want -9223372036854775808", r)
+		t.Errorf("-1 %s -9223372036854775807 = %d, want -9223372036854775808", "+", r)
 	}
 	y = -4294967296
 	r = x + y
 	if r != -4294967297 {
-		t.Errorf("-1 + -4294967296 = %d, want -4294967297", r)
+		t.Errorf("-1 %s -4294967296 = %d, want -4294967297", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != -2 {
-		t.Errorf("-1 + -1 = %d, want -2", r)
+		t.Errorf("-1 %s -1 = %d, want -2", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != -1 {
-		t.Errorf("-1 + 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 0 {
-		t.Errorf("-1 + 1 = %d, want 0", r)
+		t.Errorf("-1 %s 1 = %d, want 0", "+", r)
 	}
 	y = 4294967296
 	r = x + y
 	if r != 4294967295 {
-		t.Errorf("-1 + 4294967296 = %d, want 4294967295", r)
+		t.Errorf("-1 %s 4294967296 = %d, want 4294967295", "+", r)
 	}
 	y = 9223372036854775806
 	r = x + y
 	if r != 9223372036854775805 {
-		t.Errorf("-1 + 9223372036854775806 = %d, want 9223372036854775805", r)
+		t.Errorf("-1 %s 9223372036854775806 = %d, want 9223372036854775805", "+", r)
 	}
 	y = 9223372036854775807
 	r = x + y
 	if r != 9223372036854775806 {
-		t.Errorf("-1 + 9223372036854775807 = %d, want 9223372036854775806", r)
+		t.Errorf("-1 %s 9223372036854775807 = %d, want 9223372036854775806", "+", r)
 	}
 	x = 0
 	y = -9223372036854775808
 	r = x + y
 	if r != -9223372036854775808 {
-		t.Errorf("0 + -9223372036854775808 = %d, want -9223372036854775808", r)
+		t.Errorf("0 %s -9223372036854775808 = %d, want -9223372036854775808", "+", r)
 	}
 	y = -9223372036854775807
 	r = x + y
 	if r != -9223372036854775807 {
-		t.Errorf("0 + -9223372036854775807 = %d, want -9223372036854775807", r)
+		t.Errorf("0 %s -9223372036854775807 = %d, want -9223372036854775807", "+", r)
 	}
 	y = -4294967296
 	r = x + y
 	if r != -4294967296 {
-		t.Errorf("0 + -4294967296 = %d, want -4294967296", r)
+		t.Errorf("0 %s -4294967296 = %d, want -4294967296", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != -1 {
-		t.Errorf("0 + -1 = %d, want -1", r)
+		t.Errorf("0 %s -1 = %d, want -1", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != 0 {
-		t.Errorf("0 + 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 1 {
-		t.Errorf("0 + 1 = %d, want 1", r)
+		t.Errorf("0 %s 1 = %d, want 1", "+", r)
 	}
 	y = 4294967296
 	r = x + y
 	if r != 4294967296 {
-		t.Errorf("0 + 4294967296 = %d, want 4294967296", r)
+		t.Errorf("0 %s 4294967296 = %d, want 4294967296", "+", r)
 	}
 	y = 9223372036854775806
 	r = x + y
 	if r != 9223372036854775806 {
-		t.Errorf("0 + 9223372036854775806 = %d, want 9223372036854775806", r)
+		t.Errorf("0 %s 9223372036854775806 = %d, want 9223372036854775806", "+", r)
 	}
 	y = 9223372036854775807
 	r = x + y
 	if r != 9223372036854775807 {
-		t.Errorf("0 + 9223372036854775807 = %d, want 9223372036854775807", r)
+		t.Errorf("0 %s 9223372036854775807 = %d, want 9223372036854775807", "+", r)
 	}
 	x = 1
 	y = -9223372036854775808
 	r = x + y
 	if r != -9223372036854775807 {
-		t.Errorf("1 + -9223372036854775808 = %d, want -9223372036854775807", r)
+		t.Errorf("1 %s -9223372036854775808 = %d, want -9223372036854775807", "+", r)
 	}
 	y = -9223372036854775807
 	r = x + y
 	if r != -9223372036854775806 {
-		t.Errorf("1 + -9223372036854775807 = %d, want -9223372036854775806", r)
+		t.Errorf("1 %s -9223372036854775807 = %d, want -9223372036854775806", "+", r)
 	}
 	y = -4294967296
 	r = x + y
 	if r != -4294967295 {
-		t.Errorf("1 + -4294967296 = %d, want -4294967295", r)
+		t.Errorf("1 %s -4294967296 = %d, want -4294967295", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != 0 {
-		t.Errorf("1 + -1 = %d, want 0", r)
+		t.Errorf("1 %s -1 = %d, want 0", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != 1 {
-		t.Errorf("1 + 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 2 {
-		t.Errorf("1 + 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "+", r)
 	}
 	y = 4294967296
 	r = x + y
 	if r != 4294967297 {
-		t.Errorf("1 + 4294967296 = %d, want 4294967297", r)
+		t.Errorf("1 %s 4294967296 = %d, want 4294967297", "+", r)
 	}
 	y = 9223372036854775806
 	r = x + y
 	if r != 9223372036854775807 {
-		t.Errorf("1 + 9223372036854775806 = %d, want 9223372036854775807", r)
+		t.Errorf("1 %s 9223372036854775806 = %d, want 9223372036854775807", "+", r)
 	}
 	y = 9223372036854775807
 	r = x + y
 	if r != -9223372036854775808 {
-		t.Errorf("1 + 9223372036854775807 = %d, want -9223372036854775808", r)
+		t.Errorf("1 %s 9223372036854775807 = %d, want -9223372036854775808", "+", r)
 	}
 	x = 4294967296
 	y = -9223372036854775808
 	r = x + y
 	if r != -9223372032559808512 {
-		t.Errorf("4294967296 + -9223372036854775808 = %d, want -9223372032559808512", r)
+		t.Errorf("4294967296 %s -9223372036854775808 = %d, want -9223372032559808512", "+", r)
 	}
 	y = -9223372036854775807
 	r = x + y
 	if r != -9223372032559808511 {
-		t.Errorf("4294967296 + -9223372036854775807 = %d, want -9223372032559808511", r)
+		t.Errorf("4294967296 %s -9223372036854775807 = %d, want -9223372032559808511", "+", r)
 	}
 	y = -4294967296
 	r = x + y
 	if r != 0 {
-		t.Errorf("4294967296 + -4294967296 = %d, want 0", r)
+		t.Errorf("4294967296 %s -4294967296 = %d, want 0", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != 4294967295 {
-		t.Errorf("4294967296 + -1 = %d, want 4294967295", r)
+		t.Errorf("4294967296 %s -1 = %d, want 4294967295", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != 4294967296 {
-		t.Errorf("4294967296 + 0 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 0 = %d, want 4294967296", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 4294967297 {
-		t.Errorf("4294967296 + 1 = %d, want 4294967297", r)
+		t.Errorf("4294967296 %s 1 = %d, want 4294967297", "+", r)
 	}
 	y = 4294967296
 	r = x + y
 	if r != 8589934592 {
-		t.Errorf("4294967296 + 4294967296 = %d, want 8589934592", r)
+		t.Errorf("4294967296 %s 4294967296 = %d, want 8589934592", "+", r)
 	}
 	y = 9223372036854775806
 	r = x + y
 	if r != -9223372032559808514 {
-		t.Errorf("4294967296 + 9223372036854775806 = %d, want -9223372032559808514", r)
+		t.Errorf("4294967296 %s 9223372036854775806 = %d, want -9223372032559808514", "+", r)
 	}
 	y = 9223372036854775807
 	r = x + y
 	if r != -9223372032559808513 {
-		t.Errorf("4294967296 + 9223372036854775807 = %d, want -9223372032559808513", r)
+		t.Errorf("4294967296 %s 9223372036854775807 = %d, want -9223372032559808513", "+", r)
 	}
 	x = 9223372036854775806
 	y = -9223372036854775808
 	r = x + y
 	if r != -2 {
-		t.Errorf("9223372036854775806 + -9223372036854775808 = %d, want -2", r)
+		t.Errorf("9223372036854775806 %s -9223372036854775808 = %d, want -2", "+", r)
 	}
 	y = -9223372036854775807
 	r = x + y
 	if r != -1 {
-		t.Errorf("9223372036854775806 + -9223372036854775807 = %d, want -1", r)
+		t.Errorf("9223372036854775806 %s -9223372036854775807 = %d, want -1", "+", r)
 	}
 	y = -4294967296
 	r = x + y
 	if r != 9223372032559808510 {
-		t.Errorf("9223372036854775806 + -4294967296 = %d, want 9223372032559808510", r)
+		t.Errorf("9223372036854775806 %s -4294967296 = %d, want 9223372032559808510", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != 9223372036854775805 {
-		t.Errorf("9223372036854775806 + -1 = %d, want 9223372036854775805", r)
+		t.Errorf("9223372036854775806 %s -1 = %d, want 9223372036854775805", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != 9223372036854775806 {
-		t.Errorf("9223372036854775806 + 0 = %d, want 9223372036854775806", r)
+		t.Errorf("9223372036854775806 %s 0 = %d, want 9223372036854775806", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 9223372036854775807 {
-		t.Errorf("9223372036854775806 + 1 = %d, want 9223372036854775807", r)
+		t.Errorf("9223372036854775806 %s 1 = %d, want 9223372036854775807", "+", r)
 	}
 	y = 4294967296
 	r = x + y
 	if r != -9223372032559808514 {
-		t.Errorf("9223372036854775806 + 4294967296 = %d, want -9223372032559808514", r)
+		t.Errorf("9223372036854775806 %s 4294967296 = %d, want -9223372032559808514", "+", r)
 	}
 	y = 9223372036854775806
 	r = x + y
 	if r != -4 {
-		t.Errorf("9223372036854775806 + 9223372036854775806 = %d, want -4", r)
+		t.Errorf("9223372036854775806 %s 9223372036854775806 = %d, want -4", "+", r)
 	}
 	y = 9223372036854775807
 	r = x + y
 	if r != -3 {
-		t.Errorf("9223372036854775806 + 9223372036854775807 = %d, want -3", r)
+		t.Errorf("9223372036854775806 %s 9223372036854775807 = %d, want -3", "+", r)
 	}
 	x = 9223372036854775807
 	y = -9223372036854775808
 	r = x + y
 	if r != -1 {
-		t.Errorf("9223372036854775807 + -9223372036854775808 = %d, want -1", r)
+		t.Errorf("9223372036854775807 %s -9223372036854775808 = %d, want -1", "+", r)
 	}
 	y = -9223372036854775807
 	r = x + y
 	if r != 0 {
-		t.Errorf("9223372036854775807 + -9223372036854775807 = %d, want 0", r)
+		t.Errorf("9223372036854775807 %s -9223372036854775807 = %d, want 0", "+", r)
 	}
 	y = -4294967296
 	r = x + y
 	if r != 9223372032559808511 {
-		t.Errorf("9223372036854775807 + -4294967296 = %d, want 9223372032559808511", r)
+		t.Errorf("9223372036854775807 %s -4294967296 = %d, want 9223372032559808511", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != 9223372036854775806 {
-		t.Errorf("9223372036854775807 + -1 = %d, want 9223372036854775806", r)
+		t.Errorf("9223372036854775807 %s -1 = %d, want 9223372036854775806", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != 9223372036854775807 {
-		t.Errorf("9223372036854775807 + 0 = %d, want 9223372036854775807", r)
+		t.Errorf("9223372036854775807 %s 0 = %d, want 9223372036854775807", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != -9223372036854775808 {
-		t.Errorf("9223372036854775807 + 1 = %d, want -9223372036854775808", r)
+		t.Errorf("9223372036854775807 %s 1 = %d, want -9223372036854775808", "+", r)
 	}
 	y = 4294967296
 	r = x + y
 	if r != -9223372032559808513 {
-		t.Errorf("9223372036854775807 + 4294967296 = %d, want -9223372032559808513", r)
+		t.Errorf("9223372036854775807 %s 4294967296 = %d, want -9223372032559808513", "+", r)
 	}
 	y = 9223372036854775806
 	r = x + y
 	if r != -3 {
-		t.Errorf("9223372036854775807 + 9223372036854775806 = %d, want -3", r)
+		t.Errorf("9223372036854775807 %s 9223372036854775806 = %d, want -3", "+", r)
 	}
 	y = 9223372036854775807
 	r = x + y
 	if r != -2 {
-		t.Errorf("9223372036854775807 + 9223372036854775807 = %d, want -2", r)
+		t.Errorf("9223372036854775807 %s 9223372036854775807 = %d, want -2", "+", r)
 	}
 }
 func TestConstFoldint64sub(t *testing.T) {
@@ -820,415 +820,415 @@ func TestConstFoldint64sub(t *testing.T) {
 	y = -9223372036854775808
 	r = x - y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 - -9223372036854775808 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s -9223372036854775808 = %d, want 0", "-", r)
 	}
 	y = -9223372036854775807
 	r = x - y
 	if r != -1 {
-		t.Errorf("-9223372036854775808 - -9223372036854775807 = %d, want -1", r)
+		t.Errorf("-9223372036854775808 %s -9223372036854775807 = %d, want -1", "-", r)
 	}
 	y = -4294967296
 	r = x - y
 	if r != -9223372032559808512 {
-		t.Errorf("-9223372036854775808 - -4294967296 = %d, want -9223372032559808512", r)
+		t.Errorf("-9223372036854775808 %s -4294967296 = %d, want -9223372032559808512", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != -9223372036854775807 {
-		t.Errorf("-9223372036854775808 - -1 = %d, want -9223372036854775807", r)
+		t.Errorf("-9223372036854775808 %s -1 = %d, want -9223372036854775807", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != -9223372036854775808 {
-		t.Errorf("-9223372036854775808 - 0 = %d, want -9223372036854775808", r)
+		t.Errorf("-9223372036854775808 %s 0 = %d, want -9223372036854775808", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 9223372036854775807 {
-		t.Errorf("-9223372036854775808 - 1 = %d, want 9223372036854775807", r)
+		t.Errorf("-9223372036854775808 %s 1 = %d, want 9223372036854775807", "-", r)
 	}
 	y = 4294967296
 	r = x - y
 	if r != 9223372032559808512 {
-		t.Errorf("-9223372036854775808 - 4294967296 = %d, want 9223372032559808512", r)
+		t.Errorf("-9223372036854775808 %s 4294967296 = %d, want 9223372032559808512", "-", r)
 	}
 	y = 9223372036854775806
 	r = x - y
 	if r != 2 {
-		t.Errorf("-9223372036854775808 - 9223372036854775806 = %d, want 2", r)
+		t.Errorf("-9223372036854775808 %s 9223372036854775806 = %d, want 2", "-", r)
 	}
 	y = 9223372036854775807
 	r = x - y
 	if r != 1 {
-		t.Errorf("-9223372036854775808 - 9223372036854775807 = %d, want 1", r)
+		t.Errorf("-9223372036854775808 %s 9223372036854775807 = %d, want 1", "-", r)
 	}
 	x = -9223372036854775807
 	y = -9223372036854775808
 	r = x - y
 	if r != 1 {
-		t.Errorf("-9223372036854775807 - -9223372036854775808 = %d, want 1", r)
+		t.Errorf("-9223372036854775807 %s -9223372036854775808 = %d, want 1", "-", r)
 	}
 	y = -9223372036854775807
 	r = x - y
 	if r != 0 {
-		t.Errorf("-9223372036854775807 - -9223372036854775807 = %d, want 0", r)
+		t.Errorf("-9223372036854775807 %s -9223372036854775807 = %d, want 0", "-", r)
 	}
 	y = -4294967296
 	r = x - y
 	if r != -9223372032559808511 {
-		t.Errorf("-9223372036854775807 - -4294967296 = %d, want -9223372032559808511", r)
+		t.Errorf("-9223372036854775807 %s -4294967296 = %d, want -9223372032559808511", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != -9223372036854775806 {
-		t.Errorf("-9223372036854775807 - -1 = %d, want -9223372036854775806", r)
+		t.Errorf("-9223372036854775807 %s -1 = %d, want -9223372036854775806", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != -9223372036854775807 {
-		t.Errorf("-9223372036854775807 - 0 = %d, want -9223372036854775807", r)
+		t.Errorf("-9223372036854775807 %s 0 = %d, want -9223372036854775807", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != -9223372036854775808 {
-		t.Errorf("-9223372036854775807 - 1 = %d, want -9223372036854775808", r)
+		t.Errorf("-9223372036854775807 %s 1 = %d, want -9223372036854775808", "-", r)
 	}
 	y = 4294967296
 	r = x - y
 	if r != 9223372032559808513 {
-		t.Errorf("-9223372036854775807 - 4294967296 = %d, want 9223372032559808513", r)
+		t.Errorf("-9223372036854775807 %s 4294967296 = %d, want 9223372032559808513", "-", r)
 	}
 	y = 9223372036854775806
 	r = x - y
 	if r != 3 {
-		t.Errorf("-9223372036854775807 - 9223372036854775806 = %d, want 3", r)
+		t.Errorf("-9223372036854775807 %s 9223372036854775806 = %d, want 3", "-", r)
 	}
 	y = 9223372036854775807
 	r = x - y
 	if r != 2 {
-		t.Errorf("-9223372036854775807 - 9223372036854775807 = %d, want 2", r)
+		t.Errorf("-9223372036854775807 %s 9223372036854775807 = %d, want 2", "-", r)
 	}
 	x = -4294967296
 	y = -9223372036854775808
 	r = x - y
 	if r != 9223372032559808512 {
-		t.Errorf("-4294967296 - -9223372036854775808 = %d, want 9223372032559808512", r)
+		t.Errorf("-4294967296 %s -9223372036854775808 = %d, want 9223372032559808512", "-", r)
 	}
 	y = -9223372036854775807
 	r = x - y
 	if r != 9223372032559808511 {
-		t.Errorf("-4294967296 - -9223372036854775807 = %d, want 9223372032559808511", r)
+		t.Errorf("-4294967296 %s -9223372036854775807 = %d, want 9223372032559808511", "-", r)
 	}
 	y = -4294967296
 	r = x - y
 	if r != 0 {
-		t.Errorf("-4294967296 - -4294967296 = %d, want 0", r)
+		t.Errorf("-4294967296 %s -4294967296 = %d, want 0", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != -4294967295 {
-		t.Errorf("-4294967296 - -1 = %d, want -4294967295", r)
+		t.Errorf("-4294967296 %s -1 = %d, want -4294967295", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != -4294967296 {
-		t.Errorf("-4294967296 - 0 = %d, want -4294967296", r)
+		t.Errorf("-4294967296 %s 0 = %d, want -4294967296", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != -4294967297 {
-		t.Errorf("-4294967296 - 1 = %d, want -4294967297", r)
+		t.Errorf("-4294967296 %s 1 = %d, want -4294967297", "-", r)
 	}
 	y = 4294967296
 	r = x - y
 	if r != -8589934592 {
-		t.Errorf("-4294967296 - 4294967296 = %d, want -8589934592", r)
+		t.Errorf("-4294967296 %s 4294967296 = %d, want -8589934592", "-", r)
 	}
 	y = 9223372036854775806
 	r = x - y
 	if r != 9223372032559808514 {
-		t.Errorf("-4294967296 - 9223372036854775806 = %d, want 9223372032559808514", r)
+		t.Errorf("-4294967296 %s 9223372036854775806 = %d, want 9223372032559808514", "-", r)
 	}
 	y = 9223372036854775807
 	r = x - y
 	if r != 9223372032559808513 {
-		t.Errorf("-4294967296 - 9223372036854775807 = %d, want 9223372032559808513", r)
+		t.Errorf("-4294967296 %s 9223372036854775807 = %d, want 9223372032559808513", "-", r)
 	}
 	x = -1
 	y = -9223372036854775808
 	r = x - y
 	if r != 9223372036854775807 {
-		t.Errorf("-1 - -9223372036854775808 = %d, want 9223372036854775807", r)
+		t.Errorf("-1 %s -9223372036854775808 = %d, want 9223372036854775807", "-", r)
 	}
 	y = -9223372036854775807
 	r = x - y
 	if r != 9223372036854775806 {
-		t.Errorf("-1 - -9223372036854775807 = %d, want 9223372036854775806", r)
+		t.Errorf("-1 %s -9223372036854775807 = %d, want 9223372036854775806", "-", r)
 	}
 	y = -4294967296
 	r = x - y
 	if r != 4294967295 {
-		t.Errorf("-1 - -4294967296 = %d, want 4294967295", r)
+		t.Errorf("-1 %s -4294967296 = %d, want 4294967295", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != 0 {
-		t.Errorf("-1 - -1 = %d, want 0", r)
+		t.Errorf("-1 %s -1 = %d, want 0", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != -1 {
-		t.Errorf("-1 - 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != -2 {
-		t.Errorf("-1 - 1 = %d, want -2", r)
+		t.Errorf("-1 %s 1 = %d, want -2", "-", r)
 	}
 	y = 4294967296
 	r = x - y
 	if r != -4294967297 {
-		t.Errorf("-1 - 4294967296 = %d, want -4294967297", r)
+		t.Errorf("-1 %s 4294967296 = %d, want -4294967297", "-", r)
 	}
 	y = 9223372036854775806
 	r = x - y
 	if r != -9223372036854775807 {
-		t.Errorf("-1 - 9223372036854775806 = %d, want -9223372036854775807", r)
+		t.Errorf("-1 %s 9223372036854775806 = %d, want -9223372036854775807", "-", r)
 	}
 	y = 9223372036854775807
 	r = x - y
 	if r != -9223372036854775808 {
-		t.Errorf("-1 - 9223372036854775807 = %d, want -9223372036854775808", r)
+		t.Errorf("-1 %s 9223372036854775807 = %d, want -9223372036854775808", "-", r)
 	}
 	x = 0
 	y = -9223372036854775808
 	r = x - y
 	if r != -9223372036854775808 {
-		t.Errorf("0 - -9223372036854775808 = %d, want -9223372036854775808", r)
+		t.Errorf("0 %s -9223372036854775808 = %d, want -9223372036854775808", "-", r)
 	}
 	y = -9223372036854775807
 	r = x - y
 	if r != 9223372036854775807 {
-		t.Errorf("0 - -9223372036854775807 = %d, want 9223372036854775807", r)
+		t.Errorf("0 %s -9223372036854775807 = %d, want 9223372036854775807", "-", r)
 	}
 	y = -4294967296
 	r = x - y
 	if r != 4294967296 {
-		t.Errorf("0 - -4294967296 = %d, want 4294967296", r)
+		t.Errorf("0 %s -4294967296 = %d, want 4294967296", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != 1 {
-		t.Errorf("0 - -1 = %d, want 1", r)
+		t.Errorf("0 %s -1 = %d, want 1", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != 0 {
-		t.Errorf("0 - 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != -1 {
-		t.Errorf("0 - 1 = %d, want -1", r)
+		t.Errorf("0 %s 1 = %d, want -1", "-", r)
 	}
 	y = 4294967296
 	r = x - y
 	if r != -4294967296 {
-		t.Errorf("0 - 4294967296 = %d, want -4294967296", r)
+		t.Errorf("0 %s 4294967296 = %d, want -4294967296", "-", r)
 	}
 	y = 9223372036854775806
 	r = x - y
 	if r != -9223372036854775806 {
-		t.Errorf("0 - 9223372036854775806 = %d, want -9223372036854775806", r)
+		t.Errorf("0 %s 9223372036854775806 = %d, want -9223372036854775806", "-", r)
 	}
 	y = 9223372036854775807
 	r = x - y
 	if r != -9223372036854775807 {
-		t.Errorf("0 - 9223372036854775807 = %d, want -9223372036854775807", r)
+		t.Errorf("0 %s 9223372036854775807 = %d, want -9223372036854775807", "-", r)
 	}
 	x = 1
 	y = -9223372036854775808
 	r = x - y
 	if r != -9223372036854775807 {
-		t.Errorf("1 - -9223372036854775808 = %d, want -9223372036854775807", r)
+		t.Errorf("1 %s -9223372036854775808 = %d, want -9223372036854775807", "-", r)
 	}
 	y = -9223372036854775807
 	r = x - y
 	if r != -9223372036854775808 {
-		t.Errorf("1 - -9223372036854775807 = %d, want -9223372036854775808", r)
+		t.Errorf("1 %s -9223372036854775807 = %d, want -9223372036854775808", "-", r)
 	}
 	y = -4294967296
 	r = x - y
 	if r != 4294967297 {
-		t.Errorf("1 - -4294967296 = %d, want 4294967297", r)
+		t.Errorf("1 %s -4294967296 = %d, want 4294967297", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != 2 {
-		t.Errorf("1 - -1 = %d, want 2", r)
+		t.Errorf("1 %s -1 = %d, want 2", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != 1 {
-		t.Errorf("1 - 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 0 {
-		t.Errorf("1 - 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", "-", r)
 	}
 	y = 4294967296
 	r = x - y
 	if r != -4294967295 {
-		t.Errorf("1 - 4294967296 = %d, want -4294967295", r)
+		t.Errorf("1 %s 4294967296 = %d, want -4294967295", "-", r)
 	}
 	y = 9223372036854775806
 	r = x - y
 	if r != -9223372036854775805 {
-		t.Errorf("1 - 9223372036854775806 = %d, want -9223372036854775805", r)
+		t.Errorf("1 %s 9223372036854775806 = %d, want -9223372036854775805", "-", r)
 	}
 	y = 9223372036854775807
 	r = x - y
 	if r != -9223372036854775806 {
-		t.Errorf("1 - 9223372036854775807 = %d, want -9223372036854775806", r)
+		t.Errorf("1 %s 9223372036854775807 = %d, want -9223372036854775806", "-", r)
 	}
 	x = 4294967296
 	y = -9223372036854775808
 	r = x - y
 	if r != -9223372032559808512 {
-		t.Errorf("4294967296 - -9223372036854775808 = %d, want -9223372032559808512", r)
+		t.Errorf("4294967296 %s -9223372036854775808 = %d, want -9223372032559808512", "-", r)
 	}
 	y = -9223372036854775807
 	r = x - y
 	if r != -9223372032559808513 {
-		t.Errorf("4294967296 - -9223372036854775807 = %d, want -9223372032559808513", r)
+		t.Errorf("4294967296 %s -9223372036854775807 = %d, want -9223372032559808513", "-", r)
 	}
 	y = -4294967296
 	r = x - y
 	if r != 8589934592 {
-		t.Errorf("4294967296 - -4294967296 = %d, want 8589934592", r)
+		t.Errorf("4294967296 %s -4294967296 = %d, want 8589934592", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != 4294967297 {
-		t.Errorf("4294967296 - -1 = %d, want 4294967297", r)
+		t.Errorf("4294967296 %s -1 = %d, want 4294967297", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != 4294967296 {
-		t.Errorf("4294967296 - 0 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 0 = %d, want 4294967296", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 4294967295 {
-		t.Errorf("4294967296 - 1 = %d, want 4294967295", r)
+		t.Errorf("4294967296 %s 1 = %d, want 4294967295", "-", r)
 	}
 	y = 4294967296
 	r = x - y
 	if r != 0 {
-		t.Errorf("4294967296 - 4294967296 = %d, want 0", r)
+		t.Errorf("4294967296 %s 4294967296 = %d, want 0", "-", r)
 	}
 	y = 9223372036854775806
 	r = x - y
 	if r != -9223372032559808510 {
-		t.Errorf("4294967296 - 9223372036854775806 = %d, want -9223372032559808510", r)
+		t.Errorf("4294967296 %s 9223372036854775806 = %d, want -9223372032559808510", "-", r)
 	}
 	y = 9223372036854775807
 	r = x - y
 	if r != -9223372032559808511 {
-		t.Errorf("4294967296 - 9223372036854775807 = %d, want -9223372032559808511", r)
+		t.Errorf("4294967296 %s 9223372036854775807 = %d, want -9223372032559808511", "-", r)
 	}
 	x = 9223372036854775806
 	y = -9223372036854775808
 	r = x - y
 	if r != -2 {
-		t.Errorf("9223372036854775806 - -9223372036854775808 = %d, want -2", r)
+		t.Errorf("9223372036854775806 %s -9223372036854775808 = %d, want -2", "-", r)
 	}
 	y = -9223372036854775807
 	r = x - y
 	if r != -3 {
-		t.Errorf("9223372036854775806 - -9223372036854775807 = %d, want -3", r)
+		t.Errorf("9223372036854775806 %s -9223372036854775807 = %d, want -3", "-", r)
 	}
 	y = -4294967296
 	r = x - y
 	if r != -9223372032559808514 {
-		t.Errorf("9223372036854775806 - -4294967296 = %d, want -9223372032559808514", r)
+		t.Errorf("9223372036854775806 %s -4294967296 = %d, want -9223372032559808514", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != 9223372036854775807 {
-		t.Errorf("9223372036854775806 - -1 = %d, want 9223372036854775807", r)
+		t.Errorf("9223372036854775806 %s -1 = %d, want 9223372036854775807", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != 9223372036854775806 {
-		t.Errorf("9223372036854775806 - 0 = %d, want 9223372036854775806", r)
+		t.Errorf("9223372036854775806 %s 0 = %d, want 9223372036854775806", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 9223372036854775805 {
-		t.Errorf("9223372036854775806 - 1 = %d, want 9223372036854775805", r)
+		t.Errorf("9223372036854775806 %s 1 = %d, want 9223372036854775805", "-", r)
 	}
 	y = 4294967296
 	r = x - y
 	if r != 9223372032559808510 {
-		t.Errorf("9223372036854775806 - 4294967296 = %d, want 9223372032559808510", r)
+		t.Errorf("9223372036854775806 %s 4294967296 = %d, want 9223372032559808510", "-", r)
 	}
 	y = 9223372036854775806
 	r = x - y
 	if r != 0 {
-		t.Errorf("9223372036854775806 - 9223372036854775806 = %d, want 0", r)
+		t.Errorf("9223372036854775806 %s 9223372036854775806 = %d, want 0", "-", r)
 	}
 	y = 9223372036854775807
 	r = x - y
 	if r != -1 {
-		t.Errorf("9223372036854775806 - 9223372036854775807 = %d, want -1", r)
+		t.Errorf("9223372036854775806 %s 9223372036854775807 = %d, want -1", "-", r)
 	}
 	x = 9223372036854775807
 	y = -9223372036854775808
 	r = x - y
 	if r != -1 {
-		t.Errorf("9223372036854775807 - -9223372036854775808 = %d, want -1", r)
+		t.Errorf("9223372036854775807 %s -9223372036854775808 = %d, want -1", "-", r)
 	}
 	y = -9223372036854775807
 	r = x - y
 	if r != -2 {
-		t.Errorf("9223372036854775807 - -9223372036854775807 = %d, want -2", r)
+		t.Errorf("9223372036854775807 %s -9223372036854775807 = %d, want -2", "-", r)
 	}
 	y = -4294967296
 	r = x - y
 	if r != -9223372032559808513 {
-		t.Errorf("9223372036854775807 - -4294967296 = %d, want -9223372032559808513", r)
+		t.Errorf("9223372036854775807 %s -4294967296 = %d, want -9223372032559808513", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != -9223372036854775808 {
-		t.Errorf("9223372036854775807 - -1 = %d, want -9223372036854775808", r)
+		t.Errorf("9223372036854775807 %s -1 = %d, want -9223372036854775808", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != 9223372036854775807 {
-		t.Errorf("9223372036854775807 - 0 = %d, want 9223372036854775807", r)
+		t.Errorf("9223372036854775807 %s 0 = %d, want 9223372036854775807", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 9223372036854775806 {
-		t.Errorf("9223372036854775807 - 1 = %d, want 9223372036854775806", r)
+		t.Errorf("9223372036854775807 %s 1 = %d, want 9223372036854775806", "-", r)
 	}
 	y = 4294967296
 	r = x - y
 	if r != 9223372032559808511 {
-		t.Errorf("9223372036854775807 - 4294967296 = %d, want 9223372032559808511", r)
+		t.Errorf("9223372036854775807 %s 4294967296 = %d, want 9223372032559808511", "-", r)
 	}
 	y = 9223372036854775806
 	r = x - y
 	if r != 1 {
-		t.Errorf("9223372036854775807 - 9223372036854775806 = %d, want 1", r)
+		t.Errorf("9223372036854775807 %s 9223372036854775806 = %d, want 1", "-", r)
 	}
 	y = 9223372036854775807
 	r = x - y
 	if r != 0 {
-		t.Errorf("9223372036854775807 - 9223372036854775807 = %d, want 0", r)
+		t.Errorf("9223372036854775807 %s 9223372036854775807 = %d, want 0", "-", r)
 	}
 }
 func TestConstFoldint64div(t *testing.T) {
@@ -1237,370 +1237,370 @@ func TestConstFoldint64div(t *testing.T) {
 	y = -9223372036854775808
 	r = x / y
 	if r != 1 {
-		t.Errorf("-9223372036854775808 / -9223372036854775808 = %d, want 1", r)
+		t.Errorf("-9223372036854775808 %s -9223372036854775808 = %d, want 1", "/", r)
 	}
 	y = -9223372036854775807
 	r = x / y
 	if r != 1 {
-		t.Errorf("-9223372036854775808 / -9223372036854775807 = %d, want 1", r)
+		t.Errorf("-9223372036854775808 %s -9223372036854775807 = %d, want 1", "/", r)
 	}
 	y = -4294967296
 	r = x / y
 	if r != 2147483648 {
-		t.Errorf("-9223372036854775808 / -4294967296 = %d, want 2147483648", r)
+		t.Errorf("-9223372036854775808 %s -4294967296 = %d, want 2147483648", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != -9223372036854775808 {
-		t.Errorf("-9223372036854775808 / -1 = %d, want -9223372036854775808", r)
+		t.Errorf("-9223372036854775808 %s -1 = %d, want -9223372036854775808", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != -9223372036854775808 {
-		t.Errorf("-9223372036854775808 / 1 = %d, want -9223372036854775808", r)
+		t.Errorf("-9223372036854775808 %s 1 = %d, want -9223372036854775808", "/", r)
 	}
 	y = 4294967296
 	r = x / y
 	if r != -2147483648 {
-		t.Errorf("-9223372036854775808 / 4294967296 = %d, want -2147483648", r)
+		t.Errorf("-9223372036854775808 %s 4294967296 = %d, want -2147483648", "/", r)
 	}
 	y = 9223372036854775806
 	r = x / y
 	if r != -1 {
-		t.Errorf("-9223372036854775808 / 9223372036854775806 = %d, want -1", r)
+		t.Errorf("-9223372036854775808 %s 9223372036854775806 = %d, want -1", "/", r)
 	}
 	y = 9223372036854775807
 	r = x / y
 	if r != -1 {
-		t.Errorf("-9223372036854775808 / 9223372036854775807 = %d, want -1", r)
+		t.Errorf("-9223372036854775808 %s 9223372036854775807 = %d, want -1", "/", r)
 	}
 	x = -9223372036854775807
 	y = -9223372036854775808
 	r = x / y
 	if r != 0 {
-		t.Errorf("-9223372036854775807 / -9223372036854775808 = %d, want 0", r)
+		t.Errorf("-9223372036854775807 %s -9223372036854775808 = %d, want 0", "/", r)
 	}
 	y = -9223372036854775807
 	r = x / y
 	if r != 1 {
-		t.Errorf("-9223372036854775807 / -9223372036854775807 = %d, want 1", r)
+		t.Errorf("-9223372036854775807 %s -9223372036854775807 = %d, want 1", "/", r)
 	}
 	y = -4294967296
 	r = x / y
 	if r != 2147483647 {
-		t.Errorf("-9223372036854775807 / -4294967296 = %d, want 2147483647", r)
+		t.Errorf("-9223372036854775807 %s -4294967296 = %d, want 2147483647", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != 9223372036854775807 {
-		t.Errorf("-9223372036854775807 / -1 = %d, want 9223372036854775807", r)
+		t.Errorf("-9223372036854775807 %s -1 = %d, want 9223372036854775807", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != -9223372036854775807 {
-		t.Errorf("-9223372036854775807 / 1 = %d, want -9223372036854775807", r)
+		t.Errorf("-9223372036854775807 %s 1 = %d, want -9223372036854775807", "/", r)
 	}
 	y = 4294967296
 	r = x / y
 	if r != -2147483647 {
-		t.Errorf("-9223372036854775807 / 4294967296 = %d, want -2147483647", r)
+		t.Errorf("-9223372036854775807 %s 4294967296 = %d, want -2147483647", "/", r)
 	}
 	y = 9223372036854775806
 	r = x / y
 	if r != -1 {
-		t.Errorf("-9223372036854775807 / 9223372036854775806 = %d, want -1", r)
+		t.Errorf("-9223372036854775807 %s 9223372036854775806 = %d, want -1", "/", r)
 	}
 	y = 9223372036854775807
 	r = x / y
 	if r != -1 {
-		t.Errorf("-9223372036854775807 / 9223372036854775807 = %d, want -1", r)
+		t.Errorf("-9223372036854775807 %s 9223372036854775807 = %d, want -1", "/", r)
 	}
 	x = -4294967296
 	y = -9223372036854775808
 	r = x / y
 	if r != 0 {
-		t.Errorf("-4294967296 / -9223372036854775808 = %d, want 0", r)
+		t.Errorf("-4294967296 %s -9223372036854775808 = %d, want 0", "/", r)
 	}
 	y = -9223372036854775807
 	r = x / y
 	if r != 0 {
-		t.Errorf("-4294967296 / -9223372036854775807 = %d, want 0", r)
+		t.Errorf("-4294967296 %s -9223372036854775807 = %d, want 0", "/", r)
 	}
 	y = -4294967296
 	r = x / y
 	if r != 1 {
-		t.Errorf("-4294967296 / -4294967296 = %d, want 1", r)
+		t.Errorf("-4294967296 %s -4294967296 = %d, want 1", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != 4294967296 {
-		t.Errorf("-4294967296 / -1 = %d, want 4294967296", r)
+		t.Errorf("-4294967296 %s -1 = %d, want 4294967296", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != -4294967296 {
-		t.Errorf("-4294967296 / 1 = %d, want -4294967296", r)
+		t.Errorf("-4294967296 %s 1 = %d, want -4294967296", "/", r)
 	}
 	y = 4294967296
 	r = x / y
 	if r != -1 {
-		t.Errorf("-4294967296 / 4294967296 = %d, want -1", r)
+		t.Errorf("-4294967296 %s 4294967296 = %d, want -1", "/", r)
 	}
 	y = 9223372036854775806
 	r = x / y
 	if r != 0 {
-		t.Errorf("-4294967296 / 9223372036854775806 = %d, want 0", r)
+		t.Errorf("-4294967296 %s 9223372036854775806 = %d, want 0", "/", r)
 	}
 	y = 9223372036854775807
 	r = x / y
 	if r != 0 {
-		t.Errorf("-4294967296 / 9223372036854775807 = %d, want 0", r)
+		t.Errorf("-4294967296 %s 9223372036854775807 = %d, want 0", "/", r)
 	}
 	x = -1
 	y = -9223372036854775808
 	r = x / y
 	if r != 0 {
-		t.Errorf("-1 / -9223372036854775808 = %d, want 0", r)
+		t.Errorf("-1 %s -9223372036854775808 = %d, want 0", "/", r)
 	}
 	y = -9223372036854775807
 	r = x / y
 	if r != 0 {
-		t.Errorf("-1 / -9223372036854775807 = %d, want 0", r)
+		t.Errorf("-1 %s -9223372036854775807 = %d, want 0", "/", r)
 	}
 	y = -4294967296
 	r = x / y
 	if r != 0 {
-		t.Errorf("-1 / -4294967296 = %d, want 0", r)
+		t.Errorf("-1 %s -4294967296 = %d, want 0", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != 1 {
-		t.Errorf("-1 / -1 = %d, want 1", r)
+		t.Errorf("-1 %s -1 = %d, want 1", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != -1 {
-		t.Errorf("-1 / 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", "/", r)
 	}
 	y = 4294967296
 	r = x / y
 	if r != 0 {
-		t.Errorf("-1 / 4294967296 = %d, want 0", r)
+		t.Errorf("-1 %s 4294967296 = %d, want 0", "/", r)
 	}
 	y = 9223372036854775806
 	r = x / y
 	if r != 0 {
-		t.Errorf("-1 / 9223372036854775806 = %d, want 0", r)
+		t.Errorf("-1 %s 9223372036854775806 = %d, want 0", "/", r)
 	}
 	y = 9223372036854775807
 	r = x / y
 	if r != 0 {
-		t.Errorf("-1 / 9223372036854775807 = %d, want 0", r)
+		t.Errorf("-1 %s 9223372036854775807 = %d, want 0", "/", r)
 	}
 	x = 0
 	y = -9223372036854775808
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / -9223372036854775808 = %d, want 0", r)
+		t.Errorf("0 %s -9223372036854775808 = %d, want 0", "/", r)
 	}
 	y = -9223372036854775807
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / -9223372036854775807 = %d, want 0", r)
+		t.Errorf("0 %s -9223372036854775807 = %d, want 0", "/", r)
 	}
 	y = -4294967296
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / -4294967296 = %d, want 0", r)
+		t.Errorf("0 %s -4294967296 = %d, want 0", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / -1 = %d, want 0", r)
+		t.Errorf("0 %s -1 = %d, want 0", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "/", r)
 	}
 	y = 4294967296
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", "/", r)
 	}
 	y = 9223372036854775806
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 9223372036854775806 = %d, want 0", r)
+		t.Errorf("0 %s 9223372036854775806 = %d, want 0", "/", r)
 	}
 	y = 9223372036854775807
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 9223372036854775807 = %d, want 0", r)
+		t.Errorf("0 %s 9223372036854775807 = %d, want 0", "/", r)
 	}
 	x = 1
 	y = -9223372036854775808
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / -9223372036854775808 = %d, want 0", r)
+		t.Errorf("1 %s -9223372036854775808 = %d, want 0", "/", r)
 	}
 	y = -9223372036854775807
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / -9223372036854775807 = %d, want 0", r)
+		t.Errorf("1 %s -9223372036854775807 = %d, want 0", "/", r)
 	}
 	y = -4294967296
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / -4294967296 = %d, want 0", r)
+		t.Errorf("1 %s -4294967296 = %d, want 0", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != -1 {
-		t.Errorf("1 / -1 = %d, want -1", r)
+		t.Errorf("1 %s -1 = %d, want -1", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != 1 {
-		t.Errorf("1 / 1 = %d, want 1", r)
+		t.Errorf("1 %s 1 = %d, want 1", "/", r)
 	}
 	y = 4294967296
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / 4294967296 = %d, want 0", r)
+		t.Errorf("1 %s 4294967296 = %d, want 0", "/", r)
 	}
 	y = 9223372036854775806
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / 9223372036854775806 = %d, want 0", r)
+		t.Errorf("1 %s 9223372036854775806 = %d, want 0", "/", r)
 	}
 	y = 9223372036854775807
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / 9223372036854775807 = %d, want 0", r)
+		t.Errorf("1 %s 9223372036854775807 = %d, want 0", "/", r)
 	}
 	x = 4294967296
 	y = -9223372036854775808
 	r = x / y
 	if r != 0 {
-		t.Errorf("4294967296 / -9223372036854775808 = %d, want 0", r)
+		t.Errorf("4294967296 %s -9223372036854775808 = %d, want 0", "/", r)
 	}
 	y = -9223372036854775807
 	r = x / y
 	if r != 0 {
-		t.Errorf("4294967296 / -9223372036854775807 = %d, want 0", r)
+		t.Errorf("4294967296 %s -9223372036854775807 = %d, want 0", "/", r)
 	}
 	y = -4294967296
 	r = x / y
 	if r != -1 {
-		t.Errorf("4294967296 / -4294967296 = %d, want -1", r)
+		t.Errorf("4294967296 %s -4294967296 = %d, want -1", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != -4294967296 {
-		t.Errorf("4294967296 / -1 = %d, want -4294967296", r)
+		t.Errorf("4294967296 %s -1 = %d, want -4294967296", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != 4294967296 {
-		t.Errorf("4294967296 / 1 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 1 = %d, want 4294967296", "/", r)
 	}
 	y = 4294967296
 	r = x / y
 	if r != 1 {
-		t.Errorf("4294967296 / 4294967296 = %d, want 1", r)
+		t.Errorf("4294967296 %s 4294967296 = %d, want 1", "/", r)
 	}
 	y = 9223372036854775806
 	r = x / y
 	if r != 0 {
-		t.Errorf("4294967296 / 9223372036854775806 = %d, want 0", r)
+		t.Errorf("4294967296 %s 9223372036854775806 = %d, want 0", "/", r)
 	}
 	y = 9223372036854775807
 	r = x / y
 	if r != 0 {
-		t.Errorf("4294967296 / 9223372036854775807 = %d, want 0", r)
+		t.Errorf("4294967296 %s 9223372036854775807 = %d, want 0", "/", r)
 	}
 	x = 9223372036854775806
 	y = -9223372036854775808
 	r = x / y
 	if r != 0 {
-		t.Errorf("9223372036854775806 / -9223372036854775808 = %d, want 0", r)
+		t.Errorf("9223372036854775806 %s -9223372036854775808 = %d, want 0", "/", r)
 	}
 	y = -9223372036854775807
 	r = x / y
 	if r != 0 {
-		t.Errorf("9223372036854775806 / -9223372036854775807 = %d, want 0", r)
+		t.Errorf("9223372036854775806 %s -9223372036854775807 = %d, want 0", "/", r)
 	}
 	y = -4294967296
 	r = x / y
 	if r != -2147483647 {
-		t.Errorf("9223372036854775806 / -4294967296 = %d, want -2147483647", r)
+		t.Errorf("9223372036854775806 %s -4294967296 = %d, want -2147483647", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != -9223372036854775806 {
-		t.Errorf("9223372036854775806 / -1 = %d, want -9223372036854775806", r)
+		t.Errorf("9223372036854775806 %s -1 = %d, want -9223372036854775806", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != 9223372036854775806 {
-		t.Errorf("9223372036854775806 / 1 = %d, want 9223372036854775806", r)
+		t.Errorf("9223372036854775806 %s 1 = %d, want 9223372036854775806", "/", r)
 	}
 	y = 4294967296
 	r = x / y
 	if r != 2147483647 {
-		t.Errorf("9223372036854775806 / 4294967296 = %d, want 2147483647", r)
+		t.Errorf("9223372036854775806 %s 4294967296 = %d, want 2147483647", "/", r)
 	}
 	y = 9223372036854775806
 	r = x / y
 	if r != 1 {
-		t.Errorf("9223372036854775806 / 9223372036854775806 = %d, want 1", r)
+		t.Errorf("9223372036854775806 %s 9223372036854775806 = %d, want 1", "/", r)
 	}
 	y = 9223372036854775807
 	r = x / y
 	if r != 0 {
-		t.Errorf("9223372036854775806 / 9223372036854775807 = %d, want 0", r)
+		t.Errorf("9223372036854775806 %s 9223372036854775807 = %d, want 0", "/", r)
 	}
 	x = 9223372036854775807
 	y = -9223372036854775808
 	r = x / y
 	if r != 0 {
-		t.Errorf("9223372036854775807 / -9223372036854775808 = %d, want 0", r)
+		t.Errorf("9223372036854775807 %s -9223372036854775808 = %d, want 0", "/", r)
 	}
 	y = -9223372036854775807
 	r = x / y
 	if r != -1 {
-		t.Errorf("9223372036854775807 / -9223372036854775807 = %d, want -1", r)
+		t.Errorf("9223372036854775807 %s -9223372036854775807 = %d, want -1", "/", r)
 	}
 	y = -4294967296
 	r = x / y
 	if r != -2147483647 {
-		t.Errorf("9223372036854775807 / -4294967296 = %d, want -2147483647", r)
+		t.Errorf("9223372036854775807 %s -4294967296 = %d, want -2147483647", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != -9223372036854775807 {
-		t.Errorf("9223372036854775807 / -1 = %d, want -9223372036854775807", r)
+		t.Errorf("9223372036854775807 %s -1 = %d, want -9223372036854775807", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != 9223372036854775807 {
-		t.Errorf("9223372036854775807 / 1 = %d, want 9223372036854775807", r)
+		t.Errorf("9223372036854775807 %s 1 = %d, want 9223372036854775807", "/", r)
 	}
 	y = 4294967296
 	r = x / y
 	if r != 2147483647 {
-		t.Errorf("9223372036854775807 / 4294967296 = %d, want 2147483647", r)
+		t.Errorf("9223372036854775807 %s 4294967296 = %d, want 2147483647", "/", r)
 	}
 	y = 9223372036854775806
 	r = x / y
 	if r != 1 {
-		t.Errorf("9223372036854775807 / 9223372036854775806 = %d, want 1", r)
+		t.Errorf("9223372036854775807 %s 9223372036854775806 = %d, want 1", "/", r)
 	}
 	y = 9223372036854775807
 	r = x / y
 	if r != 1 {
-		t.Errorf("9223372036854775807 / 9223372036854775807 = %d, want 1", r)
+		t.Errorf("9223372036854775807 %s 9223372036854775807 = %d, want 1", "/", r)
 	}
 }
 func TestConstFoldint64mul(t *testing.T) {
@@ -1609,415 +1609,415 @@ func TestConstFoldint64mul(t *testing.T) {
 	y = -9223372036854775808
 	r = x * y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 * -9223372036854775808 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s -9223372036854775808 = %d, want 0", "*", r)
 	}
 	y = -9223372036854775807
 	r = x * y
 	if r != -9223372036854775808 {
-		t.Errorf("-9223372036854775808 * -9223372036854775807 = %d, want -9223372036854775808", r)
+		t.Errorf("-9223372036854775808 %s -9223372036854775807 = %d, want -9223372036854775808", "*", r)
 	}
 	y = -4294967296
 	r = x * y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 * -4294967296 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s -4294967296 = %d, want 0", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != -9223372036854775808 {
-		t.Errorf("-9223372036854775808 * -1 = %d, want -9223372036854775808", r)
+		t.Errorf("-9223372036854775808 %s -1 = %d, want -9223372036854775808", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 * 0 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != -9223372036854775808 {
-		t.Errorf("-9223372036854775808 * 1 = %d, want -9223372036854775808", r)
+		t.Errorf("-9223372036854775808 %s 1 = %d, want -9223372036854775808", "*", r)
 	}
 	y = 4294967296
 	r = x * y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 * 4294967296 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s 4294967296 = %d, want 0", "*", r)
 	}
 	y = 9223372036854775806
 	r = x * y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 * 9223372036854775806 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s 9223372036854775806 = %d, want 0", "*", r)
 	}
 	y = 9223372036854775807
 	r = x * y
 	if r != -9223372036854775808 {
-		t.Errorf("-9223372036854775808 * 9223372036854775807 = %d, want -9223372036854775808", r)
+		t.Errorf("-9223372036854775808 %s 9223372036854775807 = %d, want -9223372036854775808", "*", r)
 	}
 	x = -9223372036854775807
 	y = -9223372036854775808
 	r = x * y
 	if r != -9223372036854775808 {
-		t.Errorf("-9223372036854775807 * -9223372036854775808 = %d, want -9223372036854775808", r)
+		t.Errorf("-9223372036854775807 %s -9223372036854775808 = %d, want -9223372036854775808", "*", r)
 	}
 	y = -9223372036854775807
 	r = x * y
 	if r != 1 {
-		t.Errorf("-9223372036854775807 * -9223372036854775807 = %d, want 1", r)
+		t.Errorf("-9223372036854775807 %s -9223372036854775807 = %d, want 1", "*", r)
 	}
 	y = -4294967296
 	r = x * y
 	if r != -4294967296 {
-		t.Errorf("-9223372036854775807 * -4294967296 = %d, want -4294967296", r)
+		t.Errorf("-9223372036854775807 %s -4294967296 = %d, want -4294967296", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != 9223372036854775807 {
-		t.Errorf("-9223372036854775807 * -1 = %d, want 9223372036854775807", r)
+		t.Errorf("-9223372036854775807 %s -1 = %d, want 9223372036854775807", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("-9223372036854775807 * 0 = %d, want 0", r)
+		t.Errorf("-9223372036854775807 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != -9223372036854775807 {
-		t.Errorf("-9223372036854775807 * 1 = %d, want -9223372036854775807", r)
+		t.Errorf("-9223372036854775807 %s 1 = %d, want -9223372036854775807", "*", r)
 	}
 	y = 4294967296
 	r = x * y
 	if r != 4294967296 {
-		t.Errorf("-9223372036854775807 * 4294967296 = %d, want 4294967296", r)
+		t.Errorf("-9223372036854775807 %s 4294967296 = %d, want 4294967296", "*", r)
 	}
 	y = 9223372036854775806
 	r = x * y
 	if r != 9223372036854775806 {
-		t.Errorf("-9223372036854775807 * 9223372036854775806 = %d, want 9223372036854775806", r)
+		t.Errorf("-9223372036854775807 %s 9223372036854775806 = %d, want 9223372036854775806", "*", r)
 	}
 	y = 9223372036854775807
 	r = x * y
 	if r != -1 {
-		t.Errorf("-9223372036854775807 * 9223372036854775807 = %d, want -1", r)
+		t.Errorf("-9223372036854775807 %s 9223372036854775807 = %d, want -1", "*", r)
 	}
 	x = -4294967296
 	y = -9223372036854775808
 	r = x * y
 	if r != 0 {
-		t.Errorf("-4294967296 * -9223372036854775808 = %d, want 0", r)
+		t.Errorf("-4294967296 %s -9223372036854775808 = %d, want 0", "*", r)
 	}
 	y = -9223372036854775807
 	r = x * y
 	if r != -4294967296 {
-		t.Errorf("-4294967296 * -9223372036854775807 = %d, want -4294967296", r)
+		t.Errorf("-4294967296 %s -9223372036854775807 = %d, want -4294967296", "*", r)
 	}
 	y = -4294967296
 	r = x * y
 	if r != 0 {
-		t.Errorf("-4294967296 * -4294967296 = %d, want 0", r)
+		t.Errorf("-4294967296 %s -4294967296 = %d, want 0", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != 4294967296 {
-		t.Errorf("-4294967296 * -1 = %d, want 4294967296", r)
+		t.Errorf("-4294967296 %s -1 = %d, want 4294967296", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("-4294967296 * 0 = %d, want 0", r)
+		t.Errorf("-4294967296 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != -4294967296 {
-		t.Errorf("-4294967296 * 1 = %d, want -4294967296", r)
+		t.Errorf("-4294967296 %s 1 = %d, want -4294967296", "*", r)
 	}
 	y = 4294967296
 	r = x * y
 	if r != 0 {
-		t.Errorf("-4294967296 * 4294967296 = %d, want 0", r)
+		t.Errorf("-4294967296 %s 4294967296 = %d, want 0", "*", r)
 	}
 	y = 9223372036854775806
 	r = x * y
 	if r != 8589934592 {
-		t.Errorf("-4294967296 * 9223372036854775806 = %d, want 8589934592", r)
+		t.Errorf("-4294967296 %s 9223372036854775806 = %d, want 8589934592", "*", r)
 	}
 	y = 9223372036854775807
 	r = x * y
 	if r != 4294967296 {
-		t.Errorf("-4294967296 * 9223372036854775807 = %d, want 4294967296", r)
+		t.Errorf("-4294967296 %s 9223372036854775807 = %d, want 4294967296", "*", r)
 	}
 	x = -1
 	y = -9223372036854775808
 	r = x * y
 	if r != -9223372036854775808 {
-		t.Errorf("-1 * -9223372036854775808 = %d, want -9223372036854775808", r)
+		t.Errorf("-1 %s -9223372036854775808 = %d, want -9223372036854775808", "*", r)
 	}
 	y = -9223372036854775807
 	r = x * y
 	if r != 9223372036854775807 {
-		t.Errorf("-1 * -9223372036854775807 = %d, want 9223372036854775807", r)
+		t.Errorf("-1 %s -9223372036854775807 = %d, want 9223372036854775807", "*", r)
 	}
 	y = -4294967296
 	r = x * y
 	if r != 4294967296 {
-		t.Errorf("-1 * -4294967296 = %d, want 4294967296", r)
+		t.Errorf("-1 %s -4294967296 = %d, want 4294967296", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != 1 {
-		t.Errorf("-1 * -1 = %d, want 1", r)
+		t.Errorf("-1 %s -1 = %d, want 1", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("-1 * 0 = %d, want 0", r)
+		t.Errorf("-1 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != -1 {
-		t.Errorf("-1 * 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", "*", r)
 	}
 	y = 4294967296
 	r = x * y
 	if r != -4294967296 {
-		t.Errorf("-1 * 4294967296 = %d, want -4294967296", r)
+		t.Errorf("-1 %s 4294967296 = %d, want -4294967296", "*", r)
 	}
 	y = 9223372036854775806
 	r = x * y
 	if r != -9223372036854775806 {
-		t.Errorf("-1 * 9223372036854775806 = %d, want -9223372036854775806", r)
+		t.Errorf("-1 %s 9223372036854775806 = %d, want -9223372036854775806", "*", r)
 	}
 	y = 9223372036854775807
 	r = x * y
 	if r != -9223372036854775807 {
-		t.Errorf("-1 * 9223372036854775807 = %d, want -9223372036854775807", r)
+		t.Errorf("-1 %s 9223372036854775807 = %d, want -9223372036854775807", "*", r)
 	}
 	x = 0
 	y = -9223372036854775808
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * -9223372036854775808 = %d, want 0", r)
+		t.Errorf("0 %s -9223372036854775808 = %d, want 0", "*", r)
 	}
 	y = -9223372036854775807
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * -9223372036854775807 = %d, want 0", r)
+		t.Errorf("0 %s -9223372036854775807 = %d, want 0", "*", r)
 	}
 	y = -4294967296
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * -4294967296 = %d, want 0", r)
+		t.Errorf("0 %s -4294967296 = %d, want 0", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * -1 = %d, want 0", r)
+		t.Errorf("0 %s -1 = %d, want 0", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "*", r)
 	}
 	y = 4294967296
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", "*", r)
 	}
 	y = 9223372036854775806
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 9223372036854775806 = %d, want 0", r)
+		t.Errorf("0 %s 9223372036854775806 = %d, want 0", "*", r)
 	}
 	y = 9223372036854775807
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 9223372036854775807 = %d, want 0", r)
+		t.Errorf("0 %s 9223372036854775807 = %d, want 0", "*", r)
 	}
 	x = 1
 	y = -9223372036854775808
 	r = x * y
 	if r != -9223372036854775808 {
-		t.Errorf("1 * -9223372036854775808 = %d, want -9223372036854775808", r)
+		t.Errorf("1 %s -9223372036854775808 = %d, want -9223372036854775808", "*", r)
 	}
 	y = -9223372036854775807
 	r = x * y
 	if r != -9223372036854775807 {
-		t.Errorf("1 * -9223372036854775807 = %d, want -9223372036854775807", r)
+		t.Errorf("1 %s -9223372036854775807 = %d, want -9223372036854775807", "*", r)
 	}
 	y = -4294967296
 	r = x * y
 	if r != -4294967296 {
-		t.Errorf("1 * -4294967296 = %d, want -4294967296", r)
+		t.Errorf("1 %s -4294967296 = %d, want -4294967296", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != -1 {
-		t.Errorf("1 * -1 = %d, want -1", r)
+		t.Errorf("1 %s -1 = %d, want -1", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("1 * 0 = %d, want 0", r)
+		t.Errorf("1 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 1 {
-		t.Errorf("1 * 1 = %d, want 1", r)
+		t.Errorf("1 %s 1 = %d, want 1", "*", r)
 	}
 	y = 4294967296
 	r = x * y
 	if r != 4294967296 {
-		t.Errorf("1 * 4294967296 = %d, want 4294967296", r)
+		t.Errorf("1 %s 4294967296 = %d, want 4294967296", "*", r)
 	}
 	y = 9223372036854775806
 	r = x * y
 	if r != 9223372036854775806 {
-		t.Errorf("1 * 9223372036854775806 = %d, want 9223372036854775806", r)
+		t.Errorf("1 %s 9223372036854775806 = %d, want 9223372036854775806", "*", r)
 	}
 	y = 9223372036854775807
 	r = x * y
 	if r != 9223372036854775807 {
-		t.Errorf("1 * 9223372036854775807 = %d, want 9223372036854775807", r)
+		t.Errorf("1 %s 9223372036854775807 = %d, want 9223372036854775807", "*", r)
 	}
 	x = 4294967296
 	y = -9223372036854775808
 	r = x * y
 	if r != 0 {
-		t.Errorf("4294967296 * -9223372036854775808 = %d, want 0", r)
+		t.Errorf("4294967296 %s -9223372036854775808 = %d, want 0", "*", r)
 	}
 	y = -9223372036854775807
 	r = x * y
 	if r != 4294967296 {
-		t.Errorf("4294967296 * -9223372036854775807 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s -9223372036854775807 = %d, want 4294967296", "*", r)
 	}
 	y = -4294967296
 	r = x * y
 	if r != 0 {
-		t.Errorf("4294967296 * -4294967296 = %d, want 0", r)
+		t.Errorf("4294967296 %s -4294967296 = %d, want 0", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != -4294967296 {
-		t.Errorf("4294967296 * -1 = %d, want -4294967296", r)
+		t.Errorf("4294967296 %s -1 = %d, want -4294967296", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("4294967296 * 0 = %d, want 0", r)
+		t.Errorf("4294967296 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 4294967296 {
-		t.Errorf("4294967296 * 1 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 1 = %d, want 4294967296", "*", r)
 	}
 	y = 4294967296
 	r = x * y
 	if r != 0 {
-		t.Errorf("4294967296 * 4294967296 = %d, want 0", r)
+		t.Errorf("4294967296 %s 4294967296 = %d, want 0", "*", r)
 	}
 	y = 9223372036854775806
 	r = x * y
 	if r != -8589934592 {
-		t.Errorf("4294967296 * 9223372036854775806 = %d, want -8589934592", r)
+		t.Errorf("4294967296 %s 9223372036854775806 = %d, want -8589934592", "*", r)
 	}
 	y = 9223372036854775807
 	r = x * y
 	if r != -4294967296 {
-		t.Errorf("4294967296 * 9223372036854775807 = %d, want -4294967296", r)
+		t.Errorf("4294967296 %s 9223372036854775807 = %d, want -4294967296", "*", r)
 	}
 	x = 9223372036854775806
 	y = -9223372036854775808
 	r = x * y
 	if r != 0 {
-		t.Errorf("9223372036854775806 * -9223372036854775808 = %d, want 0", r)
+		t.Errorf("9223372036854775806 %s -9223372036854775808 = %d, want 0", "*", r)
 	}
 	y = -9223372036854775807
 	r = x * y
 	if r != 9223372036854775806 {
-		t.Errorf("9223372036854775806 * -9223372036854775807 = %d, want 9223372036854775806", r)
+		t.Errorf("9223372036854775806 %s -9223372036854775807 = %d, want 9223372036854775806", "*", r)
 	}
 	y = -4294967296
 	r = x * y
 	if r != 8589934592 {
-		t.Errorf("9223372036854775806 * -4294967296 = %d, want 8589934592", r)
+		t.Errorf("9223372036854775806 %s -4294967296 = %d, want 8589934592", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != -9223372036854775806 {
-		t.Errorf("9223372036854775806 * -1 = %d, want -9223372036854775806", r)
+		t.Errorf("9223372036854775806 %s -1 = %d, want -9223372036854775806", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("9223372036854775806 * 0 = %d, want 0", r)
+		t.Errorf("9223372036854775806 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 9223372036854775806 {
-		t.Errorf("9223372036854775806 * 1 = %d, want 9223372036854775806", r)
+		t.Errorf("9223372036854775806 %s 1 = %d, want 9223372036854775806", "*", r)
 	}
 	y = 4294967296
 	r = x * y
 	if r != -8589934592 {
-		t.Errorf("9223372036854775806 * 4294967296 = %d, want -8589934592", r)
+		t.Errorf("9223372036854775806 %s 4294967296 = %d, want -8589934592", "*", r)
 	}
 	y = 9223372036854775806
 	r = x * y
 	if r != 4 {
-		t.Errorf("9223372036854775806 * 9223372036854775806 = %d, want 4", r)
+		t.Errorf("9223372036854775806 %s 9223372036854775806 = %d, want 4", "*", r)
 	}
 	y = 9223372036854775807
 	r = x * y
 	if r != -9223372036854775806 {
-		t.Errorf("9223372036854775806 * 9223372036854775807 = %d, want -9223372036854775806", r)
+		t.Errorf("9223372036854775806 %s 9223372036854775807 = %d, want -9223372036854775806", "*", r)
 	}
 	x = 9223372036854775807
 	y = -9223372036854775808
 	r = x * y
 	if r != -9223372036854775808 {
-		t.Errorf("9223372036854775807 * -9223372036854775808 = %d, want -9223372036854775808", r)
+		t.Errorf("9223372036854775807 %s -9223372036854775808 = %d, want -9223372036854775808", "*", r)
 	}
 	y = -9223372036854775807
 	r = x * y
 	if r != -1 {
-		t.Errorf("9223372036854775807 * -9223372036854775807 = %d, want -1", r)
+		t.Errorf("9223372036854775807 %s -9223372036854775807 = %d, want -1", "*", r)
 	}
 	y = -4294967296
 	r = x * y
 	if r != 4294967296 {
-		t.Errorf("9223372036854775807 * -4294967296 = %d, want 4294967296", r)
+		t.Errorf("9223372036854775807 %s -4294967296 = %d, want 4294967296", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != -9223372036854775807 {
-		t.Errorf("9223372036854775807 * -1 = %d, want -9223372036854775807", r)
+		t.Errorf("9223372036854775807 %s -1 = %d, want -9223372036854775807", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("9223372036854775807 * 0 = %d, want 0", r)
+		t.Errorf("9223372036854775807 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 9223372036854775807 {
-		t.Errorf("9223372036854775807 * 1 = %d, want 9223372036854775807", r)
+		t.Errorf("9223372036854775807 %s 1 = %d, want 9223372036854775807", "*", r)
 	}
 	y = 4294967296
 	r = x * y
 	if r != -4294967296 {
-		t.Errorf("9223372036854775807 * 4294967296 = %d, want -4294967296", r)
+		t.Errorf("9223372036854775807 %s 4294967296 = %d, want -4294967296", "*", r)
 	}
 	y = 9223372036854775806
 	r = x * y
 	if r != -9223372036854775806 {
-		t.Errorf("9223372036854775807 * 9223372036854775806 = %d, want -9223372036854775806", r)
+		t.Errorf("9223372036854775807 %s 9223372036854775806 = %d, want -9223372036854775806", "*", r)
 	}
 	y = 9223372036854775807
 	r = x * y
 	if r != 1 {
-		t.Errorf("9223372036854775807 * 9223372036854775807 = %d, want 1", r)
+		t.Errorf("9223372036854775807 %s 9223372036854775807 = %d, want 1", "*", r)
 	}
 }
 func TestConstFoldint64mod(t *testing.T) {
@@ -2026,370 +2026,370 @@ func TestConstFoldint64mod(t *testing.T) {
 	y = -9223372036854775808
 	r = x % y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 % -9223372036854775808 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s -9223372036854775808 = %d, want 0", "%", r)
 	}
 	y = -9223372036854775807
 	r = x % y
 	if r != -1 {
-		t.Errorf("-9223372036854775808 % -9223372036854775807 = %d, want -1", r)
+		t.Errorf("-9223372036854775808 %s -9223372036854775807 = %d, want -1", "%", r)
 	}
 	y = -4294967296
 	r = x % y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 % -4294967296 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s -4294967296 = %d, want 0", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 % -1 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 % 1 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s 1 = %d, want 0", "%", r)
 	}
 	y = 4294967296
 	r = x % y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 % 4294967296 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s 4294967296 = %d, want 0", "%", r)
 	}
 	y = 9223372036854775806
 	r = x % y
 	if r != -2 {
-		t.Errorf("-9223372036854775808 % 9223372036854775806 = %d, want -2", r)
+		t.Errorf("-9223372036854775808 %s 9223372036854775806 = %d, want -2", "%", r)
 	}
 	y = 9223372036854775807
 	r = x % y
 	if r != -1 {
-		t.Errorf("-9223372036854775808 % 9223372036854775807 = %d, want -1", r)
+		t.Errorf("-9223372036854775808 %s 9223372036854775807 = %d, want -1", "%", r)
 	}
 	x = -9223372036854775807
 	y = -9223372036854775808
 	r = x % y
 	if r != -9223372036854775807 {
-		t.Errorf("-9223372036854775807 % -9223372036854775808 = %d, want -9223372036854775807", r)
+		t.Errorf("-9223372036854775807 %s -9223372036854775808 = %d, want -9223372036854775807", "%", r)
 	}
 	y = -9223372036854775807
 	r = x % y
 	if r != 0 {
-		t.Errorf("-9223372036854775807 % -9223372036854775807 = %d, want 0", r)
+		t.Errorf("-9223372036854775807 %s -9223372036854775807 = %d, want 0", "%", r)
 	}
 	y = -4294967296
 	r = x % y
 	if r != -4294967295 {
-		t.Errorf("-9223372036854775807 % -4294967296 = %d, want -4294967295", r)
+		t.Errorf("-9223372036854775807 %s -4294967296 = %d, want -4294967295", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-9223372036854775807 % -1 = %d, want 0", r)
+		t.Errorf("-9223372036854775807 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-9223372036854775807 % 1 = %d, want 0", r)
+		t.Errorf("-9223372036854775807 %s 1 = %d, want 0", "%", r)
 	}
 	y = 4294967296
 	r = x % y
 	if r != -4294967295 {
-		t.Errorf("-9223372036854775807 % 4294967296 = %d, want -4294967295", r)
+		t.Errorf("-9223372036854775807 %s 4294967296 = %d, want -4294967295", "%", r)
 	}
 	y = 9223372036854775806
 	r = x % y
 	if r != -1 {
-		t.Errorf("-9223372036854775807 % 9223372036854775806 = %d, want -1", r)
+		t.Errorf("-9223372036854775807 %s 9223372036854775806 = %d, want -1", "%", r)
 	}
 	y = 9223372036854775807
 	r = x % y
 	if r != 0 {
-		t.Errorf("-9223372036854775807 % 9223372036854775807 = %d, want 0", r)
+		t.Errorf("-9223372036854775807 %s 9223372036854775807 = %d, want 0", "%", r)
 	}
 	x = -4294967296
 	y = -9223372036854775808
 	r = x % y
 	if r != -4294967296 {
-		t.Errorf("-4294967296 % -9223372036854775808 = %d, want -4294967296", r)
+		t.Errorf("-4294967296 %s -9223372036854775808 = %d, want -4294967296", "%", r)
 	}
 	y = -9223372036854775807
 	r = x % y
 	if r != -4294967296 {
-		t.Errorf("-4294967296 % -9223372036854775807 = %d, want -4294967296", r)
+		t.Errorf("-4294967296 %s -9223372036854775807 = %d, want -4294967296", "%", r)
 	}
 	y = -4294967296
 	r = x % y
 	if r != 0 {
-		t.Errorf("-4294967296 % -4294967296 = %d, want 0", r)
+		t.Errorf("-4294967296 %s -4294967296 = %d, want 0", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-4294967296 % -1 = %d, want 0", r)
+		t.Errorf("-4294967296 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-4294967296 % 1 = %d, want 0", r)
+		t.Errorf("-4294967296 %s 1 = %d, want 0", "%", r)
 	}
 	y = 4294967296
 	r = x % y
 	if r != 0 {
-		t.Errorf("-4294967296 % 4294967296 = %d, want 0", r)
+		t.Errorf("-4294967296 %s 4294967296 = %d, want 0", "%", r)
 	}
 	y = 9223372036854775806
 	r = x % y
 	if r != -4294967296 {
-		t.Errorf("-4294967296 % 9223372036854775806 = %d, want -4294967296", r)
+		t.Errorf("-4294967296 %s 9223372036854775806 = %d, want -4294967296", "%", r)
 	}
 	y = 9223372036854775807
 	r = x % y
 	if r != -4294967296 {
-		t.Errorf("-4294967296 % 9223372036854775807 = %d, want -4294967296", r)
+		t.Errorf("-4294967296 %s 9223372036854775807 = %d, want -4294967296", "%", r)
 	}
 	x = -1
 	y = -9223372036854775808
 	r = x % y
 	if r != -1 {
-		t.Errorf("-1 % -9223372036854775808 = %d, want -1", r)
+		t.Errorf("-1 %s -9223372036854775808 = %d, want -1", "%", r)
 	}
 	y = -9223372036854775807
 	r = x % y
 	if r != -1 {
-		t.Errorf("-1 % -9223372036854775807 = %d, want -1", r)
+		t.Errorf("-1 %s -9223372036854775807 = %d, want -1", "%", r)
 	}
 	y = -4294967296
 	r = x % y
 	if r != -1 {
-		t.Errorf("-1 % -4294967296 = %d, want -1", r)
+		t.Errorf("-1 %s -4294967296 = %d, want -1", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-1 % -1 = %d, want 0", r)
+		t.Errorf("-1 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-1 % 1 = %d, want 0", r)
+		t.Errorf("-1 %s 1 = %d, want 0", "%", r)
 	}
 	y = 4294967296
 	r = x % y
 	if r != -1 {
-		t.Errorf("-1 % 4294967296 = %d, want -1", r)
+		t.Errorf("-1 %s 4294967296 = %d, want -1", "%", r)
 	}
 	y = 9223372036854775806
 	r = x % y
 	if r != -1 {
-		t.Errorf("-1 % 9223372036854775806 = %d, want -1", r)
+		t.Errorf("-1 %s 9223372036854775806 = %d, want -1", "%", r)
 	}
 	y = 9223372036854775807
 	r = x % y
 	if r != -1 {
-		t.Errorf("-1 % 9223372036854775807 = %d, want -1", r)
+		t.Errorf("-1 %s 9223372036854775807 = %d, want -1", "%", r)
 	}
 	x = 0
 	y = -9223372036854775808
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % -9223372036854775808 = %d, want 0", r)
+		t.Errorf("0 %s -9223372036854775808 = %d, want 0", "%", r)
 	}
 	y = -9223372036854775807
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % -9223372036854775807 = %d, want 0", r)
+		t.Errorf("0 %s -9223372036854775807 = %d, want 0", "%", r)
 	}
 	y = -4294967296
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % -4294967296 = %d, want 0", r)
+		t.Errorf("0 %s -4294967296 = %d, want 0", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % -1 = %d, want 0", r)
+		t.Errorf("0 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "%", r)
 	}
 	y = 4294967296
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", "%", r)
 	}
 	y = 9223372036854775806
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 9223372036854775806 = %d, want 0", r)
+		t.Errorf("0 %s 9223372036854775806 = %d, want 0", "%", r)
 	}
 	y = 9223372036854775807
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 9223372036854775807 = %d, want 0", r)
+		t.Errorf("0 %s 9223372036854775807 = %d, want 0", "%", r)
 	}
 	x = 1
 	y = -9223372036854775808
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % -9223372036854775808 = %d, want 1", r)
+		t.Errorf("1 %s -9223372036854775808 = %d, want 1", "%", r)
 	}
 	y = -9223372036854775807
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % -9223372036854775807 = %d, want 1", r)
+		t.Errorf("1 %s -9223372036854775807 = %d, want 1", "%", r)
 	}
 	y = -4294967296
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % -4294967296 = %d, want 1", r)
+		t.Errorf("1 %s -4294967296 = %d, want 1", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("1 % -1 = %d, want 0", r)
+		t.Errorf("1 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("1 % 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", "%", r)
 	}
 	y = 4294967296
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % 4294967296 = %d, want 1", r)
+		t.Errorf("1 %s 4294967296 = %d, want 1", "%", r)
 	}
 	y = 9223372036854775806
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % 9223372036854775806 = %d, want 1", r)
+		t.Errorf("1 %s 9223372036854775806 = %d, want 1", "%", r)
 	}
 	y = 9223372036854775807
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % 9223372036854775807 = %d, want 1", r)
+		t.Errorf("1 %s 9223372036854775807 = %d, want 1", "%", r)
 	}
 	x = 4294967296
 	y = -9223372036854775808
 	r = x % y
 	if r != 4294967296 {
-		t.Errorf("4294967296 % -9223372036854775808 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s -9223372036854775808 = %d, want 4294967296", "%", r)
 	}
 	y = -9223372036854775807
 	r = x % y
 	if r != 4294967296 {
-		t.Errorf("4294967296 % -9223372036854775807 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s -9223372036854775807 = %d, want 4294967296", "%", r)
 	}
 	y = -4294967296
 	r = x % y
 	if r != 0 {
-		t.Errorf("4294967296 % -4294967296 = %d, want 0", r)
+		t.Errorf("4294967296 %s -4294967296 = %d, want 0", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("4294967296 % -1 = %d, want 0", r)
+		t.Errorf("4294967296 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("4294967296 % 1 = %d, want 0", r)
+		t.Errorf("4294967296 %s 1 = %d, want 0", "%", r)
 	}
 	y = 4294967296
 	r = x % y
 	if r != 0 {
-		t.Errorf("4294967296 % 4294967296 = %d, want 0", r)
+		t.Errorf("4294967296 %s 4294967296 = %d, want 0", "%", r)
 	}
 	y = 9223372036854775806
 	r = x % y
 	if r != 4294967296 {
-		t.Errorf("4294967296 % 9223372036854775806 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 9223372036854775806 = %d, want 4294967296", "%", r)
 	}
 	y = 9223372036854775807
 	r = x % y
 	if r != 4294967296 {
-		t.Errorf("4294967296 % 9223372036854775807 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 9223372036854775807 = %d, want 4294967296", "%", r)
 	}
 	x = 9223372036854775806
 	y = -9223372036854775808
 	r = x % y
 	if r != 9223372036854775806 {
-		t.Errorf("9223372036854775806 % -9223372036854775808 = %d, want 9223372036854775806", r)
+		t.Errorf("9223372036854775806 %s -9223372036854775808 = %d, want 9223372036854775806", "%", r)
 	}
 	y = -9223372036854775807
 	r = x % y
 	if r != 9223372036854775806 {
-		t.Errorf("9223372036854775806 % -9223372036854775807 = %d, want 9223372036854775806", r)
+		t.Errorf("9223372036854775806 %s -9223372036854775807 = %d, want 9223372036854775806", "%", r)
 	}
 	y = -4294967296
 	r = x % y
 	if r != 4294967294 {
-		t.Errorf("9223372036854775806 % -4294967296 = %d, want 4294967294", r)
+		t.Errorf("9223372036854775806 %s -4294967296 = %d, want 4294967294", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("9223372036854775806 % -1 = %d, want 0", r)
+		t.Errorf("9223372036854775806 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("9223372036854775806 % 1 = %d, want 0", r)
+		t.Errorf("9223372036854775806 %s 1 = %d, want 0", "%", r)
 	}
 	y = 4294967296
 	r = x % y
 	if r != 4294967294 {
-		t.Errorf("9223372036854775806 % 4294967296 = %d, want 4294967294", r)
+		t.Errorf("9223372036854775806 %s 4294967296 = %d, want 4294967294", "%", r)
 	}
 	y = 9223372036854775806
 	r = x % y
 	if r != 0 {
-		t.Errorf("9223372036854775806 % 9223372036854775806 = %d, want 0", r)
+		t.Errorf("9223372036854775806 %s 9223372036854775806 = %d, want 0", "%", r)
 	}
 	y = 9223372036854775807
 	r = x % y
 	if r != 9223372036854775806 {
-		t.Errorf("9223372036854775806 % 9223372036854775807 = %d, want 9223372036854775806", r)
+		t.Errorf("9223372036854775806 %s 9223372036854775807 = %d, want 9223372036854775806", "%", r)
 	}
 	x = 9223372036854775807
 	y = -9223372036854775808
 	r = x % y
 	if r != 9223372036854775807 {
-		t.Errorf("9223372036854775807 % -9223372036854775808 = %d, want 9223372036854775807", r)
+		t.Errorf("9223372036854775807 %s -9223372036854775808 = %d, want 9223372036854775807", "%", r)
 	}
 	y = -9223372036854775807
 	r = x % y
 	if r != 0 {
-		t.Errorf("9223372036854775807 % -9223372036854775807 = %d, want 0", r)
+		t.Errorf("9223372036854775807 %s -9223372036854775807 = %d, want 0", "%", r)
 	}
 	y = -4294967296
 	r = x % y
 	if r != 4294967295 {
-		t.Errorf("9223372036854775807 % -4294967296 = %d, want 4294967295", r)
+		t.Errorf("9223372036854775807 %s -4294967296 = %d, want 4294967295", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("9223372036854775807 % -1 = %d, want 0", r)
+		t.Errorf("9223372036854775807 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("9223372036854775807 % 1 = %d, want 0", r)
+		t.Errorf("9223372036854775807 %s 1 = %d, want 0", "%", r)
 	}
 	y = 4294967296
 	r = x % y
 	if r != 4294967295 {
-		t.Errorf("9223372036854775807 % 4294967296 = %d, want 4294967295", r)
+		t.Errorf("9223372036854775807 %s 4294967296 = %d, want 4294967295", "%", r)
 	}
 	y = 9223372036854775806
 	r = x % y
 	if r != 1 {
-		t.Errorf("9223372036854775807 % 9223372036854775806 = %d, want 1", r)
+		t.Errorf("9223372036854775807 %s 9223372036854775806 = %d, want 1", "%", r)
 	}
 	y = 9223372036854775807
 	r = x % y
 	if r != 0 {
-		t.Errorf("9223372036854775807 % 9223372036854775807 = %d, want 0", r)
+		t.Errorf("9223372036854775807 %s 9223372036854775807 = %d, want 0", "%", r)
 	}
 }
 func TestConstFolduint32add(t *testing.T) {
@@ -2398,49 +2398,49 @@ func TestConstFolduint32add(t *testing.T) {
 	y = 0
 	r = x + y
 	if r != 0 {
-		t.Errorf("0 + 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 1 {
-		t.Errorf("0 + 1 = %d, want 1", r)
+		t.Errorf("0 %s 1 = %d, want 1", "+", r)
 	}
 	y = 4294967295
 	r = x + y
 	if r != 4294967295 {
-		t.Errorf("0 + 4294967295 = %d, want 4294967295", r)
+		t.Errorf("0 %s 4294967295 = %d, want 4294967295", "+", r)
 	}
 	x = 1
 	y = 0
 	r = x + y
 	if r != 1 {
-		t.Errorf("1 + 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 2 {
-		t.Errorf("1 + 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "+", r)
 	}
 	y = 4294967295
 	r = x + y
 	if r != 0 {
-		t.Errorf("1 + 4294967295 = %d, want 0", r)
+		t.Errorf("1 %s 4294967295 = %d, want 0", "+", r)
 	}
 	x = 4294967295
 	y = 0
 	r = x + y
 	if r != 4294967295 {
-		t.Errorf("4294967295 + 0 = %d, want 4294967295", r)
+		t.Errorf("4294967295 %s 0 = %d, want 4294967295", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 0 {
-		t.Errorf("4294967295 + 1 = %d, want 0", r)
+		t.Errorf("4294967295 %s 1 = %d, want 0", "+", r)
 	}
 	y = 4294967295
 	r = x + y
 	if r != 4294967294 {
-		t.Errorf("4294967295 + 4294967295 = %d, want 4294967294", r)
+		t.Errorf("4294967295 %s 4294967295 = %d, want 4294967294", "+", r)
 	}
 }
 func TestConstFolduint32sub(t *testing.T) {
@@ -2449,49 +2449,49 @@ func TestConstFolduint32sub(t *testing.T) {
 	y = 0
 	r = x - y
 	if r != 0 {
-		t.Errorf("0 - 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 4294967295 {
-		t.Errorf("0 - 1 = %d, want 4294967295", r)
+		t.Errorf("0 %s 1 = %d, want 4294967295", "-", r)
 	}
 	y = 4294967295
 	r = x - y
 	if r != 1 {
-		t.Errorf("0 - 4294967295 = %d, want 1", r)
+		t.Errorf("0 %s 4294967295 = %d, want 1", "-", r)
 	}
 	x = 1
 	y = 0
 	r = x - y
 	if r != 1 {
-		t.Errorf("1 - 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 0 {
-		t.Errorf("1 - 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", "-", r)
 	}
 	y = 4294967295
 	r = x - y
 	if r != 2 {
-		t.Errorf("1 - 4294967295 = %d, want 2", r)
+		t.Errorf("1 %s 4294967295 = %d, want 2", "-", r)
 	}
 	x = 4294967295
 	y = 0
 	r = x - y
 	if r != 4294967295 {
-		t.Errorf("4294967295 - 0 = %d, want 4294967295", r)
+		t.Errorf("4294967295 %s 0 = %d, want 4294967295", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 4294967294 {
-		t.Errorf("4294967295 - 1 = %d, want 4294967294", r)
+		t.Errorf("4294967295 %s 1 = %d, want 4294967294", "-", r)
 	}
 	y = 4294967295
 	r = x - y
 	if r != 0 {
-		t.Errorf("4294967295 - 4294967295 = %d, want 0", r)
+		t.Errorf("4294967295 %s 4294967295 = %d, want 0", "-", r)
 	}
 }
 func TestConstFolduint32div(t *testing.T) {
@@ -2500,34 +2500,34 @@ func TestConstFolduint32div(t *testing.T) {
 	y = 1
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "/", r)
 	}
 	y = 4294967295
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 4294967295 = %d, want 0", r)
+		t.Errorf("0 %s 4294967295 = %d, want 0", "/", r)
 	}
 	x = 1
 	y = 1
 	r = x / y
 	if r != 1 {
-		t.Errorf("1 / 1 = %d, want 1", r)
+		t.Errorf("1 %s 1 = %d, want 1", "/", r)
 	}
 	y = 4294967295
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / 4294967295 = %d, want 0", r)
+		t.Errorf("1 %s 4294967295 = %d, want 0", "/", r)
 	}
 	x = 4294967295
 	y = 1
 	r = x / y
 	if r != 4294967295 {
-		t.Errorf("4294967295 / 1 = %d, want 4294967295", r)
+		t.Errorf("4294967295 %s 1 = %d, want 4294967295", "/", r)
 	}
 	y = 4294967295
 	r = x / y
 	if r != 1 {
-		t.Errorf("4294967295 / 4294967295 = %d, want 1", r)
+		t.Errorf("4294967295 %s 4294967295 = %d, want 1", "/", r)
 	}
 }
 func TestConstFolduint32mul(t *testing.T) {
@@ -2536,49 +2536,49 @@ func TestConstFolduint32mul(t *testing.T) {
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "*", r)
 	}
 	y = 4294967295
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 4294967295 = %d, want 0", r)
+		t.Errorf("0 %s 4294967295 = %d, want 0", "*", r)
 	}
 	x = 1
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("1 * 0 = %d, want 0", r)
+		t.Errorf("1 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 1 {
-		t.Errorf("1 * 1 = %d, want 1", r)
+		t.Errorf("1 %s 1 = %d, want 1", "*", r)
 	}
 	y = 4294967295
 	r = x * y
 	if r != 4294967295 {
-		t.Errorf("1 * 4294967295 = %d, want 4294967295", r)
+		t.Errorf("1 %s 4294967295 = %d, want 4294967295", "*", r)
 	}
 	x = 4294967295
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("4294967295 * 0 = %d, want 0", r)
+		t.Errorf("4294967295 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 4294967295 {
-		t.Errorf("4294967295 * 1 = %d, want 4294967295", r)
+		t.Errorf("4294967295 %s 1 = %d, want 4294967295", "*", r)
 	}
 	y = 4294967295
 	r = x * y
 	if r != 1 {
-		t.Errorf("4294967295 * 4294967295 = %d, want 1", r)
+		t.Errorf("4294967295 %s 4294967295 = %d, want 1", "*", r)
 	}
 }
 func TestConstFolduint32mod(t *testing.T) {
@@ -2587,34 +2587,34 @@ func TestConstFolduint32mod(t *testing.T) {
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "%", r)
 	}
 	y = 4294967295
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 4294967295 = %d, want 0", r)
+		t.Errorf("0 %s 4294967295 = %d, want 0", "%", r)
 	}
 	x = 1
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("1 % 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", "%", r)
 	}
 	y = 4294967295
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % 4294967295 = %d, want 1", r)
+		t.Errorf("1 %s 4294967295 = %d, want 1", "%", r)
 	}
 	x = 4294967295
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("4294967295 % 1 = %d, want 0", r)
+		t.Errorf("4294967295 %s 1 = %d, want 0", "%", r)
 	}
 	y = 4294967295
 	r = x % y
 	if r != 0 {
-		t.Errorf("4294967295 % 4294967295 = %d, want 0", r)
+		t.Errorf("4294967295 %s 4294967295 = %d, want 0", "%", r)
 	}
 }
 func TestConstFoldint32add(t *testing.T) {
@@ -2623,187 +2623,187 @@ func TestConstFoldint32add(t *testing.T) {
 	y = -2147483648
 	r = x + y
 	if r != 0 {
-		t.Errorf("-2147483648 + -2147483648 = %d, want 0", r)
+		t.Errorf("-2147483648 %s -2147483648 = %d, want 0", "+", r)
 	}
 	y = -2147483647
 	r = x + y
 	if r != 1 {
-		t.Errorf("-2147483648 + -2147483647 = %d, want 1", r)
+		t.Errorf("-2147483648 %s -2147483647 = %d, want 1", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != 2147483647 {
-		t.Errorf("-2147483648 + -1 = %d, want 2147483647", r)
+		t.Errorf("-2147483648 %s -1 = %d, want 2147483647", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != -2147483648 {
-		t.Errorf("-2147483648 + 0 = %d, want -2147483648", r)
+		t.Errorf("-2147483648 %s 0 = %d, want -2147483648", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != -2147483647 {
-		t.Errorf("-2147483648 + 1 = %d, want -2147483647", r)
+		t.Errorf("-2147483648 %s 1 = %d, want -2147483647", "+", r)
 	}
 	y = 2147483647
 	r = x + y
 	if r != -1 {
-		t.Errorf("-2147483648 + 2147483647 = %d, want -1", r)
+		t.Errorf("-2147483648 %s 2147483647 = %d, want -1", "+", r)
 	}
 	x = -2147483647
 	y = -2147483648
 	r = x + y
 	if r != 1 {
-		t.Errorf("-2147483647 + -2147483648 = %d, want 1", r)
+		t.Errorf("-2147483647 %s -2147483648 = %d, want 1", "+", r)
 	}
 	y = -2147483647
 	r = x + y
 	if r != 2 {
-		t.Errorf("-2147483647 + -2147483647 = %d, want 2", r)
+		t.Errorf("-2147483647 %s -2147483647 = %d, want 2", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != -2147483648 {
-		t.Errorf("-2147483647 + -1 = %d, want -2147483648", r)
+		t.Errorf("-2147483647 %s -1 = %d, want -2147483648", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != -2147483647 {
-		t.Errorf("-2147483647 + 0 = %d, want -2147483647", r)
+		t.Errorf("-2147483647 %s 0 = %d, want -2147483647", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != -2147483646 {
-		t.Errorf("-2147483647 + 1 = %d, want -2147483646", r)
+		t.Errorf("-2147483647 %s 1 = %d, want -2147483646", "+", r)
 	}
 	y = 2147483647
 	r = x + y
 	if r != 0 {
-		t.Errorf("-2147483647 + 2147483647 = %d, want 0", r)
+		t.Errorf("-2147483647 %s 2147483647 = %d, want 0", "+", r)
 	}
 	x = -1
 	y = -2147483648
 	r = x + y
 	if r != 2147483647 {
-		t.Errorf("-1 + -2147483648 = %d, want 2147483647", r)
+		t.Errorf("-1 %s -2147483648 = %d, want 2147483647", "+", r)
 	}
 	y = -2147483647
 	r = x + y
 	if r != -2147483648 {
-		t.Errorf("-1 + -2147483647 = %d, want -2147483648", r)
+		t.Errorf("-1 %s -2147483647 = %d, want -2147483648", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != -2 {
-		t.Errorf("-1 + -1 = %d, want -2", r)
+		t.Errorf("-1 %s -1 = %d, want -2", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != -1 {
-		t.Errorf("-1 + 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 0 {
-		t.Errorf("-1 + 1 = %d, want 0", r)
+		t.Errorf("-1 %s 1 = %d, want 0", "+", r)
 	}
 	y = 2147483647
 	r = x + y
 	if r != 2147483646 {
-		t.Errorf("-1 + 2147483647 = %d, want 2147483646", r)
+		t.Errorf("-1 %s 2147483647 = %d, want 2147483646", "+", r)
 	}
 	x = 0
 	y = -2147483648
 	r = x + y
 	if r != -2147483648 {
-		t.Errorf("0 + -2147483648 = %d, want -2147483648", r)
+		t.Errorf("0 %s -2147483648 = %d, want -2147483648", "+", r)
 	}
 	y = -2147483647
 	r = x + y
 	if r != -2147483647 {
-		t.Errorf("0 + -2147483647 = %d, want -2147483647", r)
+		t.Errorf("0 %s -2147483647 = %d, want -2147483647", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != -1 {
-		t.Errorf("0 + -1 = %d, want -1", r)
+		t.Errorf("0 %s -1 = %d, want -1", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != 0 {
-		t.Errorf("0 + 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 1 {
-		t.Errorf("0 + 1 = %d, want 1", r)
+		t.Errorf("0 %s 1 = %d, want 1", "+", r)
 	}
 	y = 2147483647
 	r = x + y
 	if r != 2147483647 {
-		t.Errorf("0 + 2147483647 = %d, want 2147483647", r)
+		t.Errorf("0 %s 2147483647 = %d, want 2147483647", "+", r)
 	}
 	x = 1
 	y = -2147483648
 	r = x + y
 	if r != -2147483647 {
-		t.Errorf("1 + -2147483648 = %d, want -2147483647", r)
+		t.Errorf("1 %s -2147483648 = %d, want -2147483647", "+", r)
 	}
 	y = -2147483647
 	r = x + y
 	if r != -2147483646 {
-		t.Errorf("1 + -2147483647 = %d, want -2147483646", r)
+		t.Errorf("1 %s -2147483647 = %d, want -2147483646", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != 0 {
-		t.Errorf("1 + -1 = %d, want 0", r)
+		t.Errorf("1 %s -1 = %d, want 0", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != 1 {
-		t.Errorf("1 + 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 2 {
-		t.Errorf("1 + 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "+", r)
 	}
 	y = 2147483647
 	r = x + y
 	if r != -2147483648 {
-		t.Errorf("1 + 2147483647 = %d, want -2147483648", r)
+		t.Errorf("1 %s 2147483647 = %d, want -2147483648", "+", r)
 	}
 	x = 2147483647
 	y = -2147483648
 	r = x + y
 	if r != -1 {
-		t.Errorf("2147483647 + -2147483648 = %d, want -1", r)
+		t.Errorf("2147483647 %s -2147483648 = %d, want -1", "+", r)
 	}
 	y = -2147483647
 	r = x + y
 	if r != 0 {
-		t.Errorf("2147483647 + -2147483647 = %d, want 0", r)
+		t.Errorf("2147483647 %s -2147483647 = %d, want 0", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != 2147483646 {
-		t.Errorf("2147483647 + -1 = %d, want 2147483646", r)
+		t.Errorf("2147483647 %s -1 = %d, want 2147483646", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != 2147483647 {
-		t.Errorf("2147483647 + 0 = %d, want 2147483647", r)
+		t.Errorf("2147483647 %s 0 = %d, want 2147483647", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != -2147483648 {
-		t.Errorf("2147483647 + 1 = %d, want -2147483648", r)
+		t.Errorf("2147483647 %s 1 = %d, want -2147483648", "+", r)
 	}
 	y = 2147483647
 	r = x + y
 	if r != -2 {
-		t.Errorf("2147483647 + 2147483647 = %d, want -2", r)
+		t.Errorf("2147483647 %s 2147483647 = %d, want -2", "+", r)
 	}
 }
 func TestConstFoldint32sub(t *testing.T) {
@@ -2812,187 +2812,187 @@ func TestConstFoldint32sub(t *testing.T) {
 	y = -2147483648
 	r = x - y
 	if r != 0 {
-		t.Errorf("-2147483648 - -2147483648 = %d, want 0", r)
+		t.Errorf("-2147483648 %s -2147483648 = %d, want 0", "-", r)
 	}
 	y = -2147483647
 	r = x - y
 	if r != -1 {
-		t.Errorf("-2147483648 - -2147483647 = %d, want -1", r)
+		t.Errorf("-2147483648 %s -2147483647 = %d, want -1", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != -2147483647 {
-		t.Errorf("-2147483648 - -1 = %d, want -2147483647", r)
+		t.Errorf("-2147483648 %s -1 = %d, want -2147483647", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != -2147483648 {
-		t.Errorf("-2147483648 - 0 = %d, want -2147483648", r)
+		t.Errorf("-2147483648 %s 0 = %d, want -2147483648", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 2147483647 {
-		t.Errorf("-2147483648 - 1 = %d, want 2147483647", r)
+		t.Errorf("-2147483648 %s 1 = %d, want 2147483647", "-", r)
 	}
 	y = 2147483647
 	r = x - y
 	if r != 1 {
-		t.Errorf("-2147483648 - 2147483647 = %d, want 1", r)
+		t.Errorf("-2147483648 %s 2147483647 = %d, want 1", "-", r)
 	}
 	x = -2147483647
 	y = -2147483648
 	r = x - y
 	if r != 1 {
-		t.Errorf("-2147483647 - -2147483648 = %d, want 1", r)
+		t.Errorf("-2147483647 %s -2147483648 = %d, want 1", "-", r)
 	}
 	y = -2147483647
 	r = x - y
 	if r != 0 {
-		t.Errorf("-2147483647 - -2147483647 = %d, want 0", r)
+		t.Errorf("-2147483647 %s -2147483647 = %d, want 0", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != -2147483646 {
-		t.Errorf("-2147483647 - -1 = %d, want -2147483646", r)
+		t.Errorf("-2147483647 %s -1 = %d, want -2147483646", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != -2147483647 {
-		t.Errorf("-2147483647 - 0 = %d, want -2147483647", r)
+		t.Errorf("-2147483647 %s 0 = %d, want -2147483647", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != -2147483648 {
-		t.Errorf("-2147483647 - 1 = %d, want -2147483648", r)
+		t.Errorf("-2147483647 %s 1 = %d, want -2147483648", "-", r)
 	}
 	y = 2147483647
 	r = x - y
 	if r != 2 {
-		t.Errorf("-2147483647 - 2147483647 = %d, want 2", r)
+		t.Errorf("-2147483647 %s 2147483647 = %d, want 2", "-", r)
 	}
 	x = -1
 	y = -2147483648
 	r = x - y
 	if r != 2147483647 {
-		t.Errorf("-1 - -2147483648 = %d, want 2147483647", r)
+		t.Errorf("-1 %s -2147483648 = %d, want 2147483647", "-", r)
 	}
 	y = -2147483647
 	r = x - y
 	if r != 2147483646 {
-		t.Errorf("-1 - -2147483647 = %d, want 2147483646", r)
+		t.Errorf("-1 %s -2147483647 = %d, want 2147483646", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != 0 {
-		t.Errorf("-1 - -1 = %d, want 0", r)
+		t.Errorf("-1 %s -1 = %d, want 0", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != -1 {
-		t.Errorf("-1 - 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != -2 {
-		t.Errorf("-1 - 1 = %d, want -2", r)
+		t.Errorf("-1 %s 1 = %d, want -2", "-", r)
 	}
 	y = 2147483647
 	r = x - y
 	if r != -2147483648 {
-		t.Errorf("-1 - 2147483647 = %d, want -2147483648", r)
+		t.Errorf("-1 %s 2147483647 = %d, want -2147483648", "-", r)
 	}
 	x = 0
 	y = -2147483648
 	r = x - y
 	if r != -2147483648 {
-		t.Errorf("0 - -2147483648 = %d, want -2147483648", r)
+		t.Errorf("0 %s -2147483648 = %d, want -2147483648", "-", r)
 	}
 	y = -2147483647
 	r = x - y
 	if r != 2147483647 {
-		t.Errorf("0 - -2147483647 = %d, want 2147483647", r)
+		t.Errorf("0 %s -2147483647 = %d, want 2147483647", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != 1 {
-		t.Errorf("0 - -1 = %d, want 1", r)
+		t.Errorf("0 %s -1 = %d, want 1", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != 0 {
-		t.Errorf("0 - 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != -1 {
-		t.Errorf("0 - 1 = %d, want -1", r)
+		t.Errorf("0 %s 1 = %d, want -1", "-", r)
 	}
 	y = 2147483647
 	r = x - y
 	if r != -2147483647 {
-		t.Errorf("0 - 2147483647 = %d, want -2147483647", r)
+		t.Errorf("0 %s 2147483647 = %d, want -2147483647", "-", r)
 	}
 	x = 1
 	y = -2147483648
 	r = x - y
 	if r != -2147483647 {
-		t.Errorf("1 - -2147483648 = %d, want -2147483647", r)
+		t.Errorf("1 %s -2147483648 = %d, want -2147483647", "-", r)
 	}
 	y = -2147483647
 	r = x - y
 	if r != -2147483648 {
-		t.Errorf("1 - -2147483647 = %d, want -2147483648", r)
+		t.Errorf("1 %s -2147483647 = %d, want -2147483648", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != 2 {
-		t.Errorf("1 - -1 = %d, want 2", r)
+		t.Errorf("1 %s -1 = %d, want 2", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != 1 {
-		t.Errorf("1 - 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 0 {
-		t.Errorf("1 - 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", "-", r)
 	}
 	y = 2147483647
 	r = x - y
 	if r != -2147483646 {
-		t.Errorf("1 - 2147483647 = %d, want -2147483646", r)
+		t.Errorf("1 %s 2147483647 = %d, want -2147483646", "-", r)
 	}
 	x = 2147483647
 	y = -2147483648
 	r = x - y
 	if r != -1 {
-		t.Errorf("2147483647 - -2147483648 = %d, want -1", r)
+		t.Errorf("2147483647 %s -2147483648 = %d, want -1", "-", r)
 	}
 	y = -2147483647
 	r = x - y
 	if r != -2 {
-		t.Errorf("2147483647 - -2147483647 = %d, want -2", r)
+		t.Errorf("2147483647 %s -2147483647 = %d, want -2", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != -2147483648 {
-		t.Errorf("2147483647 - -1 = %d, want -2147483648", r)
+		t.Errorf("2147483647 %s -1 = %d, want -2147483648", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != 2147483647 {
-		t.Errorf("2147483647 - 0 = %d, want 2147483647", r)
+		t.Errorf("2147483647 %s 0 = %d, want 2147483647", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 2147483646 {
-		t.Errorf("2147483647 - 1 = %d, want 2147483646", r)
+		t.Errorf("2147483647 %s 1 = %d, want 2147483646", "-", r)
 	}
 	y = 2147483647
 	r = x - y
 	if r != 0 {
-		t.Errorf("2147483647 - 2147483647 = %d, want 0", r)
+		t.Errorf("2147483647 %s 2147483647 = %d, want 0", "-", r)
 	}
 }
 func TestConstFoldint32div(t *testing.T) {
@@ -3001,157 +3001,157 @@ func TestConstFoldint32div(t *testing.T) {
 	y = -2147483648
 	r = x / y
 	if r != 1 {
-		t.Errorf("-2147483648 / -2147483648 = %d, want 1", r)
+		t.Errorf("-2147483648 %s -2147483648 = %d, want 1", "/", r)
 	}
 	y = -2147483647
 	r = x / y
 	if r != 1 {
-		t.Errorf("-2147483648 / -2147483647 = %d, want 1", r)
+		t.Errorf("-2147483648 %s -2147483647 = %d, want 1", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != -2147483648 {
-		t.Errorf("-2147483648 / -1 = %d, want -2147483648", r)
+		t.Errorf("-2147483648 %s -1 = %d, want -2147483648", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != -2147483648 {
-		t.Errorf("-2147483648 / 1 = %d, want -2147483648", r)
+		t.Errorf("-2147483648 %s 1 = %d, want -2147483648", "/", r)
 	}
 	y = 2147483647
 	r = x / y
 	if r != -1 {
-		t.Errorf("-2147483648 / 2147483647 = %d, want -1", r)
+		t.Errorf("-2147483648 %s 2147483647 = %d, want -1", "/", r)
 	}
 	x = -2147483647
 	y = -2147483648
 	r = x / y
 	if r != 0 {
-		t.Errorf("-2147483647 / -2147483648 = %d, want 0", r)
+		t.Errorf("-2147483647 %s -2147483648 = %d, want 0", "/", r)
 	}
 	y = -2147483647
 	r = x / y
 	if r != 1 {
-		t.Errorf("-2147483647 / -2147483647 = %d, want 1", r)
+		t.Errorf("-2147483647 %s -2147483647 = %d, want 1", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != 2147483647 {
-		t.Errorf("-2147483647 / -1 = %d, want 2147483647", r)
+		t.Errorf("-2147483647 %s -1 = %d, want 2147483647", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != -2147483647 {
-		t.Errorf("-2147483647 / 1 = %d, want -2147483647", r)
+		t.Errorf("-2147483647 %s 1 = %d, want -2147483647", "/", r)
 	}
 	y = 2147483647
 	r = x / y
 	if r != -1 {
-		t.Errorf("-2147483647 / 2147483647 = %d, want -1", r)
+		t.Errorf("-2147483647 %s 2147483647 = %d, want -1", "/", r)
 	}
 	x = -1
 	y = -2147483648
 	r = x / y
 	if r != 0 {
-		t.Errorf("-1 / -2147483648 = %d, want 0", r)
+		t.Errorf("-1 %s -2147483648 = %d, want 0", "/", r)
 	}
 	y = -2147483647
 	r = x / y
 	if r != 0 {
-		t.Errorf("-1 / -2147483647 = %d, want 0", r)
+		t.Errorf("-1 %s -2147483647 = %d, want 0", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != 1 {
-		t.Errorf("-1 / -1 = %d, want 1", r)
+		t.Errorf("-1 %s -1 = %d, want 1", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != -1 {
-		t.Errorf("-1 / 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", "/", r)
 	}
 	y = 2147483647
 	r = x / y
 	if r != 0 {
-		t.Errorf("-1 / 2147483647 = %d, want 0", r)
+		t.Errorf("-1 %s 2147483647 = %d, want 0", "/", r)
 	}
 	x = 0
 	y = -2147483648
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / -2147483648 = %d, want 0", r)
+		t.Errorf("0 %s -2147483648 = %d, want 0", "/", r)
 	}
 	y = -2147483647
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / -2147483647 = %d, want 0", r)
+		t.Errorf("0 %s -2147483647 = %d, want 0", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / -1 = %d, want 0", r)
+		t.Errorf("0 %s -1 = %d, want 0", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "/", r)
 	}
 	y = 2147483647
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 2147483647 = %d, want 0", r)
+		t.Errorf("0 %s 2147483647 = %d, want 0", "/", r)
 	}
 	x = 1
 	y = -2147483648
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / -2147483648 = %d, want 0", r)
+		t.Errorf("1 %s -2147483648 = %d, want 0", "/", r)
 	}
 	y = -2147483647
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / -2147483647 = %d, want 0", r)
+		t.Errorf("1 %s -2147483647 = %d, want 0", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != -1 {
-		t.Errorf("1 / -1 = %d, want -1", r)
+		t.Errorf("1 %s -1 = %d, want -1", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != 1 {
-		t.Errorf("1 / 1 = %d, want 1", r)
+		t.Errorf("1 %s 1 = %d, want 1", "/", r)
 	}
 	y = 2147483647
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / 2147483647 = %d, want 0", r)
+		t.Errorf("1 %s 2147483647 = %d, want 0", "/", r)
 	}
 	x = 2147483647
 	y = -2147483648
 	r = x / y
 	if r != 0 {
-		t.Errorf("2147483647 / -2147483648 = %d, want 0", r)
+		t.Errorf("2147483647 %s -2147483648 = %d, want 0", "/", r)
 	}
 	y = -2147483647
 	r = x / y
 	if r != -1 {
-		t.Errorf("2147483647 / -2147483647 = %d, want -1", r)
+		t.Errorf("2147483647 %s -2147483647 = %d, want -1", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != -2147483647 {
-		t.Errorf("2147483647 / -1 = %d, want -2147483647", r)
+		t.Errorf("2147483647 %s -1 = %d, want -2147483647", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != 2147483647 {
-		t.Errorf("2147483647 / 1 = %d, want 2147483647", r)
+		t.Errorf("2147483647 %s 1 = %d, want 2147483647", "/", r)
 	}
 	y = 2147483647
 	r = x / y
 	if r != 1 {
-		t.Errorf("2147483647 / 2147483647 = %d, want 1", r)
+		t.Errorf("2147483647 %s 2147483647 = %d, want 1", "/", r)
 	}
 }
 func TestConstFoldint32mul(t *testing.T) {
@@ -3160,187 +3160,187 @@ func TestConstFoldint32mul(t *testing.T) {
 	y = -2147483648
 	r = x * y
 	if r != 0 {
-		t.Errorf("-2147483648 * -2147483648 = %d, want 0", r)
+		t.Errorf("-2147483648 %s -2147483648 = %d, want 0", "*", r)
 	}
 	y = -2147483647
 	r = x * y
 	if r != -2147483648 {
-		t.Errorf("-2147483648 * -2147483647 = %d, want -2147483648", r)
+		t.Errorf("-2147483648 %s -2147483647 = %d, want -2147483648", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != -2147483648 {
-		t.Errorf("-2147483648 * -1 = %d, want -2147483648", r)
+		t.Errorf("-2147483648 %s -1 = %d, want -2147483648", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("-2147483648 * 0 = %d, want 0", r)
+		t.Errorf("-2147483648 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != -2147483648 {
-		t.Errorf("-2147483648 * 1 = %d, want -2147483648", r)
+		t.Errorf("-2147483648 %s 1 = %d, want -2147483648", "*", r)
 	}
 	y = 2147483647
 	r = x * y
 	if r != -2147483648 {
-		t.Errorf("-2147483648 * 2147483647 = %d, want -2147483648", r)
+		t.Errorf("-2147483648 %s 2147483647 = %d, want -2147483648", "*", r)
 	}
 	x = -2147483647
 	y = -2147483648
 	r = x * y
 	if r != -2147483648 {
-		t.Errorf("-2147483647 * -2147483648 = %d, want -2147483648", r)
+		t.Errorf("-2147483647 %s -2147483648 = %d, want -2147483648", "*", r)
 	}
 	y = -2147483647
 	r = x * y
 	if r != 1 {
-		t.Errorf("-2147483647 * -2147483647 = %d, want 1", r)
+		t.Errorf("-2147483647 %s -2147483647 = %d, want 1", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != 2147483647 {
-		t.Errorf("-2147483647 * -1 = %d, want 2147483647", r)
+		t.Errorf("-2147483647 %s -1 = %d, want 2147483647", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("-2147483647 * 0 = %d, want 0", r)
+		t.Errorf("-2147483647 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != -2147483647 {
-		t.Errorf("-2147483647 * 1 = %d, want -2147483647", r)
+		t.Errorf("-2147483647 %s 1 = %d, want -2147483647", "*", r)
 	}
 	y = 2147483647
 	r = x * y
 	if r != -1 {
-		t.Errorf("-2147483647 * 2147483647 = %d, want -1", r)
+		t.Errorf("-2147483647 %s 2147483647 = %d, want -1", "*", r)
 	}
 	x = -1
 	y = -2147483648
 	r = x * y
 	if r != -2147483648 {
-		t.Errorf("-1 * -2147483648 = %d, want -2147483648", r)
+		t.Errorf("-1 %s -2147483648 = %d, want -2147483648", "*", r)
 	}
 	y = -2147483647
 	r = x * y
 	if r != 2147483647 {
-		t.Errorf("-1 * -2147483647 = %d, want 2147483647", r)
+		t.Errorf("-1 %s -2147483647 = %d, want 2147483647", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != 1 {
-		t.Errorf("-1 * -1 = %d, want 1", r)
+		t.Errorf("-1 %s -1 = %d, want 1", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("-1 * 0 = %d, want 0", r)
+		t.Errorf("-1 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != -1 {
-		t.Errorf("-1 * 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", "*", r)
 	}
 	y = 2147483647
 	r = x * y
 	if r != -2147483647 {
-		t.Errorf("-1 * 2147483647 = %d, want -2147483647", r)
+		t.Errorf("-1 %s 2147483647 = %d, want -2147483647", "*", r)
 	}
 	x = 0
 	y = -2147483648
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * -2147483648 = %d, want 0", r)
+		t.Errorf("0 %s -2147483648 = %d, want 0", "*", r)
 	}
 	y = -2147483647
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * -2147483647 = %d, want 0", r)
+		t.Errorf("0 %s -2147483647 = %d, want 0", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * -1 = %d, want 0", r)
+		t.Errorf("0 %s -1 = %d, want 0", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "*", r)
 	}
 	y = 2147483647
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 2147483647 = %d, want 0", r)
+		t.Errorf("0 %s 2147483647 = %d, want 0", "*", r)
 	}
 	x = 1
 	y = -2147483648
 	r = x * y
 	if r != -2147483648 {
-		t.Errorf("1 * -2147483648 = %d, want -2147483648", r)
+		t.Errorf("1 %s -2147483648 = %d, want -2147483648", "*", r)
 	}
 	y = -2147483647
 	r = x * y
 	if r != -2147483647 {
-		t.Errorf("1 * -2147483647 = %d, want -2147483647", r)
+		t.Errorf("1 %s -2147483647 = %d, want -2147483647", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != -1 {
-		t.Errorf("1 * -1 = %d, want -1", r)
+		t.Errorf("1 %s -1 = %d, want -1", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("1 * 0 = %d, want 0", r)
+		t.Errorf("1 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 1 {
-		t.Errorf("1 * 1 = %d, want 1", r)
+		t.Errorf("1 %s 1 = %d, want 1", "*", r)
 	}
 	y = 2147483647
 	r = x * y
 	if r != 2147483647 {
-		t.Errorf("1 * 2147483647 = %d, want 2147483647", r)
+		t.Errorf("1 %s 2147483647 = %d, want 2147483647", "*", r)
 	}
 	x = 2147483647
 	y = -2147483648
 	r = x * y
 	if r != -2147483648 {
-		t.Errorf("2147483647 * -2147483648 = %d, want -2147483648", r)
+		t.Errorf("2147483647 %s -2147483648 = %d, want -2147483648", "*", r)
 	}
 	y = -2147483647
 	r = x * y
 	if r != -1 {
-		t.Errorf("2147483647 * -2147483647 = %d, want -1", r)
+		t.Errorf("2147483647 %s -2147483647 = %d, want -1", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != -2147483647 {
-		t.Errorf("2147483647 * -1 = %d, want -2147483647", r)
+		t.Errorf("2147483647 %s -1 = %d, want -2147483647", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("2147483647 * 0 = %d, want 0", r)
+		t.Errorf("2147483647 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 2147483647 {
-		t.Errorf("2147483647 * 1 = %d, want 2147483647", r)
+		t.Errorf("2147483647 %s 1 = %d, want 2147483647", "*", r)
 	}
 	y = 2147483647
 	r = x * y
 	if r != 1 {
-		t.Errorf("2147483647 * 2147483647 = %d, want 1", r)
+		t.Errorf("2147483647 %s 2147483647 = %d, want 1", "*", r)
 	}
 }
 func TestConstFoldint32mod(t *testing.T) {
@@ -3349,157 +3349,157 @@ func TestConstFoldint32mod(t *testing.T) {
 	y = -2147483648
 	r = x % y
 	if r != 0 {
-		t.Errorf("-2147483648 % -2147483648 = %d, want 0", r)
+		t.Errorf("-2147483648 %s -2147483648 = %d, want 0", "%", r)
 	}
 	y = -2147483647
 	r = x % y
 	if r != -1 {
-		t.Errorf("-2147483648 % -2147483647 = %d, want -1", r)
+		t.Errorf("-2147483648 %s -2147483647 = %d, want -1", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-2147483648 % -1 = %d, want 0", r)
+		t.Errorf("-2147483648 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-2147483648 % 1 = %d, want 0", r)
+		t.Errorf("-2147483648 %s 1 = %d, want 0", "%", r)
 	}
 	y = 2147483647
 	r = x % y
 	if r != -1 {
-		t.Errorf("-2147483648 % 2147483647 = %d, want -1", r)
+		t.Errorf("-2147483648 %s 2147483647 = %d, want -1", "%", r)
 	}
 	x = -2147483647
 	y = -2147483648
 	r = x % y
 	if r != -2147483647 {
-		t.Errorf("-2147483647 % -2147483648 = %d, want -2147483647", r)
+		t.Errorf("-2147483647 %s -2147483648 = %d, want -2147483647", "%", r)
 	}
 	y = -2147483647
 	r = x % y
 	if r != 0 {
-		t.Errorf("-2147483647 % -2147483647 = %d, want 0", r)
+		t.Errorf("-2147483647 %s -2147483647 = %d, want 0", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-2147483647 % -1 = %d, want 0", r)
+		t.Errorf("-2147483647 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-2147483647 % 1 = %d, want 0", r)
+		t.Errorf("-2147483647 %s 1 = %d, want 0", "%", r)
 	}
 	y = 2147483647
 	r = x % y
 	if r != 0 {
-		t.Errorf("-2147483647 % 2147483647 = %d, want 0", r)
+		t.Errorf("-2147483647 %s 2147483647 = %d, want 0", "%", r)
 	}
 	x = -1
 	y = -2147483648
 	r = x % y
 	if r != -1 {
-		t.Errorf("-1 % -2147483648 = %d, want -1", r)
+		t.Errorf("-1 %s -2147483648 = %d, want -1", "%", r)
 	}
 	y = -2147483647
 	r = x % y
 	if r != -1 {
-		t.Errorf("-1 % -2147483647 = %d, want -1", r)
+		t.Errorf("-1 %s -2147483647 = %d, want -1", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-1 % -1 = %d, want 0", r)
+		t.Errorf("-1 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-1 % 1 = %d, want 0", r)
+		t.Errorf("-1 %s 1 = %d, want 0", "%", r)
 	}
 	y = 2147483647
 	r = x % y
 	if r != -1 {
-		t.Errorf("-1 % 2147483647 = %d, want -1", r)
+		t.Errorf("-1 %s 2147483647 = %d, want -1", "%", r)
 	}
 	x = 0
 	y = -2147483648
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % -2147483648 = %d, want 0", r)
+		t.Errorf("0 %s -2147483648 = %d, want 0", "%", r)
 	}
 	y = -2147483647
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % -2147483647 = %d, want 0", r)
+		t.Errorf("0 %s -2147483647 = %d, want 0", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % -1 = %d, want 0", r)
+		t.Errorf("0 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "%", r)
 	}
 	y = 2147483647
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 2147483647 = %d, want 0", r)
+		t.Errorf("0 %s 2147483647 = %d, want 0", "%", r)
 	}
 	x = 1
 	y = -2147483648
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % -2147483648 = %d, want 1", r)
+		t.Errorf("1 %s -2147483648 = %d, want 1", "%", r)
 	}
 	y = -2147483647
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % -2147483647 = %d, want 1", r)
+		t.Errorf("1 %s -2147483647 = %d, want 1", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("1 % -1 = %d, want 0", r)
+		t.Errorf("1 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("1 % 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", "%", r)
 	}
 	y = 2147483647
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % 2147483647 = %d, want 1", r)
+		t.Errorf("1 %s 2147483647 = %d, want 1", "%", r)
 	}
 	x = 2147483647
 	y = -2147483648
 	r = x % y
 	if r != 2147483647 {
-		t.Errorf("2147483647 % -2147483648 = %d, want 2147483647", r)
+		t.Errorf("2147483647 %s -2147483648 = %d, want 2147483647", "%", r)
 	}
 	y = -2147483647
 	r = x % y
 	if r != 0 {
-		t.Errorf("2147483647 % -2147483647 = %d, want 0", r)
+		t.Errorf("2147483647 %s -2147483647 = %d, want 0", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("2147483647 % -1 = %d, want 0", r)
+		t.Errorf("2147483647 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("2147483647 % 1 = %d, want 0", r)
+		t.Errorf("2147483647 %s 1 = %d, want 0", "%", r)
 	}
 	y = 2147483647
 	r = x % y
 	if r != 0 {
-		t.Errorf("2147483647 % 2147483647 = %d, want 0", r)
+		t.Errorf("2147483647 %s 2147483647 = %d, want 0", "%", r)
 	}
 }
 func TestConstFolduint16add(t *testing.T) {
@@ -3508,49 +3508,49 @@ func TestConstFolduint16add(t *testing.T) {
 	y = 0
 	r = x + y
 	if r != 0 {
-		t.Errorf("0 + 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 1 {
-		t.Errorf("0 + 1 = %d, want 1", r)
+		t.Errorf("0 %s 1 = %d, want 1", "+", r)
 	}
 	y = 65535
 	r = x + y
 	if r != 65535 {
-		t.Errorf("0 + 65535 = %d, want 65535", r)
+		t.Errorf("0 %s 65535 = %d, want 65535", "+", r)
 	}
 	x = 1
 	y = 0
 	r = x + y
 	if r != 1 {
-		t.Errorf("1 + 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 2 {
-		t.Errorf("1 + 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "+", r)
 	}
 	y = 65535
 	r = x + y
 	if r != 0 {
-		t.Errorf("1 + 65535 = %d, want 0", r)
+		t.Errorf("1 %s 65535 = %d, want 0", "+", r)
 	}
 	x = 65535
 	y = 0
 	r = x + y
 	if r != 65535 {
-		t.Errorf("65535 + 0 = %d, want 65535", r)
+		t.Errorf("65535 %s 0 = %d, want 65535", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 0 {
-		t.Errorf("65535 + 1 = %d, want 0", r)
+		t.Errorf("65535 %s 1 = %d, want 0", "+", r)
 	}
 	y = 65535
 	r = x + y
 	if r != 65534 {
-		t.Errorf("65535 + 65535 = %d, want 65534", r)
+		t.Errorf("65535 %s 65535 = %d, want 65534", "+", r)
 	}
 }
 func TestConstFolduint16sub(t *testing.T) {
@@ -3559,49 +3559,49 @@ func TestConstFolduint16sub(t *testing.T) {
 	y = 0
 	r = x - y
 	if r != 0 {
-		t.Errorf("0 - 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 65535 {
-		t.Errorf("0 - 1 = %d, want 65535", r)
+		t.Errorf("0 %s 1 = %d, want 65535", "-", r)
 	}
 	y = 65535
 	r = x - y
 	if r != 1 {
-		t.Errorf("0 - 65535 = %d, want 1", r)
+		t.Errorf("0 %s 65535 = %d, want 1", "-", r)
 	}
 	x = 1
 	y = 0
 	r = x - y
 	if r != 1 {
-		t.Errorf("1 - 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 0 {
-		t.Errorf("1 - 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", "-", r)
 	}
 	y = 65535
 	r = x - y
 	if r != 2 {
-		t.Errorf("1 - 65535 = %d, want 2", r)
+		t.Errorf("1 %s 65535 = %d, want 2", "-", r)
 	}
 	x = 65535
 	y = 0
 	r = x - y
 	if r != 65535 {
-		t.Errorf("65535 - 0 = %d, want 65535", r)
+		t.Errorf("65535 %s 0 = %d, want 65535", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 65534 {
-		t.Errorf("65535 - 1 = %d, want 65534", r)
+		t.Errorf("65535 %s 1 = %d, want 65534", "-", r)
 	}
 	y = 65535
 	r = x - y
 	if r != 0 {
-		t.Errorf("65535 - 65535 = %d, want 0", r)
+		t.Errorf("65535 %s 65535 = %d, want 0", "-", r)
 	}
 }
 func TestConstFolduint16div(t *testing.T) {
@@ -3610,34 +3610,34 @@ func TestConstFolduint16div(t *testing.T) {
 	y = 1
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "/", r)
 	}
 	y = 65535
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 65535 = %d, want 0", r)
+		t.Errorf("0 %s 65535 = %d, want 0", "/", r)
 	}
 	x = 1
 	y = 1
 	r = x / y
 	if r != 1 {
-		t.Errorf("1 / 1 = %d, want 1", r)
+		t.Errorf("1 %s 1 = %d, want 1", "/", r)
 	}
 	y = 65535
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / 65535 = %d, want 0", r)
+		t.Errorf("1 %s 65535 = %d, want 0", "/", r)
 	}
 	x = 65535
 	y = 1
 	r = x / y
 	if r != 65535 {
-		t.Errorf("65535 / 1 = %d, want 65535", r)
+		t.Errorf("65535 %s 1 = %d, want 65535", "/", r)
 	}
 	y = 65535
 	r = x / y
 	if r != 1 {
-		t.Errorf("65535 / 65535 = %d, want 1", r)
+		t.Errorf("65535 %s 65535 = %d, want 1", "/", r)
 	}
 }
 func TestConstFolduint16mul(t *testing.T) {
@@ -3646,49 +3646,49 @@ func TestConstFolduint16mul(t *testing.T) {
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "*", r)
 	}
 	y = 65535
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 65535 = %d, want 0", r)
+		t.Errorf("0 %s 65535 = %d, want 0", "*", r)
 	}
 	x = 1
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("1 * 0 = %d, want 0", r)
+		t.Errorf("1 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 1 {
-		t.Errorf("1 * 1 = %d, want 1", r)
+		t.Errorf("1 %s 1 = %d, want 1", "*", r)
 	}
 	y = 65535
 	r = x * y
 	if r != 65535 {
-		t.Errorf("1 * 65535 = %d, want 65535", r)
+		t.Errorf("1 %s 65535 = %d, want 65535", "*", r)
 	}
 	x = 65535
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("65535 * 0 = %d, want 0", r)
+		t.Errorf("65535 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 65535 {
-		t.Errorf("65535 * 1 = %d, want 65535", r)
+		t.Errorf("65535 %s 1 = %d, want 65535", "*", r)
 	}
 	y = 65535
 	r = x * y
 	if r != 1 {
-		t.Errorf("65535 * 65535 = %d, want 1", r)
+		t.Errorf("65535 %s 65535 = %d, want 1", "*", r)
 	}
 }
 func TestConstFolduint16mod(t *testing.T) {
@@ -3697,34 +3697,34 @@ func TestConstFolduint16mod(t *testing.T) {
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "%", r)
 	}
 	y = 65535
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 65535 = %d, want 0", r)
+		t.Errorf("0 %s 65535 = %d, want 0", "%", r)
 	}
 	x = 1
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("1 % 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", "%", r)
 	}
 	y = 65535
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % 65535 = %d, want 1", r)
+		t.Errorf("1 %s 65535 = %d, want 1", "%", r)
 	}
 	x = 65535
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("65535 % 1 = %d, want 0", r)
+		t.Errorf("65535 %s 1 = %d, want 0", "%", r)
 	}
 	y = 65535
 	r = x % y
 	if r != 0 {
-		t.Errorf("65535 % 65535 = %d, want 0", r)
+		t.Errorf("65535 %s 65535 = %d, want 0", "%", r)
 	}
 }
 func TestConstFoldint16add(t *testing.T) {
@@ -3733,253 +3733,253 @@ func TestConstFoldint16add(t *testing.T) {
 	y = -32768
 	r = x + y
 	if r != 0 {
-		t.Errorf("-32768 + -32768 = %d, want 0", r)
+		t.Errorf("-32768 %s -32768 = %d, want 0", "+", r)
 	}
 	y = -32767
 	r = x + y
 	if r != 1 {
-		t.Errorf("-32768 + -32767 = %d, want 1", r)
+		t.Errorf("-32768 %s -32767 = %d, want 1", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != 32767 {
-		t.Errorf("-32768 + -1 = %d, want 32767", r)
+		t.Errorf("-32768 %s -1 = %d, want 32767", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != -32768 {
-		t.Errorf("-32768 + 0 = %d, want -32768", r)
+		t.Errorf("-32768 %s 0 = %d, want -32768", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != -32767 {
-		t.Errorf("-32768 + 1 = %d, want -32767", r)
+		t.Errorf("-32768 %s 1 = %d, want -32767", "+", r)
 	}
 	y = 32766
 	r = x + y
 	if r != -2 {
-		t.Errorf("-32768 + 32766 = %d, want -2", r)
+		t.Errorf("-32768 %s 32766 = %d, want -2", "+", r)
 	}
 	y = 32767
 	r = x + y
 	if r != -1 {
-		t.Errorf("-32768 + 32767 = %d, want -1", r)
+		t.Errorf("-32768 %s 32767 = %d, want -1", "+", r)
 	}
 	x = -32767
 	y = -32768
 	r = x + y
 	if r != 1 {
-		t.Errorf("-32767 + -32768 = %d, want 1", r)
+		t.Errorf("-32767 %s -32768 = %d, want 1", "+", r)
 	}
 	y = -32767
 	r = x + y
 	if r != 2 {
-		t.Errorf("-32767 + -32767 = %d, want 2", r)
+		t.Errorf("-32767 %s -32767 = %d, want 2", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != -32768 {
-		t.Errorf("-32767 + -1 = %d, want -32768", r)
+		t.Errorf("-32767 %s -1 = %d, want -32768", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != -32767 {
-		t.Errorf("-32767 + 0 = %d, want -32767", r)
+		t.Errorf("-32767 %s 0 = %d, want -32767", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != -32766 {
-		t.Errorf("-32767 + 1 = %d, want -32766", r)
+		t.Errorf("-32767 %s 1 = %d, want -32766", "+", r)
 	}
 	y = 32766
 	r = x + y
 	if r != -1 {
-		t.Errorf("-32767 + 32766 = %d, want -1", r)
+		t.Errorf("-32767 %s 32766 = %d, want -1", "+", r)
 	}
 	y = 32767
 	r = x + y
 	if r != 0 {
-		t.Errorf("-32767 + 32767 = %d, want 0", r)
+		t.Errorf("-32767 %s 32767 = %d, want 0", "+", r)
 	}
 	x = -1
 	y = -32768
 	r = x + y
 	if r != 32767 {
-		t.Errorf("-1 + -32768 = %d, want 32767", r)
+		t.Errorf("-1 %s -32768 = %d, want 32767", "+", r)
 	}
 	y = -32767
 	r = x + y
 	if r != -32768 {
-		t.Errorf("-1 + -32767 = %d, want -32768", r)
+		t.Errorf("-1 %s -32767 = %d, want -32768", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != -2 {
-		t.Errorf("-1 + -1 = %d, want -2", r)
+		t.Errorf("-1 %s -1 = %d, want -2", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != -1 {
-		t.Errorf("-1 + 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 0 {
-		t.Errorf("-1 + 1 = %d, want 0", r)
+		t.Errorf("-1 %s 1 = %d, want 0", "+", r)
 	}
 	y = 32766
 	r = x + y
 	if r != 32765 {
-		t.Errorf("-1 + 32766 = %d, want 32765", r)
+		t.Errorf("-1 %s 32766 = %d, want 32765", "+", r)
 	}
 	y = 32767
 	r = x + y
 	if r != 32766 {
-		t.Errorf("-1 + 32767 = %d, want 32766", r)
+		t.Errorf("-1 %s 32767 = %d, want 32766", "+", r)
 	}
 	x = 0
 	y = -32768
 	r = x + y
 	if r != -32768 {
-		t.Errorf("0 + -32768 = %d, want -32768", r)
+		t.Errorf("0 %s -32768 = %d, want -32768", "+", r)
 	}
 	y = -32767
 	r = x + y
 	if r != -32767 {
-		t.Errorf("0 + -32767 = %d, want -32767", r)
+		t.Errorf("0 %s -32767 = %d, want -32767", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != -1 {
-		t.Errorf("0 + -1 = %d, want -1", r)
+		t.Errorf("0 %s -1 = %d, want -1", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != 0 {
-		t.Errorf("0 + 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 1 {
-		t.Errorf("0 + 1 = %d, want 1", r)
+		t.Errorf("0 %s 1 = %d, want 1", "+", r)
 	}
 	y = 32766
 	r = x + y
 	if r != 32766 {
-		t.Errorf("0 + 32766 = %d, want 32766", r)
+		t.Errorf("0 %s 32766 = %d, want 32766", "+", r)
 	}
 	y = 32767
 	r = x + y
 	if r != 32767 {
-		t.Errorf("0 + 32767 = %d, want 32767", r)
+		t.Errorf("0 %s 32767 = %d, want 32767", "+", r)
 	}
 	x = 1
 	y = -32768
 	r = x + y
 	if r != -32767 {
-		t.Errorf("1 + -32768 = %d, want -32767", r)
+		t.Errorf("1 %s -32768 = %d, want -32767", "+", r)
 	}
 	y = -32767
 	r = x + y
 	if r != -32766 {
-		t.Errorf("1 + -32767 = %d, want -32766", r)
+		t.Errorf("1 %s -32767 = %d, want -32766", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != 0 {
-		t.Errorf("1 + -1 = %d, want 0", r)
+		t.Errorf("1 %s -1 = %d, want 0", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != 1 {
-		t.Errorf("1 + 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 2 {
-		t.Errorf("1 + 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "+", r)
 	}
 	y = 32766
 	r = x + y
 	if r != 32767 {
-		t.Errorf("1 + 32766 = %d, want 32767", r)
+		t.Errorf("1 %s 32766 = %d, want 32767", "+", r)
 	}
 	y = 32767
 	r = x + y
 	if r != -32768 {
-		t.Errorf("1 + 32767 = %d, want -32768", r)
+		t.Errorf("1 %s 32767 = %d, want -32768", "+", r)
 	}
 	x = 32766
 	y = -32768
 	r = x + y
 	if r != -2 {
-		t.Errorf("32766 + -32768 = %d, want -2", r)
+		t.Errorf("32766 %s -32768 = %d, want -2", "+", r)
 	}
 	y = -32767
 	r = x + y
 	if r != -1 {
-		t.Errorf("32766 + -32767 = %d, want -1", r)
+		t.Errorf("32766 %s -32767 = %d, want -1", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != 32765 {
-		t.Errorf("32766 + -1 = %d, want 32765", r)
+		t.Errorf("32766 %s -1 = %d, want 32765", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != 32766 {
-		t.Errorf("32766 + 0 = %d, want 32766", r)
+		t.Errorf("32766 %s 0 = %d, want 32766", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 32767 {
-		t.Errorf("32766 + 1 = %d, want 32767", r)
+		t.Errorf("32766 %s 1 = %d, want 32767", "+", r)
 	}
 	y = 32766
 	r = x + y
 	if r != -4 {
-		t.Errorf("32766 + 32766 = %d, want -4", r)
+		t.Errorf("32766 %s 32766 = %d, want -4", "+", r)
 	}
 	y = 32767
 	r = x + y
 	if r != -3 {
-		t.Errorf("32766 + 32767 = %d, want -3", r)
+		t.Errorf("32766 %s 32767 = %d, want -3", "+", r)
 	}
 	x = 32767
 	y = -32768
 	r = x + y
 	if r != -1 {
-		t.Errorf("32767 + -32768 = %d, want -1", r)
+		t.Errorf("32767 %s -32768 = %d, want -1", "+", r)
 	}
 	y = -32767
 	r = x + y
 	if r != 0 {
-		t.Errorf("32767 + -32767 = %d, want 0", r)
+		t.Errorf("32767 %s -32767 = %d, want 0", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != 32766 {
-		t.Errorf("32767 + -1 = %d, want 32766", r)
+		t.Errorf("32767 %s -1 = %d, want 32766", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != 32767 {
-		t.Errorf("32767 + 0 = %d, want 32767", r)
+		t.Errorf("32767 %s 0 = %d, want 32767", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != -32768 {
-		t.Errorf("32767 + 1 = %d, want -32768", r)
+		t.Errorf("32767 %s 1 = %d, want -32768", "+", r)
 	}
 	y = 32766
 	r = x + y
 	if r != -3 {
-		t.Errorf("32767 + 32766 = %d, want -3", r)
+		t.Errorf("32767 %s 32766 = %d, want -3", "+", r)
 	}
 	y = 32767
 	r = x + y
 	if r != -2 {
-		t.Errorf("32767 + 32767 = %d, want -2", r)
+		t.Errorf("32767 %s 32767 = %d, want -2", "+", r)
 	}
 }
 func TestConstFoldint16sub(t *testing.T) {
@@ -3988,253 +3988,253 @@ func TestConstFoldint16sub(t *testing.T) {
 	y = -32768
 	r = x - y
 	if r != 0 {
-		t.Errorf("-32768 - -32768 = %d, want 0", r)
+		t.Errorf("-32768 %s -32768 = %d, want 0", "-", r)
 	}
 	y = -32767
 	r = x - y
 	if r != -1 {
-		t.Errorf("-32768 - -32767 = %d, want -1", r)
+		t.Errorf("-32768 %s -32767 = %d, want -1", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != -32767 {
-		t.Errorf("-32768 - -1 = %d, want -32767", r)
+		t.Errorf("-32768 %s -1 = %d, want -32767", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != -32768 {
-		t.Errorf("-32768 - 0 = %d, want -32768", r)
+		t.Errorf("-32768 %s 0 = %d, want -32768", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 32767 {
-		t.Errorf("-32768 - 1 = %d, want 32767", r)
+		t.Errorf("-32768 %s 1 = %d, want 32767", "-", r)
 	}
 	y = 32766
 	r = x - y
 	if r != 2 {
-		t.Errorf("-32768 - 32766 = %d, want 2", r)
+		t.Errorf("-32768 %s 32766 = %d, want 2", "-", r)
 	}
 	y = 32767
 	r = x - y
 	if r != 1 {
-		t.Errorf("-32768 - 32767 = %d, want 1", r)
+		t.Errorf("-32768 %s 32767 = %d, want 1", "-", r)
 	}
 	x = -32767
 	y = -32768
 	r = x - y
 	if r != 1 {
-		t.Errorf("-32767 - -32768 = %d, want 1", r)
+		t.Errorf("-32767 %s -32768 = %d, want 1", "-", r)
 	}
 	y = -32767
 	r = x - y
 	if r != 0 {
-		t.Errorf("-32767 - -32767 = %d, want 0", r)
+		t.Errorf("-32767 %s -32767 = %d, want 0", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != -32766 {
-		t.Errorf("-32767 - -1 = %d, want -32766", r)
+		t.Errorf("-32767 %s -1 = %d, want -32766", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != -32767 {
-		t.Errorf("-32767 - 0 = %d, want -32767", r)
+		t.Errorf("-32767 %s 0 = %d, want -32767", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != -32768 {
-		t.Errorf("-32767 - 1 = %d, want -32768", r)
+		t.Errorf("-32767 %s 1 = %d, want -32768", "-", r)
 	}
 	y = 32766
 	r = x - y
 	if r != 3 {
-		t.Errorf("-32767 - 32766 = %d, want 3", r)
+		t.Errorf("-32767 %s 32766 = %d, want 3", "-", r)
 	}
 	y = 32767
 	r = x - y
 	if r != 2 {
-		t.Errorf("-32767 - 32767 = %d, want 2", r)
+		t.Errorf("-32767 %s 32767 = %d, want 2", "-", r)
 	}
 	x = -1
 	y = -32768
 	r = x - y
 	if r != 32767 {
-		t.Errorf("-1 - -32768 = %d, want 32767", r)
+		t.Errorf("-1 %s -32768 = %d, want 32767", "-", r)
 	}
 	y = -32767
 	r = x - y
 	if r != 32766 {
-		t.Errorf("-1 - -32767 = %d, want 32766", r)
+		t.Errorf("-1 %s -32767 = %d, want 32766", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != 0 {
-		t.Errorf("-1 - -1 = %d, want 0", r)
+		t.Errorf("-1 %s -1 = %d, want 0", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != -1 {
-		t.Errorf("-1 - 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != -2 {
-		t.Errorf("-1 - 1 = %d, want -2", r)
+		t.Errorf("-1 %s 1 = %d, want -2", "-", r)
 	}
 	y = 32766
 	r = x - y
 	if r != -32767 {
-		t.Errorf("-1 - 32766 = %d, want -32767", r)
+		t.Errorf("-1 %s 32766 = %d, want -32767", "-", r)
 	}
 	y = 32767
 	r = x - y
 	if r != -32768 {
-		t.Errorf("-1 - 32767 = %d, want -32768", r)
+		t.Errorf("-1 %s 32767 = %d, want -32768", "-", r)
 	}
 	x = 0
 	y = -32768
 	r = x - y
 	if r != -32768 {
-		t.Errorf("0 - -32768 = %d, want -32768", r)
+		t.Errorf("0 %s -32768 = %d, want -32768", "-", r)
 	}
 	y = -32767
 	r = x - y
 	if r != 32767 {
-		t.Errorf("0 - -32767 = %d, want 32767", r)
+		t.Errorf("0 %s -32767 = %d, want 32767", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != 1 {
-		t.Errorf("0 - -1 = %d, want 1", r)
+		t.Errorf("0 %s -1 = %d, want 1", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != 0 {
-		t.Errorf("0 - 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != -1 {
-		t.Errorf("0 - 1 = %d, want -1", r)
+		t.Errorf("0 %s 1 = %d, want -1", "-", r)
 	}
 	y = 32766
 	r = x - y
 	if r != -32766 {
-		t.Errorf("0 - 32766 = %d, want -32766", r)
+		t.Errorf("0 %s 32766 = %d, want -32766", "-", r)
 	}
 	y = 32767
 	r = x - y
 	if r != -32767 {
-		t.Errorf("0 - 32767 = %d, want -32767", r)
+		t.Errorf("0 %s 32767 = %d, want -32767", "-", r)
 	}
 	x = 1
 	y = -32768
 	r = x - y
 	if r != -32767 {
-		t.Errorf("1 - -32768 = %d, want -32767", r)
+		t.Errorf("1 %s -32768 = %d, want -32767", "-", r)
 	}
 	y = -32767
 	r = x - y
 	if r != -32768 {
-		t.Errorf("1 - -32767 = %d, want -32768", r)
+		t.Errorf("1 %s -32767 = %d, want -32768", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != 2 {
-		t.Errorf("1 - -1 = %d, want 2", r)
+		t.Errorf("1 %s -1 = %d, want 2", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != 1 {
-		t.Errorf("1 - 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 0 {
-		t.Errorf("1 - 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", "-", r)
 	}
 	y = 32766
 	r = x - y
 	if r != -32765 {
-		t.Errorf("1 - 32766 = %d, want -32765", r)
+		t.Errorf("1 %s 32766 = %d, want -32765", "-", r)
 	}
 	y = 32767
 	r = x - y
 	if r != -32766 {
-		t.Errorf("1 - 32767 = %d, want -32766", r)
+		t.Errorf("1 %s 32767 = %d, want -32766", "-", r)
 	}
 	x = 32766
 	y = -32768
 	r = x - y
 	if r != -2 {
-		t.Errorf("32766 - -32768 = %d, want -2", r)
+		t.Errorf("32766 %s -32768 = %d, want -2", "-", r)
 	}
 	y = -32767
 	r = x - y
 	if r != -3 {
-		t.Errorf("32766 - -32767 = %d, want -3", r)
+		t.Errorf("32766 %s -32767 = %d, want -3", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != 32767 {
-		t.Errorf("32766 - -1 = %d, want 32767", r)
+		t.Errorf("32766 %s -1 = %d, want 32767", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != 32766 {
-		t.Errorf("32766 - 0 = %d, want 32766", r)
+		t.Errorf("32766 %s 0 = %d, want 32766", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 32765 {
-		t.Errorf("32766 - 1 = %d, want 32765", r)
+		t.Errorf("32766 %s 1 = %d, want 32765", "-", r)
 	}
 	y = 32766
 	r = x - y
 	if r != 0 {
-		t.Errorf("32766 - 32766 = %d, want 0", r)
+		t.Errorf("32766 %s 32766 = %d, want 0", "-", r)
 	}
 	y = 32767
 	r = x - y
 	if r != -1 {
-		t.Errorf("32766 - 32767 = %d, want -1", r)
+		t.Errorf("32766 %s 32767 = %d, want -1", "-", r)
 	}
 	x = 32767
 	y = -32768
 	r = x - y
 	if r != -1 {
-		t.Errorf("32767 - -32768 = %d, want -1", r)
+		t.Errorf("32767 %s -32768 = %d, want -1", "-", r)
 	}
 	y = -32767
 	r = x - y
 	if r != -2 {
-		t.Errorf("32767 - -32767 = %d, want -2", r)
+		t.Errorf("32767 %s -32767 = %d, want -2", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != -32768 {
-		t.Errorf("32767 - -1 = %d, want -32768", r)
+		t.Errorf("32767 %s -1 = %d, want -32768", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != 32767 {
-		t.Errorf("32767 - 0 = %d, want 32767", r)
+		t.Errorf("32767 %s 0 = %d, want 32767", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 32766 {
-		t.Errorf("32767 - 1 = %d, want 32766", r)
+		t.Errorf("32767 %s 1 = %d, want 32766", "-", r)
 	}
 	y = 32766
 	r = x - y
 	if r != 1 {
-		t.Errorf("32767 - 32766 = %d, want 1", r)
+		t.Errorf("32767 %s 32766 = %d, want 1", "-", r)
 	}
 	y = 32767
 	r = x - y
 	if r != 0 {
-		t.Errorf("32767 - 32767 = %d, want 0", r)
+		t.Errorf("32767 %s 32767 = %d, want 0", "-", r)
 	}
 }
 func TestConstFoldint16div(t *testing.T) {
@@ -4243,218 +4243,218 @@ func TestConstFoldint16div(t *testing.T) {
 	y = -32768
 	r = x / y
 	if r != 1 {
-		t.Errorf("-32768 / -32768 = %d, want 1", r)
+		t.Errorf("-32768 %s -32768 = %d, want 1", "/", r)
 	}
 	y = -32767
 	r = x / y
 	if r != 1 {
-		t.Errorf("-32768 / -32767 = %d, want 1", r)
+		t.Errorf("-32768 %s -32767 = %d, want 1", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != -32768 {
-		t.Errorf("-32768 / -1 = %d, want -32768", r)
+		t.Errorf("-32768 %s -1 = %d, want -32768", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != -32768 {
-		t.Errorf("-32768 / 1 = %d, want -32768", r)
+		t.Errorf("-32768 %s 1 = %d, want -32768", "/", r)
 	}
 	y = 32766
 	r = x / y
 	if r != -1 {
-		t.Errorf("-32768 / 32766 = %d, want -1", r)
+		t.Errorf("-32768 %s 32766 = %d, want -1", "/", r)
 	}
 	y = 32767
 	r = x / y
 	if r != -1 {
-		t.Errorf("-32768 / 32767 = %d, want -1", r)
+		t.Errorf("-32768 %s 32767 = %d, want -1", "/", r)
 	}
 	x = -32767
 	y = -32768
 	r = x / y
 	if r != 0 {
-		t.Errorf("-32767 / -32768 = %d, want 0", r)
+		t.Errorf("-32767 %s -32768 = %d, want 0", "/", r)
 	}
 	y = -32767
 	r = x / y
 	if r != 1 {
-		t.Errorf("-32767 / -32767 = %d, want 1", r)
+		t.Errorf("-32767 %s -32767 = %d, want 1", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != 32767 {
-		t.Errorf("-32767 / -1 = %d, want 32767", r)
+		t.Errorf("-32767 %s -1 = %d, want 32767", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != -32767 {
-		t.Errorf("-32767 / 1 = %d, want -32767", r)
+		t.Errorf("-32767 %s 1 = %d, want -32767", "/", r)
 	}
 	y = 32766
 	r = x / y
 	if r != -1 {
-		t.Errorf("-32767 / 32766 = %d, want -1", r)
+		t.Errorf("-32767 %s 32766 = %d, want -1", "/", r)
 	}
 	y = 32767
 	r = x / y
 	if r != -1 {
-		t.Errorf("-32767 / 32767 = %d, want -1", r)
+		t.Errorf("-32767 %s 32767 = %d, want -1", "/", r)
 	}
 	x = -1
 	y = -32768
 	r = x / y
 	if r != 0 {
-		t.Errorf("-1 / -32768 = %d, want 0", r)
+		t.Errorf("-1 %s -32768 = %d, want 0", "/", r)
 	}
 	y = -32767
 	r = x / y
 	if r != 0 {
-		t.Errorf("-1 / -32767 = %d, want 0", r)
+		t.Errorf("-1 %s -32767 = %d, want 0", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != 1 {
-		t.Errorf("-1 / -1 = %d, want 1", r)
+		t.Errorf("-1 %s -1 = %d, want 1", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != -1 {
-		t.Errorf("-1 / 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", "/", r)
 	}
 	y = 32766
 	r = x / y
 	if r != 0 {
-		t.Errorf("-1 / 32766 = %d, want 0", r)
+		t.Errorf("-1 %s 32766 = %d, want 0", "/", r)
 	}
 	y = 32767
 	r = x / y
 	if r != 0 {
-		t.Errorf("-1 / 32767 = %d, want 0", r)
+		t.Errorf("-1 %s 32767 = %d, want 0", "/", r)
 	}
 	x = 0
 	y = -32768
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / -32768 = %d, want 0", r)
+		t.Errorf("0 %s -32768 = %d, want 0", "/", r)
 	}
 	y = -32767
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / -32767 = %d, want 0", r)
+		t.Errorf("0 %s -32767 = %d, want 0", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / -1 = %d, want 0", r)
+		t.Errorf("0 %s -1 = %d, want 0", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "/", r)
 	}
 	y = 32766
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 32766 = %d, want 0", r)
+		t.Errorf("0 %s 32766 = %d, want 0", "/", r)
 	}
 	y = 32767
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 32767 = %d, want 0", r)
+		t.Errorf("0 %s 32767 = %d, want 0", "/", r)
 	}
 	x = 1
 	y = -32768
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / -32768 = %d, want 0", r)
+		t.Errorf("1 %s -32768 = %d, want 0", "/", r)
 	}
 	y = -32767
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / -32767 = %d, want 0", r)
+		t.Errorf("1 %s -32767 = %d, want 0", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != -1 {
-		t.Errorf("1 / -1 = %d, want -1", r)
+		t.Errorf("1 %s -1 = %d, want -1", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != 1 {
-		t.Errorf("1 / 1 = %d, want 1", r)
+		t.Errorf("1 %s 1 = %d, want 1", "/", r)
 	}
 	y = 32766
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / 32766 = %d, want 0", r)
+		t.Errorf("1 %s 32766 = %d, want 0", "/", r)
 	}
 	y = 32767
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / 32767 = %d, want 0", r)
+		t.Errorf("1 %s 32767 = %d, want 0", "/", r)
 	}
 	x = 32766
 	y = -32768
 	r = x / y
 	if r != 0 {
-		t.Errorf("32766 / -32768 = %d, want 0", r)
+		t.Errorf("32766 %s -32768 = %d, want 0", "/", r)
 	}
 	y = -32767
 	r = x / y
 	if r != 0 {
-		t.Errorf("32766 / -32767 = %d, want 0", r)
+		t.Errorf("32766 %s -32767 = %d, want 0", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != -32766 {
-		t.Errorf("32766 / -1 = %d, want -32766", r)
+		t.Errorf("32766 %s -1 = %d, want -32766", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != 32766 {
-		t.Errorf("32766 / 1 = %d, want 32766", r)
+		t.Errorf("32766 %s 1 = %d, want 32766", "/", r)
 	}
 	y = 32766
 	r = x / y
 	if r != 1 {
-		t.Errorf("32766 / 32766 = %d, want 1", r)
+		t.Errorf("32766 %s 32766 = %d, want 1", "/", r)
 	}
 	y = 32767
 	r = x / y
 	if r != 0 {
-		t.Errorf("32766 / 32767 = %d, want 0", r)
+		t.Errorf("32766 %s 32767 = %d, want 0", "/", r)
 	}
 	x = 32767
 	y = -32768
 	r = x / y
 	if r != 0 {
-		t.Errorf("32767 / -32768 = %d, want 0", r)
+		t.Errorf("32767 %s -32768 = %d, want 0", "/", r)
 	}
 	y = -32767
 	r = x / y
 	if r != -1 {
-		t.Errorf("32767 / -32767 = %d, want -1", r)
+		t.Errorf("32767 %s -32767 = %d, want -1", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != -32767 {
-		t.Errorf("32767 / -1 = %d, want -32767", r)
+		t.Errorf("32767 %s -1 = %d, want -32767", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != 32767 {
-		t.Errorf("32767 / 1 = %d, want 32767", r)
+		t.Errorf("32767 %s 1 = %d, want 32767", "/", r)
 	}
 	y = 32766
 	r = x / y
 	if r != 1 {
-		t.Errorf("32767 / 32766 = %d, want 1", r)
+		t.Errorf("32767 %s 32766 = %d, want 1", "/", r)
 	}
 	y = 32767
 	r = x / y
 	if r != 1 {
-		t.Errorf("32767 / 32767 = %d, want 1", r)
+		t.Errorf("32767 %s 32767 = %d, want 1", "/", r)
 	}
 }
 func TestConstFoldint16mul(t *testing.T) {
@@ -4463,253 +4463,253 @@ func TestConstFoldint16mul(t *testing.T) {
 	y = -32768
 	r = x * y
 	if r != 0 {
-		t.Errorf("-32768 * -32768 = %d, want 0", r)
+		t.Errorf("-32768 %s -32768 = %d, want 0", "*", r)
 	}
 	y = -32767
 	r = x * y
 	if r != -32768 {
-		t.Errorf("-32768 * -32767 = %d, want -32768", r)
+		t.Errorf("-32768 %s -32767 = %d, want -32768", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != -32768 {
-		t.Errorf("-32768 * -1 = %d, want -32768", r)
+		t.Errorf("-32768 %s -1 = %d, want -32768", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("-32768 * 0 = %d, want 0", r)
+		t.Errorf("-32768 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != -32768 {
-		t.Errorf("-32768 * 1 = %d, want -32768", r)
+		t.Errorf("-32768 %s 1 = %d, want -32768", "*", r)
 	}
 	y = 32766
 	r = x * y
 	if r != 0 {
-		t.Errorf("-32768 * 32766 = %d, want 0", r)
+		t.Errorf("-32768 %s 32766 = %d, want 0", "*", r)
 	}
 	y = 32767
 	r = x * y
 	if r != -32768 {
-		t.Errorf("-32768 * 32767 = %d, want -32768", r)
+		t.Errorf("-32768 %s 32767 = %d, want -32768", "*", r)
 	}
 	x = -32767
 	y = -32768
 	r = x * y
 	if r != -32768 {
-		t.Errorf("-32767 * -32768 = %d, want -32768", r)
+		t.Errorf("-32767 %s -32768 = %d, want -32768", "*", r)
 	}
 	y = -32767
 	r = x * y
 	if r != 1 {
-		t.Errorf("-32767 * -32767 = %d, want 1", r)
+		t.Errorf("-32767 %s -32767 = %d, want 1", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != 32767 {
-		t.Errorf("-32767 * -1 = %d, want 32767", r)
+		t.Errorf("-32767 %s -1 = %d, want 32767", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("-32767 * 0 = %d, want 0", r)
+		t.Errorf("-32767 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != -32767 {
-		t.Errorf("-32767 * 1 = %d, want -32767", r)
+		t.Errorf("-32767 %s 1 = %d, want -32767", "*", r)
 	}
 	y = 32766
 	r = x * y
 	if r != 32766 {
-		t.Errorf("-32767 * 32766 = %d, want 32766", r)
+		t.Errorf("-32767 %s 32766 = %d, want 32766", "*", r)
 	}
 	y = 32767
 	r = x * y
 	if r != -1 {
-		t.Errorf("-32767 * 32767 = %d, want -1", r)
+		t.Errorf("-32767 %s 32767 = %d, want -1", "*", r)
 	}
 	x = -1
 	y = -32768
 	r = x * y
 	if r != -32768 {
-		t.Errorf("-1 * -32768 = %d, want -32768", r)
+		t.Errorf("-1 %s -32768 = %d, want -32768", "*", r)
 	}
 	y = -32767
 	r = x * y
 	if r != 32767 {
-		t.Errorf("-1 * -32767 = %d, want 32767", r)
+		t.Errorf("-1 %s -32767 = %d, want 32767", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != 1 {
-		t.Errorf("-1 * -1 = %d, want 1", r)
+		t.Errorf("-1 %s -1 = %d, want 1", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("-1 * 0 = %d, want 0", r)
+		t.Errorf("-1 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != -1 {
-		t.Errorf("-1 * 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", "*", r)
 	}
 	y = 32766
 	r = x * y
 	if r != -32766 {
-		t.Errorf("-1 * 32766 = %d, want -32766", r)
+		t.Errorf("-1 %s 32766 = %d, want -32766", "*", r)
 	}
 	y = 32767
 	r = x * y
 	if r != -32767 {
-		t.Errorf("-1 * 32767 = %d, want -32767", r)
+		t.Errorf("-1 %s 32767 = %d, want -32767", "*", r)
 	}
 	x = 0
 	y = -32768
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * -32768 = %d, want 0", r)
+		t.Errorf("0 %s -32768 = %d, want 0", "*", r)
 	}
 	y = -32767
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * -32767 = %d, want 0", r)
+		t.Errorf("0 %s -32767 = %d, want 0", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * -1 = %d, want 0", r)
+		t.Errorf("0 %s -1 = %d, want 0", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "*", r)
 	}
 	y = 32766
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 32766 = %d, want 0", r)
+		t.Errorf("0 %s 32766 = %d, want 0", "*", r)
 	}
 	y = 32767
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 32767 = %d, want 0", r)
+		t.Errorf("0 %s 32767 = %d, want 0", "*", r)
 	}
 	x = 1
 	y = -32768
 	r = x * y
 	if r != -32768 {
-		t.Errorf("1 * -32768 = %d, want -32768", r)
+		t.Errorf("1 %s -32768 = %d, want -32768", "*", r)
 	}
 	y = -32767
 	r = x * y
 	if r != -32767 {
-		t.Errorf("1 * -32767 = %d, want -32767", r)
+		t.Errorf("1 %s -32767 = %d, want -32767", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != -1 {
-		t.Errorf("1 * -1 = %d, want -1", r)
+		t.Errorf("1 %s -1 = %d, want -1", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("1 * 0 = %d, want 0", r)
+		t.Errorf("1 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 1 {
-		t.Errorf("1 * 1 = %d, want 1", r)
+		t.Errorf("1 %s 1 = %d, want 1", "*", r)
 	}
 	y = 32766
 	r = x * y
 	if r != 32766 {
-		t.Errorf("1 * 32766 = %d, want 32766", r)
+		t.Errorf("1 %s 32766 = %d, want 32766", "*", r)
 	}
 	y = 32767
 	r = x * y
 	if r != 32767 {
-		t.Errorf("1 * 32767 = %d, want 32767", r)
+		t.Errorf("1 %s 32767 = %d, want 32767", "*", r)
 	}
 	x = 32766
 	y = -32768
 	r = x * y
 	if r != 0 {
-		t.Errorf("32766 * -32768 = %d, want 0", r)
+		t.Errorf("32766 %s -32768 = %d, want 0", "*", r)
 	}
 	y = -32767
 	r = x * y
 	if r != 32766 {
-		t.Errorf("32766 * -32767 = %d, want 32766", r)
+		t.Errorf("32766 %s -32767 = %d, want 32766", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != -32766 {
-		t.Errorf("32766 * -1 = %d, want -32766", r)
+		t.Errorf("32766 %s -1 = %d, want -32766", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("32766 * 0 = %d, want 0", r)
+		t.Errorf("32766 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 32766 {
-		t.Errorf("32766 * 1 = %d, want 32766", r)
+		t.Errorf("32766 %s 1 = %d, want 32766", "*", r)
 	}
 	y = 32766
 	r = x * y
 	if r != 4 {
-		t.Errorf("32766 * 32766 = %d, want 4", r)
+		t.Errorf("32766 %s 32766 = %d, want 4", "*", r)
 	}
 	y = 32767
 	r = x * y
 	if r != -32766 {
-		t.Errorf("32766 * 32767 = %d, want -32766", r)
+		t.Errorf("32766 %s 32767 = %d, want -32766", "*", r)
 	}
 	x = 32767
 	y = -32768
 	r = x * y
 	if r != -32768 {
-		t.Errorf("32767 * -32768 = %d, want -32768", r)
+		t.Errorf("32767 %s -32768 = %d, want -32768", "*", r)
 	}
 	y = -32767
 	r = x * y
 	if r != -1 {
-		t.Errorf("32767 * -32767 = %d, want -1", r)
+		t.Errorf("32767 %s -32767 = %d, want -1", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != -32767 {
-		t.Errorf("32767 * -1 = %d, want -32767", r)
+		t.Errorf("32767 %s -1 = %d, want -32767", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("32767 * 0 = %d, want 0", r)
+		t.Errorf("32767 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 32767 {
-		t.Errorf("32767 * 1 = %d, want 32767", r)
+		t.Errorf("32767 %s 1 = %d, want 32767", "*", r)
 	}
 	y = 32766
 	r = x * y
 	if r != -32766 {
-		t.Errorf("32767 * 32766 = %d, want -32766", r)
+		t.Errorf("32767 %s 32766 = %d, want -32766", "*", r)
 	}
 	y = 32767
 	r = x * y
 	if r != 1 {
-		t.Errorf("32767 * 32767 = %d, want 1", r)
+		t.Errorf("32767 %s 32767 = %d, want 1", "*", r)
 	}
 }
 func TestConstFoldint16mod(t *testing.T) {
@@ -4718,218 +4718,218 @@ func TestConstFoldint16mod(t *testing.T) {
 	y = -32768
 	r = x % y
 	if r != 0 {
-		t.Errorf("-32768 % -32768 = %d, want 0", r)
+		t.Errorf("-32768 %s -32768 = %d, want 0", "%", r)
 	}
 	y = -32767
 	r = x % y
 	if r != -1 {
-		t.Errorf("-32768 % -32767 = %d, want -1", r)
+		t.Errorf("-32768 %s -32767 = %d, want -1", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-32768 % -1 = %d, want 0", r)
+		t.Errorf("-32768 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-32768 % 1 = %d, want 0", r)
+		t.Errorf("-32768 %s 1 = %d, want 0", "%", r)
 	}
 	y = 32766
 	r = x % y
 	if r != -2 {
-		t.Errorf("-32768 % 32766 = %d, want -2", r)
+		t.Errorf("-32768 %s 32766 = %d, want -2", "%", r)
 	}
 	y = 32767
 	r = x % y
 	if r != -1 {
-		t.Errorf("-32768 % 32767 = %d, want -1", r)
+		t.Errorf("-32768 %s 32767 = %d, want -1", "%", r)
 	}
 	x = -32767
 	y = -32768
 	r = x % y
 	if r != -32767 {
-		t.Errorf("-32767 % -32768 = %d, want -32767", r)
+		t.Errorf("-32767 %s -32768 = %d, want -32767", "%", r)
 	}
 	y = -32767
 	r = x % y
 	if r != 0 {
-		t.Errorf("-32767 % -32767 = %d, want 0", r)
+		t.Errorf("-32767 %s -32767 = %d, want 0", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-32767 % -1 = %d, want 0", r)
+		t.Errorf("-32767 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-32767 % 1 = %d, want 0", r)
+		t.Errorf("-32767 %s 1 = %d, want 0", "%", r)
 	}
 	y = 32766
 	r = x % y
 	if r != -1 {
-		t.Errorf("-32767 % 32766 = %d, want -1", r)
+		t.Errorf("-32767 %s 32766 = %d, want -1", "%", r)
 	}
 	y = 32767
 	r = x % y
 	if r != 0 {
-		t.Errorf("-32767 % 32767 = %d, want 0", r)
+		t.Errorf("-32767 %s 32767 = %d, want 0", "%", r)
 	}
 	x = -1
 	y = -32768
 	r = x % y
 	if r != -1 {
-		t.Errorf("-1 % -32768 = %d, want -1", r)
+		t.Errorf("-1 %s -32768 = %d, want -1", "%", r)
 	}
 	y = -32767
 	r = x % y
 	if r != -1 {
-		t.Errorf("-1 % -32767 = %d, want -1", r)
+		t.Errorf("-1 %s -32767 = %d, want -1", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-1 % -1 = %d, want 0", r)
+		t.Errorf("-1 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-1 % 1 = %d, want 0", r)
+		t.Errorf("-1 %s 1 = %d, want 0", "%", r)
 	}
 	y = 32766
 	r = x % y
 	if r != -1 {
-		t.Errorf("-1 % 32766 = %d, want -1", r)
+		t.Errorf("-1 %s 32766 = %d, want -1", "%", r)
 	}
 	y = 32767
 	r = x % y
 	if r != -1 {
-		t.Errorf("-1 % 32767 = %d, want -1", r)
+		t.Errorf("-1 %s 32767 = %d, want -1", "%", r)
 	}
 	x = 0
 	y = -32768
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % -32768 = %d, want 0", r)
+		t.Errorf("0 %s -32768 = %d, want 0", "%", r)
 	}
 	y = -32767
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % -32767 = %d, want 0", r)
+		t.Errorf("0 %s -32767 = %d, want 0", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % -1 = %d, want 0", r)
+		t.Errorf("0 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "%", r)
 	}
 	y = 32766
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 32766 = %d, want 0", r)
+		t.Errorf("0 %s 32766 = %d, want 0", "%", r)
 	}
 	y = 32767
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 32767 = %d, want 0", r)
+		t.Errorf("0 %s 32767 = %d, want 0", "%", r)
 	}
 	x = 1
 	y = -32768
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % -32768 = %d, want 1", r)
+		t.Errorf("1 %s -32768 = %d, want 1", "%", r)
 	}
 	y = -32767
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % -32767 = %d, want 1", r)
+		t.Errorf("1 %s -32767 = %d, want 1", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("1 % -1 = %d, want 0", r)
+		t.Errorf("1 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("1 % 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", "%", r)
 	}
 	y = 32766
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % 32766 = %d, want 1", r)
+		t.Errorf("1 %s 32766 = %d, want 1", "%", r)
 	}
 	y = 32767
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % 32767 = %d, want 1", r)
+		t.Errorf("1 %s 32767 = %d, want 1", "%", r)
 	}
 	x = 32766
 	y = -32768
 	r = x % y
 	if r != 32766 {
-		t.Errorf("32766 % -32768 = %d, want 32766", r)
+		t.Errorf("32766 %s -32768 = %d, want 32766", "%", r)
 	}
 	y = -32767
 	r = x % y
 	if r != 32766 {
-		t.Errorf("32766 % -32767 = %d, want 32766", r)
+		t.Errorf("32766 %s -32767 = %d, want 32766", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("32766 % -1 = %d, want 0", r)
+		t.Errorf("32766 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("32766 % 1 = %d, want 0", r)
+		t.Errorf("32766 %s 1 = %d, want 0", "%", r)
 	}
 	y = 32766
 	r = x % y
 	if r != 0 {
-		t.Errorf("32766 % 32766 = %d, want 0", r)
+		t.Errorf("32766 %s 32766 = %d, want 0", "%", r)
 	}
 	y = 32767
 	r = x % y
 	if r != 32766 {
-		t.Errorf("32766 % 32767 = %d, want 32766", r)
+		t.Errorf("32766 %s 32767 = %d, want 32766", "%", r)
 	}
 	x = 32767
 	y = -32768
 	r = x % y
 	if r != 32767 {
-		t.Errorf("32767 % -32768 = %d, want 32767", r)
+		t.Errorf("32767 %s -32768 = %d, want 32767", "%", r)
 	}
 	y = -32767
 	r = x % y
 	if r != 0 {
-		t.Errorf("32767 % -32767 = %d, want 0", r)
+		t.Errorf("32767 %s -32767 = %d, want 0", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("32767 % -1 = %d, want 0", r)
+		t.Errorf("32767 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("32767 % 1 = %d, want 0", r)
+		t.Errorf("32767 %s 1 = %d, want 0", "%", r)
 	}
 	y = 32766
 	r = x % y
 	if r != 1 {
-		t.Errorf("32767 % 32766 = %d, want 1", r)
+		t.Errorf("32767 %s 32766 = %d, want 1", "%", r)
 	}
 	y = 32767
 	r = x % y
 	if r != 0 {
-		t.Errorf("32767 % 32767 = %d, want 0", r)
+		t.Errorf("32767 %s 32767 = %d, want 0", "%", r)
 	}
 }
 func TestConstFolduint8add(t *testing.T) {
@@ -4938,49 +4938,49 @@ func TestConstFolduint8add(t *testing.T) {
 	y = 0
 	r = x + y
 	if r != 0 {
-		t.Errorf("0 + 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 1 {
-		t.Errorf("0 + 1 = %d, want 1", r)
+		t.Errorf("0 %s 1 = %d, want 1", "+", r)
 	}
 	y = 255
 	r = x + y
 	if r != 255 {
-		t.Errorf("0 + 255 = %d, want 255", r)
+		t.Errorf("0 %s 255 = %d, want 255", "+", r)
 	}
 	x = 1
 	y = 0
 	r = x + y
 	if r != 1 {
-		t.Errorf("1 + 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 2 {
-		t.Errorf("1 + 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "+", r)
 	}
 	y = 255
 	r = x + y
 	if r != 0 {
-		t.Errorf("1 + 255 = %d, want 0", r)
+		t.Errorf("1 %s 255 = %d, want 0", "+", r)
 	}
 	x = 255
 	y = 0
 	r = x + y
 	if r != 255 {
-		t.Errorf("255 + 0 = %d, want 255", r)
+		t.Errorf("255 %s 0 = %d, want 255", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 0 {
-		t.Errorf("255 + 1 = %d, want 0", r)
+		t.Errorf("255 %s 1 = %d, want 0", "+", r)
 	}
 	y = 255
 	r = x + y
 	if r != 254 {
-		t.Errorf("255 + 255 = %d, want 254", r)
+		t.Errorf("255 %s 255 = %d, want 254", "+", r)
 	}
 }
 func TestConstFolduint8sub(t *testing.T) {
@@ -4989,49 +4989,49 @@ func TestConstFolduint8sub(t *testing.T) {
 	y = 0
 	r = x - y
 	if r != 0 {
-		t.Errorf("0 - 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 255 {
-		t.Errorf("0 - 1 = %d, want 255", r)
+		t.Errorf("0 %s 1 = %d, want 255", "-", r)
 	}
 	y = 255
 	r = x - y
 	if r != 1 {
-		t.Errorf("0 - 255 = %d, want 1", r)
+		t.Errorf("0 %s 255 = %d, want 1", "-", r)
 	}
 	x = 1
 	y = 0
 	r = x - y
 	if r != 1 {
-		t.Errorf("1 - 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 0 {
-		t.Errorf("1 - 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", "-", r)
 	}
 	y = 255
 	r = x - y
 	if r != 2 {
-		t.Errorf("1 - 255 = %d, want 2", r)
+		t.Errorf("1 %s 255 = %d, want 2", "-", r)
 	}
 	x = 255
 	y = 0
 	r = x - y
 	if r != 255 {
-		t.Errorf("255 - 0 = %d, want 255", r)
+		t.Errorf("255 %s 0 = %d, want 255", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 254 {
-		t.Errorf("255 - 1 = %d, want 254", r)
+		t.Errorf("255 %s 1 = %d, want 254", "-", r)
 	}
 	y = 255
 	r = x - y
 	if r != 0 {
-		t.Errorf("255 - 255 = %d, want 0", r)
+		t.Errorf("255 %s 255 = %d, want 0", "-", r)
 	}
 }
 func TestConstFolduint8div(t *testing.T) {
@@ -5040,34 +5040,34 @@ func TestConstFolduint8div(t *testing.T) {
 	y = 1
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "/", r)
 	}
 	y = 255
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 255 = %d, want 0", r)
+		t.Errorf("0 %s 255 = %d, want 0", "/", r)
 	}
 	x = 1
 	y = 1
 	r = x / y
 	if r != 1 {
-		t.Errorf("1 / 1 = %d, want 1", r)
+		t.Errorf("1 %s 1 = %d, want 1", "/", r)
 	}
 	y = 255
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / 255 = %d, want 0", r)
+		t.Errorf("1 %s 255 = %d, want 0", "/", r)
 	}
 	x = 255
 	y = 1
 	r = x / y
 	if r != 255 {
-		t.Errorf("255 / 1 = %d, want 255", r)
+		t.Errorf("255 %s 1 = %d, want 255", "/", r)
 	}
 	y = 255
 	r = x / y
 	if r != 1 {
-		t.Errorf("255 / 255 = %d, want 1", r)
+		t.Errorf("255 %s 255 = %d, want 1", "/", r)
 	}
 }
 func TestConstFolduint8mul(t *testing.T) {
@@ -5076,49 +5076,49 @@ func TestConstFolduint8mul(t *testing.T) {
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "*", r)
 	}
 	y = 255
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 255 = %d, want 0", r)
+		t.Errorf("0 %s 255 = %d, want 0", "*", r)
 	}
 	x = 1
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("1 * 0 = %d, want 0", r)
+		t.Errorf("1 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 1 {
-		t.Errorf("1 * 1 = %d, want 1", r)
+		t.Errorf("1 %s 1 = %d, want 1", "*", r)
 	}
 	y = 255
 	r = x * y
 	if r != 255 {
-		t.Errorf("1 * 255 = %d, want 255", r)
+		t.Errorf("1 %s 255 = %d, want 255", "*", r)
 	}
 	x = 255
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("255 * 0 = %d, want 0", r)
+		t.Errorf("255 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 255 {
-		t.Errorf("255 * 1 = %d, want 255", r)
+		t.Errorf("255 %s 1 = %d, want 255", "*", r)
 	}
 	y = 255
 	r = x * y
 	if r != 1 {
-		t.Errorf("255 * 255 = %d, want 1", r)
+		t.Errorf("255 %s 255 = %d, want 1", "*", r)
 	}
 }
 func TestConstFolduint8mod(t *testing.T) {
@@ -5127,34 +5127,34 @@ func TestConstFolduint8mod(t *testing.T) {
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "%", r)
 	}
 	y = 255
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 255 = %d, want 0", r)
+		t.Errorf("0 %s 255 = %d, want 0", "%", r)
 	}
 	x = 1
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("1 % 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", "%", r)
 	}
 	y = 255
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % 255 = %d, want 1", r)
+		t.Errorf("1 %s 255 = %d, want 1", "%", r)
 	}
 	x = 255
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("255 % 1 = %d, want 0", r)
+		t.Errorf("255 %s 1 = %d, want 0", "%", r)
 	}
 	y = 255
 	r = x % y
 	if r != 0 {
-		t.Errorf("255 % 255 = %d, want 0", r)
+		t.Errorf("255 %s 255 = %d, want 0", "%", r)
 	}
 }
 func TestConstFoldint8add(t *testing.T) {
@@ -5163,253 +5163,253 @@ func TestConstFoldint8add(t *testing.T) {
 	y = -128
 	r = x + y
 	if r != 0 {
-		t.Errorf("-128 + -128 = %d, want 0", r)
+		t.Errorf("-128 %s -128 = %d, want 0", "+", r)
 	}
 	y = -127
 	r = x + y
 	if r != 1 {
-		t.Errorf("-128 + -127 = %d, want 1", r)
+		t.Errorf("-128 %s -127 = %d, want 1", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != 127 {
-		t.Errorf("-128 + -1 = %d, want 127", r)
+		t.Errorf("-128 %s -1 = %d, want 127", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != -128 {
-		t.Errorf("-128 + 0 = %d, want -128", r)
+		t.Errorf("-128 %s 0 = %d, want -128", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != -127 {
-		t.Errorf("-128 + 1 = %d, want -127", r)
+		t.Errorf("-128 %s 1 = %d, want -127", "+", r)
 	}
 	y = 126
 	r = x + y
 	if r != -2 {
-		t.Errorf("-128 + 126 = %d, want -2", r)
+		t.Errorf("-128 %s 126 = %d, want -2", "+", r)
 	}
 	y = 127
 	r = x + y
 	if r != -1 {
-		t.Errorf("-128 + 127 = %d, want -1", r)
+		t.Errorf("-128 %s 127 = %d, want -1", "+", r)
 	}
 	x = -127
 	y = -128
 	r = x + y
 	if r != 1 {
-		t.Errorf("-127 + -128 = %d, want 1", r)
+		t.Errorf("-127 %s -128 = %d, want 1", "+", r)
 	}
 	y = -127
 	r = x + y
 	if r != 2 {
-		t.Errorf("-127 + -127 = %d, want 2", r)
+		t.Errorf("-127 %s -127 = %d, want 2", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != -128 {
-		t.Errorf("-127 + -1 = %d, want -128", r)
+		t.Errorf("-127 %s -1 = %d, want -128", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != -127 {
-		t.Errorf("-127 + 0 = %d, want -127", r)
+		t.Errorf("-127 %s 0 = %d, want -127", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != -126 {
-		t.Errorf("-127 + 1 = %d, want -126", r)
+		t.Errorf("-127 %s 1 = %d, want -126", "+", r)
 	}
 	y = 126
 	r = x + y
 	if r != -1 {
-		t.Errorf("-127 + 126 = %d, want -1", r)
+		t.Errorf("-127 %s 126 = %d, want -1", "+", r)
 	}
 	y = 127
 	r = x + y
 	if r != 0 {
-		t.Errorf("-127 + 127 = %d, want 0", r)
+		t.Errorf("-127 %s 127 = %d, want 0", "+", r)
 	}
 	x = -1
 	y = -128
 	r = x + y
 	if r != 127 {
-		t.Errorf("-1 + -128 = %d, want 127", r)
+		t.Errorf("-1 %s -128 = %d, want 127", "+", r)
 	}
 	y = -127
 	r = x + y
 	if r != -128 {
-		t.Errorf("-1 + -127 = %d, want -128", r)
+		t.Errorf("-1 %s -127 = %d, want -128", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != -2 {
-		t.Errorf("-1 + -1 = %d, want -2", r)
+		t.Errorf("-1 %s -1 = %d, want -2", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != -1 {
-		t.Errorf("-1 + 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 0 {
-		t.Errorf("-1 + 1 = %d, want 0", r)
+		t.Errorf("-1 %s 1 = %d, want 0", "+", r)
 	}
 	y = 126
 	r = x + y
 	if r != 125 {
-		t.Errorf("-1 + 126 = %d, want 125", r)
+		t.Errorf("-1 %s 126 = %d, want 125", "+", r)
 	}
 	y = 127
 	r = x + y
 	if r != 126 {
-		t.Errorf("-1 + 127 = %d, want 126", r)
+		t.Errorf("-1 %s 127 = %d, want 126", "+", r)
 	}
 	x = 0
 	y = -128
 	r = x + y
 	if r != -128 {
-		t.Errorf("0 + -128 = %d, want -128", r)
+		t.Errorf("0 %s -128 = %d, want -128", "+", r)
 	}
 	y = -127
 	r = x + y
 	if r != -127 {
-		t.Errorf("0 + -127 = %d, want -127", r)
+		t.Errorf("0 %s -127 = %d, want -127", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != -1 {
-		t.Errorf("0 + -1 = %d, want -1", r)
+		t.Errorf("0 %s -1 = %d, want -1", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != 0 {
-		t.Errorf("0 + 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 1 {
-		t.Errorf("0 + 1 = %d, want 1", r)
+		t.Errorf("0 %s 1 = %d, want 1", "+", r)
 	}
 	y = 126
 	r = x + y
 	if r != 126 {
-		t.Errorf("0 + 126 = %d, want 126", r)
+		t.Errorf("0 %s 126 = %d, want 126", "+", r)
 	}
 	y = 127
 	r = x + y
 	if r != 127 {
-		t.Errorf("0 + 127 = %d, want 127", r)
+		t.Errorf("0 %s 127 = %d, want 127", "+", r)
 	}
 	x = 1
 	y = -128
 	r = x + y
 	if r != -127 {
-		t.Errorf("1 + -128 = %d, want -127", r)
+		t.Errorf("1 %s -128 = %d, want -127", "+", r)
 	}
 	y = -127
 	r = x + y
 	if r != -126 {
-		t.Errorf("1 + -127 = %d, want -126", r)
+		t.Errorf("1 %s -127 = %d, want -126", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != 0 {
-		t.Errorf("1 + -1 = %d, want 0", r)
+		t.Errorf("1 %s -1 = %d, want 0", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != 1 {
-		t.Errorf("1 + 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 2 {
-		t.Errorf("1 + 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "+", r)
 	}
 	y = 126
 	r = x + y
 	if r != 127 {
-		t.Errorf("1 + 126 = %d, want 127", r)
+		t.Errorf("1 %s 126 = %d, want 127", "+", r)
 	}
 	y = 127
 	r = x + y
 	if r != -128 {
-		t.Errorf("1 + 127 = %d, want -128", r)
+		t.Errorf("1 %s 127 = %d, want -128", "+", r)
 	}
 	x = 126
 	y = -128
 	r = x + y
 	if r != -2 {
-		t.Errorf("126 + -128 = %d, want -2", r)
+		t.Errorf("126 %s -128 = %d, want -2", "+", r)
 	}
 	y = -127
 	r = x + y
 	if r != -1 {
-		t.Errorf("126 + -127 = %d, want -1", r)
+		t.Errorf("126 %s -127 = %d, want -1", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != 125 {
-		t.Errorf("126 + -1 = %d, want 125", r)
+		t.Errorf("126 %s -1 = %d, want 125", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != 126 {
-		t.Errorf("126 + 0 = %d, want 126", r)
+		t.Errorf("126 %s 0 = %d, want 126", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != 127 {
-		t.Errorf("126 + 1 = %d, want 127", r)
+		t.Errorf("126 %s 1 = %d, want 127", "+", r)
 	}
 	y = 126
 	r = x + y
 	if r != -4 {
-		t.Errorf("126 + 126 = %d, want -4", r)
+		t.Errorf("126 %s 126 = %d, want -4", "+", r)
 	}
 	y = 127
 	r = x + y
 	if r != -3 {
-		t.Errorf("126 + 127 = %d, want -3", r)
+		t.Errorf("126 %s 127 = %d, want -3", "+", r)
 	}
 	x = 127
 	y = -128
 	r = x + y
 	if r != -1 {
-		t.Errorf("127 + -128 = %d, want -1", r)
+		t.Errorf("127 %s -128 = %d, want -1", "+", r)
 	}
 	y = -127
 	r = x + y
 	if r != 0 {
-		t.Errorf("127 + -127 = %d, want 0", r)
+		t.Errorf("127 %s -127 = %d, want 0", "+", r)
 	}
 	y = -1
 	r = x + y
 	if r != 126 {
-		t.Errorf("127 + -1 = %d, want 126", r)
+		t.Errorf("127 %s -1 = %d, want 126", "+", r)
 	}
 	y = 0
 	r = x + y
 	if r != 127 {
-		t.Errorf("127 + 0 = %d, want 127", r)
+		t.Errorf("127 %s 0 = %d, want 127", "+", r)
 	}
 	y = 1
 	r = x + y
 	if r != -128 {
-		t.Errorf("127 + 1 = %d, want -128", r)
+		t.Errorf("127 %s 1 = %d, want -128", "+", r)
 	}
 	y = 126
 	r = x + y
 	if r != -3 {
-		t.Errorf("127 + 126 = %d, want -3", r)
+		t.Errorf("127 %s 126 = %d, want -3", "+", r)
 	}
 	y = 127
 	r = x + y
 	if r != -2 {
-		t.Errorf("127 + 127 = %d, want -2", r)
+		t.Errorf("127 %s 127 = %d, want -2", "+", r)
 	}
 }
 func TestConstFoldint8sub(t *testing.T) {
@@ -5418,253 +5418,253 @@ func TestConstFoldint8sub(t *testing.T) {
 	y = -128
 	r = x - y
 	if r != 0 {
-		t.Errorf("-128 - -128 = %d, want 0", r)
+		t.Errorf("-128 %s -128 = %d, want 0", "-", r)
 	}
 	y = -127
 	r = x - y
 	if r != -1 {
-		t.Errorf("-128 - -127 = %d, want -1", r)
+		t.Errorf("-128 %s -127 = %d, want -1", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != -127 {
-		t.Errorf("-128 - -1 = %d, want -127", r)
+		t.Errorf("-128 %s -1 = %d, want -127", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != -128 {
-		t.Errorf("-128 - 0 = %d, want -128", r)
+		t.Errorf("-128 %s 0 = %d, want -128", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 127 {
-		t.Errorf("-128 - 1 = %d, want 127", r)
+		t.Errorf("-128 %s 1 = %d, want 127", "-", r)
 	}
 	y = 126
 	r = x - y
 	if r != 2 {
-		t.Errorf("-128 - 126 = %d, want 2", r)
+		t.Errorf("-128 %s 126 = %d, want 2", "-", r)
 	}
 	y = 127
 	r = x - y
 	if r != 1 {
-		t.Errorf("-128 - 127 = %d, want 1", r)
+		t.Errorf("-128 %s 127 = %d, want 1", "-", r)
 	}
 	x = -127
 	y = -128
 	r = x - y
 	if r != 1 {
-		t.Errorf("-127 - -128 = %d, want 1", r)
+		t.Errorf("-127 %s -128 = %d, want 1", "-", r)
 	}
 	y = -127
 	r = x - y
 	if r != 0 {
-		t.Errorf("-127 - -127 = %d, want 0", r)
+		t.Errorf("-127 %s -127 = %d, want 0", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != -126 {
-		t.Errorf("-127 - -1 = %d, want -126", r)
+		t.Errorf("-127 %s -1 = %d, want -126", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != -127 {
-		t.Errorf("-127 - 0 = %d, want -127", r)
+		t.Errorf("-127 %s 0 = %d, want -127", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != -128 {
-		t.Errorf("-127 - 1 = %d, want -128", r)
+		t.Errorf("-127 %s 1 = %d, want -128", "-", r)
 	}
 	y = 126
 	r = x - y
 	if r != 3 {
-		t.Errorf("-127 - 126 = %d, want 3", r)
+		t.Errorf("-127 %s 126 = %d, want 3", "-", r)
 	}
 	y = 127
 	r = x - y
 	if r != 2 {
-		t.Errorf("-127 - 127 = %d, want 2", r)
+		t.Errorf("-127 %s 127 = %d, want 2", "-", r)
 	}
 	x = -1
 	y = -128
 	r = x - y
 	if r != 127 {
-		t.Errorf("-1 - -128 = %d, want 127", r)
+		t.Errorf("-1 %s -128 = %d, want 127", "-", r)
 	}
 	y = -127
 	r = x - y
 	if r != 126 {
-		t.Errorf("-1 - -127 = %d, want 126", r)
+		t.Errorf("-1 %s -127 = %d, want 126", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != 0 {
-		t.Errorf("-1 - -1 = %d, want 0", r)
+		t.Errorf("-1 %s -1 = %d, want 0", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != -1 {
-		t.Errorf("-1 - 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != -2 {
-		t.Errorf("-1 - 1 = %d, want -2", r)
+		t.Errorf("-1 %s 1 = %d, want -2", "-", r)
 	}
 	y = 126
 	r = x - y
 	if r != -127 {
-		t.Errorf("-1 - 126 = %d, want -127", r)
+		t.Errorf("-1 %s 126 = %d, want -127", "-", r)
 	}
 	y = 127
 	r = x - y
 	if r != -128 {
-		t.Errorf("-1 - 127 = %d, want -128", r)
+		t.Errorf("-1 %s 127 = %d, want -128", "-", r)
 	}
 	x = 0
 	y = -128
 	r = x - y
 	if r != -128 {
-		t.Errorf("0 - -128 = %d, want -128", r)
+		t.Errorf("0 %s -128 = %d, want -128", "-", r)
 	}
 	y = -127
 	r = x - y
 	if r != 127 {
-		t.Errorf("0 - -127 = %d, want 127", r)
+		t.Errorf("0 %s -127 = %d, want 127", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != 1 {
-		t.Errorf("0 - -1 = %d, want 1", r)
+		t.Errorf("0 %s -1 = %d, want 1", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != 0 {
-		t.Errorf("0 - 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != -1 {
-		t.Errorf("0 - 1 = %d, want -1", r)
+		t.Errorf("0 %s 1 = %d, want -1", "-", r)
 	}
 	y = 126
 	r = x - y
 	if r != -126 {
-		t.Errorf("0 - 126 = %d, want -126", r)
+		t.Errorf("0 %s 126 = %d, want -126", "-", r)
 	}
 	y = 127
 	r = x - y
 	if r != -127 {
-		t.Errorf("0 - 127 = %d, want -127", r)
+		t.Errorf("0 %s 127 = %d, want -127", "-", r)
 	}
 	x = 1
 	y = -128
 	r = x - y
 	if r != -127 {
-		t.Errorf("1 - -128 = %d, want -127", r)
+		t.Errorf("1 %s -128 = %d, want -127", "-", r)
 	}
 	y = -127
 	r = x - y
 	if r != -128 {
-		t.Errorf("1 - -127 = %d, want -128", r)
+		t.Errorf("1 %s -127 = %d, want -128", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != 2 {
-		t.Errorf("1 - -1 = %d, want 2", r)
+		t.Errorf("1 %s -1 = %d, want 2", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != 1 {
-		t.Errorf("1 - 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 0 {
-		t.Errorf("1 - 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", "-", r)
 	}
 	y = 126
 	r = x - y
 	if r != -125 {
-		t.Errorf("1 - 126 = %d, want -125", r)
+		t.Errorf("1 %s 126 = %d, want -125", "-", r)
 	}
 	y = 127
 	r = x - y
 	if r != -126 {
-		t.Errorf("1 - 127 = %d, want -126", r)
+		t.Errorf("1 %s 127 = %d, want -126", "-", r)
 	}
 	x = 126
 	y = -128
 	r = x - y
 	if r != -2 {
-		t.Errorf("126 - -128 = %d, want -2", r)
+		t.Errorf("126 %s -128 = %d, want -2", "-", r)
 	}
 	y = -127
 	r = x - y
 	if r != -3 {
-		t.Errorf("126 - -127 = %d, want -3", r)
+		t.Errorf("126 %s -127 = %d, want -3", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != 127 {
-		t.Errorf("126 - -1 = %d, want 127", r)
+		t.Errorf("126 %s -1 = %d, want 127", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != 126 {
-		t.Errorf("126 - 0 = %d, want 126", r)
+		t.Errorf("126 %s 0 = %d, want 126", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 125 {
-		t.Errorf("126 - 1 = %d, want 125", r)
+		t.Errorf("126 %s 1 = %d, want 125", "-", r)
 	}
 	y = 126
 	r = x - y
 	if r != 0 {
-		t.Errorf("126 - 126 = %d, want 0", r)
+		t.Errorf("126 %s 126 = %d, want 0", "-", r)
 	}
 	y = 127
 	r = x - y
 	if r != -1 {
-		t.Errorf("126 - 127 = %d, want -1", r)
+		t.Errorf("126 %s 127 = %d, want -1", "-", r)
 	}
 	x = 127
 	y = -128
 	r = x - y
 	if r != -1 {
-		t.Errorf("127 - -128 = %d, want -1", r)
+		t.Errorf("127 %s -128 = %d, want -1", "-", r)
 	}
 	y = -127
 	r = x - y
 	if r != -2 {
-		t.Errorf("127 - -127 = %d, want -2", r)
+		t.Errorf("127 %s -127 = %d, want -2", "-", r)
 	}
 	y = -1
 	r = x - y
 	if r != -128 {
-		t.Errorf("127 - -1 = %d, want -128", r)
+		t.Errorf("127 %s -1 = %d, want -128", "-", r)
 	}
 	y = 0
 	r = x - y
 	if r != 127 {
-		t.Errorf("127 - 0 = %d, want 127", r)
+		t.Errorf("127 %s 0 = %d, want 127", "-", r)
 	}
 	y = 1
 	r = x - y
 	if r != 126 {
-		t.Errorf("127 - 1 = %d, want 126", r)
+		t.Errorf("127 %s 1 = %d, want 126", "-", r)
 	}
 	y = 126
 	r = x - y
 	if r != 1 {
-		t.Errorf("127 - 126 = %d, want 1", r)
+		t.Errorf("127 %s 126 = %d, want 1", "-", r)
 	}
 	y = 127
 	r = x - y
 	if r != 0 {
-		t.Errorf("127 - 127 = %d, want 0", r)
+		t.Errorf("127 %s 127 = %d, want 0", "-", r)
 	}
 }
 func TestConstFoldint8div(t *testing.T) {
@@ -5673,218 +5673,218 @@ func TestConstFoldint8div(t *testing.T) {
 	y = -128
 	r = x / y
 	if r != 1 {
-		t.Errorf("-128 / -128 = %d, want 1", r)
+		t.Errorf("-128 %s -128 = %d, want 1", "/", r)
 	}
 	y = -127
 	r = x / y
 	if r != 1 {
-		t.Errorf("-128 / -127 = %d, want 1", r)
+		t.Errorf("-128 %s -127 = %d, want 1", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != -128 {
-		t.Errorf("-128 / -1 = %d, want -128", r)
+		t.Errorf("-128 %s -1 = %d, want -128", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != -128 {
-		t.Errorf("-128 / 1 = %d, want -128", r)
+		t.Errorf("-128 %s 1 = %d, want -128", "/", r)
 	}
 	y = 126
 	r = x / y
 	if r != -1 {
-		t.Errorf("-128 / 126 = %d, want -1", r)
+		t.Errorf("-128 %s 126 = %d, want -1", "/", r)
 	}
 	y = 127
 	r = x / y
 	if r != -1 {
-		t.Errorf("-128 / 127 = %d, want -1", r)
+		t.Errorf("-128 %s 127 = %d, want -1", "/", r)
 	}
 	x = -127
 	y = -128
 	r = x / y
 	if r != 0 {
-		t.Errorf("-127 / -128 = %d, want 0", r)
+		t.Errorf("-127 %s -128 = %d, want 0", "/", r)
 	}
 	y = -127
 	r = x / y
 	if r != 1 {
-		t.Errorf("-127 / -127 = %d, want 1", r)
+		t.Errorf("-127 %s -127 = %d, want 1", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != 127 {
-		t.Errorf("-127 / -1 = %d, want 127", r)
+		t.Errorf("-127 %s -1 = %d, want 127", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != -127 {
-		t.Errorf("-127 / 1 = %d, want -127", r)
+		t.Errorf("-127 %s 1 = %d, want -127", "/", r)
 	}
 	y = 126
 	r = x / y
 	if r != -1 {
-		t.Errorf("-127 / 126 = %d, want -1", r)
+		t.Errorf("-127 %s 126 = %d, want -1", "/", r)
 	}
 	y = 127
 	r = x / y
 	if r != -1 {
-		t.Errorf("-127 / 127 = %d, want -1", r)
+		t.Errorf("-127 %s 127 = %d, want -1", "/", r)
 	}
 	x = -1
 	y = -128
 	r = x / y
 	if r != 0 {
-		t.Errorf("-1 / -128 = %d, want 0", r)
+		t.Errorf("-1 %s -128 = %d, want 0", "/", r)
 	}
 	y = -127
 	r = x / y
 	if r != 0 {
-		t.Errorf("-1 / -127 = %d, want 0", r)
+		t.Errorf("-1 %s -127 = %d, want 0", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != 1 {
-		t.Errorf("-1 / -1 = %d, want 1", r)
+		t.Errorf("-1 %s -1 = %d, want 1", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != -1 {
-		t.Errorf("-1 / 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", "/", r)
 	}
 	y = 126
 	r = x / y
 	if r != 0 {
-		t.Errorf("-1 / 126 = %d, want 0", r)
+		t.Errorf("-1 %s 126 = %d, want 0", "/", r)
 	}
 	y = 127
 	r = x / y
 	if r != 0 {
-		t.Errorf("-1 / 127 = %d, want 0", r)
+		t.Errorf("-1 %s 127 = %d, want 0", "/", r)
 	}
 	x = 0
 	y = -128
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / -128 = %d, want 0", r)
+		t.Errorf("0 %s -128 = %d, want 0", "/", r)
 	}
 	y = -127
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / -127 = %d, want 0", r)
+		t.Errorf("0 %s -127 = %d, want 0", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / -1 = %d, want 0", r)
+		t.Errorf("0 %s -1 = %d, want 0", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "/", r)
 	}
 	y = 126
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 126 = %d, want 0", r)
+		t.Errorf("0 %s 126 = %d, want 0", "/", r)
 	}
 	y = 127
 	r = x / y
 	if r != 0 {
-		t.Errorf("0 / 127 = %d, want 0", r)
+		t.Errorf("0 %s 127 = %d, want 0", "/", r)
 	}
 	x = 1
 	y = -128
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / -128 = %d, want 0", r)
+		t.Errorf("1 %s -128 = %d, want 0", "/", r)
 	}
 	y = -127
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / -127 = %d, want 0", r)
+		t.Errorf("1 %s -127 = %d, want 0", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != -1 {
-		t.Errorf("1 / -1 = %d, want -1", r)
+		t.Errorf("1 %s -1 = %d, want -1", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != 1 {
-		t.Errorf("1 / 1 = %d, want 1", r)
+		t.Errorf("1 %s 1 = %d, want 1", "/", r)
 	}
 	y = 126
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / 126 = %d, want 0", r)
+		t.Errorf("1 %s 126 = %d, want 0", "/", r)
 	}
 	y = 127
 	r = x / y
 	if r != 0 {
-		t.Errorf("1 / 127 = %d, want 0", r)
+		t.Errorf("1 %s 127 = %d, want 0", "/", r)
 	}
 	x = 126
 	y = -128
 	r = x / y
 	if r != 0 {
-		t.Errorf("126 / -128 = %d, want 0", r)
+		t.Errorf("126 %s -128 = %d, want 0", "/", r)
 	}
 	y = -127
 	r = x / y
 	if r != 0 {
-		t.Errorf("126 / -127 = %d, want 0", r)
+		t.Errorf("126 %s -127 = %d, want 0", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != -126 {
-		t.Errorf("126 / -1 = %d, want -126", r)
+		t.Errorf("126 %s -1 = %d, want -126", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != 126 {
-		t.Errorf("126 / 1 = %d, want 126", r)
+		t.Errorf("126 %s 1 = %d, want 126", "/", r)
 	}
 	y = 126
 	r = x / y
 	if r != 1 {
-		t.Errorf("126 / 126 = %d, want 1", r)
+		t.Errorf("126 %s 126 = %d, want 1", "/", r)
 	}
 	y = 127
 	r = x / y
 	if r != 0 {
-		t.Errorf("126 / 127 = %d, want 0", r)
+		t.Errorf("126 %s 127 = %d, want 0", "/", r)
 	}
 	x = 127
 	y = -128
 	r = x / y
 	if r != 0 {
-		t.Errorf("127 / -128 = %d, want 0", r)
+		t.Errorf("127 %s -128 = %d, want 0", "/", r)
 	}
 	y = -127
 	r = x / y
 	if r != -1 {
-		t.Errorf("127 / -127 = %d, want -1", r)
+		t.Errorf("127 %s -127 = %d, want -1", "/", r)
 	}
 	y = -1
 	r = x / y
 	if r != -127 {
-		t.Errorf("127 / -1 = %d, want -127", r)
+		t.Errorf("127 %s -1 = %d, want -127", "/", r)
 	}
 	y = 1
 	r = x / y
 	if r != 127 {
-		t.Errorf("127 / 1 = %d, want 127", r)
+		t.Errorf("127 %s 1 = %d, want 127", "/", r)
 	}
 	y = 126
 	r = x / y
 	if r != 1 {
-		t.Errorf("127 / 126 = %d, want 1", r)
+		t.Errorf("127 %s 126 = %d, want 1", "/", r)
 	}
 	y = 127
 	r = x / y
 	if r != 1 {
-		t.Errorf("127 / 127 = %d, want 1", r)
+		t.Errorf("127 %s 127 = %d, want 1", "/", r)
 	}
 }
 func TestConstFoldint8mul(t *testing.T) {
@@ -5893,253 +5893,253 @@ func TestConstFoldint8mul(t *testing.T) {
 	y = -128
 	r = x * y
 	if r != 0 {
-		t.Errorf("-128 * -128 = %d, want 0", r)
+		t.Errorf("-128 %s -128 = %d, want 0", "*", r)
 	}
 	y = -127
 	r = x * y
 	if r != -128 {
-		t.Errorf("-128 * -127 = %d, want -128", r)
+		t.Errorf("-128 %s -127 = %d, want -128", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != -128 {
-		t.Errorf("-128 * -1 = %d, want -128", r)
+		t.Errorf("-128 %s -1 = %d, want -128", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("-128 * 0 = %d, want 0", r)
+		t.Errorf("-128 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != -128 {
-		t.Errorf("-128 * 1 = %d, want -128", r)
+		t.Errorf("-128 %s 1 = %d, want -128", "*", r)
 	}
 	y = 126
 	r = x * y
 	if r != 0 {
-		t.Errorf("-128 * 126 = %d, want 0", r)
+		t.Errorf("-128 %s 126 = %d, want 0", "*", r)
 	}
 	y = 127
 	r = x * y
 	if r != -128 {
-		t.Errorf("-128 * 127 = %d, want -128", r)
+		t.Errorf("-128 %s 127 = %d, want -128", "*", r)
 	}
 	x = -127
 	y = -128
 	r = x * y
 	if r != -128 {
-		t.Errorf("-127 * -128 = %d, want -128", r)
+		t.Errorf("-127 %s -128 = %d, want -128", "*", r)
 	}
 	y = -127
 	r = x * y
 	if r != 1 {
-		t.Errorf("-127 * -127 = %d, want 1", r)
+		t.Errorf("-127 %s -127 = %d, want 1", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != 127 {
-		t.Errorf("-127 * -1 = %d, want 127", r)
+		t.Errorf("-127 %s -1 = %d, want 127", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("-127 * 0 = %d, want 0", r)
+		t.Errorf("-127 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != -127 {
-		t.Errorf("-127 * 1 = %d, want -127", r)
+		t.Errorf("-127 %s 1 = %d, want -127", "*", r)
 	}
 	y = 126
 	r = x * y
 	if r != 126 {
-		t.Errorf("-127 * 126 = %d, want 126", r)
+		t.Errorf("-127 %s 126 = %d, want 126", "*", r)
 	}
 	y = 127
 	r = x * y
 	if r != -1 {
-		t.Errorf("-127 * 127 = %d, want -1", r)
+		t.Errorf("-127 %s 127 = %d, want -1", "*", r)
 	}
 	x = -1
 	y = -128
 	r = x * y
 	if r != -128 {
-		t.Errorf("-1 * -128 = %d, want -128", r)
+		t.Errorf("-1 %s -128 = %d, want -128", "*", r)
 	}
 	y = -127
 	r = x * y
 	if r != 127 {
-		t.Errorf("-1 * -127 = %d, want 127", r)
+		t.Errorf("-1 %s -127 = %d, want 127", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != 1 {
-		t.Errorf("-1 * -1 = %d, want 1", r)
+		t.Errorf("-1 %s -1 = %d, want 1", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("-1 * 0 = %d, want 0", r)
+		t.Errorf("-1 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != -1 {
-		t.Errorf("-1 * 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", "*", r)
 	}
 	y = 126
 	r = x * y
 	if r != -126 {
-		t.Errorf("-1 * 126 = %d, want -126", r)
+		t.Errorf("-1 %s 126 = %d, want -126", "*", r)
 	}
 	y = 127
 	r = x * y
 	if r != -127 {
-		t.Errorf("-1 * 127 = %d, want -127", r)
+		t.Errorf("-1 %s 127 = %d, want -127", "*", r)
 	}
 	x = 0
 	y = -128
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * -128 = %d, want 0", r)
+		t.Errorf("0 %s -128 = %d, want 0", "*", r)
 	}
 	y = -127
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * -127 = %d, want 0", r)
+		t.Errorf("0 %s -127 = %d, want 0", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * -1 = %d, want 0", r)
+		t.Errorf("0 %s -1 = %d, want 0", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "*", r)
 	}
 	y = 126
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 126 = %d, want 0", r)
+		t.Errorf("0 %s 126 = %d, want 0", "*", r)
 	}
 	y = 127
 	r = x * y
 	if r != 0 {
-		t.Errorf("0 * 127 = %d, want 0", r)
+		t.Errorf("0 %s 127 = %d, want 0", "*", r)
 	}
 	x = 1
 	y = -128
 	r = x * y
 	if r != -128 {
-		t.Errorf("1 * -128 = %d, want -128", r)
+		t.Errorf("1 %s -128 = %d, want -128", "*", r)
 	}
 	y = -127
 	r = x * y
 	if r != -127 {
-		t.Errorf("1 * -127 = %d, want -127", r)
+		t.Errorf("1 %s -127 = %d, want -127", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != -1 {
-		t.Errorf("1 * -1 = %d, want -1", r)
+		t.Errorf("1 %s -1 = %d, want -1", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("1 * 0 = %d, want 0", r)
+		t.Errorf("1 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 1 {
-		t.Errorf("1 * 1 = %d, want 1", r)
+		t.Errorf("1 %s 1 = %d, want 1", "*", r)
 	}
 	y = 126
 	r = x * y
 	if r != 126 {
-		t.Errorf("1 * 126 = %d, want 126", r)
+		t.Errorf("1 %s 126 = %d, want 126", "*", r)
 	}
 	y = 127
 	r = x * y
 	if r != 127 {
-		t.Errorf("1 * 127 = %d, want 127", r)
+		t.Errorf("1 %s 127 = %d, want 127", "*", r)
 	}
 	x = 126
 	y = -128
 	r = x * y
 	if r != 0 {
-		t.Errorf("126 * -128 = %d, want 0", r)
+		t.Errorf("126 %s -128 = %d, want 0", "*", r)
 	}
 	y = -127
 	r = x * y
 	if r != 126 {
-		t.Errorf("126 * -127 = %d, want 126", r)
+		t.Errorf("126 %s -127 = %d, want 126", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != -126 {
-		t.Errorf("126 * -1 = %d, want -126", r)
+		t.Errorf("126 %s -1 = %d, want -126", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("126 * 0 = %d, want 0", r)
+		t.Errorf("126 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 126 {
-		t.Errorf("126 * 1 = %d, want 126", r)
+		t.Errorf("126 %s 1 = %d, want 126", "*", r)
 	}
 	y = 126
 	r = x * y
 	if r != 4 {
-		t.Errorf("126 * 126 = %d, want 4", r)
+		t.Errorf("126 %s 126 = %d, want 4", "*", r)
 	}
 	y = 127
 	r = x * y
 	if r != -126 {
-		t.Errorf("126 * 127 = %d, want -126", r)
+		t.Errorf("126 %s 127 = %d, want -126", "*", r)
 	}
 	x = 127
 	y = -128
 	r = x * y
 	if r != -128 {
-		t.Errorf("127 * -128 = %d, want -128", r)
+		t.Errorf("127 %s -128 = %d, want -128", "*", r)
 	}
 	y = -127
 	r = x * y
 	if r != -1 {
-		t.Errorf("127 * -127 = %d, want -1", r)
+		t.Errorf("127 %s -127 = %d, want -1", "*", r)
 	}
 	y = -1
 	r = x * y
 	if r != -127 {
-		t.Errorf("127 * -1 = %d, want -127", r)
+		t.Errorf("127 %s -1 = %d, want -127", "*", r)
 	}
 	y = 0
 	r = x * y
 	if r != 0 {
-		t.Errorf("127 * 0 = %d, want 0", r)
+		t.Errorf("127 %s 0 = %d, want 0", "*", r)
 	}
 	y = 1
 	r = x * y
 	if r != 127 {
-		t.Errorf("127 * 1 = %d, want 127", r)
+		t.Errorf("127 %s 1 = %d, want 127", "*", r)
 	}
 	y = 126
 	r = x * y
 	if r != -126 {
-		t.Errorf("127 * 126 = %d, want -126", r)
+		t.Errorf("127 %s 126 = %d, want -126", "*", r)
 	}
 	y = 127
 	r = x * y
 	if r != 1 {
-		t.Errorf("127 * 127 = %d, want 1", r)
+		t.Errorf("127 %s 127 = %d, want 1", "*", r)
 	}
 }
 func TestConstFoldint8mod(t *testing.T) {
@@ -6148,218 +6148,218 @@ func TestConstFoldint8mod(t *testing.T) {
 	y = -128
 	r = x % y
 	if r != 0 {
-		t.Errorf("-128 % -128 = %d, want 0", r)
+		t.Errorf("-128 %s -128 = %d, want 0", "%", r)
 	}
 	y = -127
 	r = x % y
 	if r != -1 {
-		t.Errorf("-128 % -127 = %d, want -1", r)
+		t.Errorf("-128 %s -127 = %d, want -1", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-128 % -1 = %d, want 0", r)
+		t.Errorf("-128 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-128 % 1 = %d, want 0", r)
+		t.Errorf("-128 %s 1 = %d, want 0", "%", r)
 	}
 	y = 126
 	r = x % y
 	if r != -2 {
-		t.Errorf("-128 % 126 = %d, want -2", r)
+		t.Errorf("-128 %s 126 = %d, want -2", "%", r)
 	}
 	y = 127
 	r = x % y
 	if r != -1 {
-		t.Errorf("-128 % 127 = %d, want -1", r)
+		t.Errorf("-128 %s 127 = %d, want -1", "%", r)
 	}
 	x = -127
 	y = -128
 	r = x % y
 	if r != -127 {
-		t.Errorf("-127 % -128 = %d, want -127", r)
+		t.Errorf("-127 %s -128 = %d, want -127", "%", r)
 	}
 	y = -127
 	r = x % y
 	if r != 0 {
-		t.Errorf("-127 % -127 = %d, want 0", r)
+		t.Errorf("-127 %s -127 = %d, want 0", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-127 % -1 = %d, want 0", r)
+		t.Errorf("-127 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-127 % 1 = %d, want 0", r)
+		t.Errorf("-127 %s 1 = %d, want 0", "%", r)
 	}
 	y = 126
 	r = x % y
 	if r != -1 {
-		t.Errorf("-127 % 126 = %d, want -1", r)
+		t.Errorf("-127 %s 126 = %d, want -1", "%", r)
 	}
 	y = 127
 	r = x % y
 	if r != 0 {
-		t.Errorf("-127 % 127 = %d, want 0", r)
+		t.Errorf("-127 %s 127 = %d, want 0", "%", r)
 	}
 	x = -1
 	y = -128
 	r = x % y
 	if r != -1 {
-		t.Errorf("-1 % -128 = %d, want -1", r)
+		t.Errorf("-1 %s -128 = %d, want -1", "%", r)
 	}
 	y = -127
 	r = x % y
 	if r != -1 {
-		t.Errorf("-1 % -127 = %d, want -1", r)
+		t.Errorf("-1 %s -127 = %d, want -1", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-1 % -1 = %d, want 0", r)
+		t.Errorf("-1 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("-1 % 1 = %d, want 0", r)
+		t.Errorf("-1 %s 1 = %d, want 0", "%", r)
 	}
 	y = 126
 	r = x % y
 	if r != -1 {
-		t.Errorf("-1 % 126 = %d, want -1", r)
+		t.Errorf("-1 %s 126 = %d, want -1", "%", r)
 	}
 	y = 127
 	r = x % y
 	if r != -1 {
-		t.Errorf("-1 % 127 = %d, want -1", r)
+		t.Errorf("-1 %s 127 = %d, want -1", "%", r)
 	}
 	x = 0
 	y = -128
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % -128 = %d, want 0", r)
+		t.Errorf("0 %s -128 = %d, want 0", "%", r)
 	}
 	y = -127
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % -127 = %d, want 0", r)
+		t.Errorf("0 %s -127 = %d, want 0", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % -1 = %d, want 0", r)
+		t.Errorf("0 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "%", r)
 	}
 	y = 126
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 126 = %d, want 0", r)
+		t.Errorf("0 %s 126 = %d, want 0", "%", r)
 	}
 	y = 127
 	r = x % y
 	if r != 0 {
-		t.Errorf("0 % 127 = %d, want 0", r)
+		t.Errorf("0 %s 127 = %d, want 0", "%", r)
 	}
 	x = 1
 	y = -128
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % -128 = %d, want 1", r)
+		t.Errorf("1 %s -128 = %d, want 1", "%", r)
 	}
 	y = -127
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % -127 = %d, want 1", r)
+		t.Errorf("1 %s -127 = %d, want 1", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("1 % -1 = %d, want 0", r)
+		t.Errorf("1 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("1 % 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", "%", r)
 	}
 	y = 126
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % 126 = %d, want 1", r)
+		t.Errorf("1 %s 126 = %d, want 1", "%", r)
 	}
 	y = 127
 	r = x % y
 	if r != 1 {
-		t.Errorf("1 % 127 = %d, want 1", r)
+		t.Errorf("1 %s 127 = %d, want 1", "%", r)
 	}
 	x = 126
 	y = -128
 	r = x % y
 	if r != 126 {
-		t.Errorf("126 % -128 = %d, want 126", r)
+		t.Errorf("126 %s -128 = %d, want 126", "%", r)
 	}
 	y = -127
 	r = x % y
 	if r != 126 {
-		t.Errorf("126 % -127 = %d, want 126", r)
+		t.Errorf("126 %s -127 = %d, want 126", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("126 % -1 = %d, want 0", r)
+		t.Errorf("126 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("126 % 1 = %d, want 0", r)
+		t.Errorf("126 %s 1 = %d, want 0", "%", r)
 	}
 	y = 126
 	r = x % y
 	if r != 0 {
-		t.Errorf("126 % 126 = %d, want 0", r)
+		t.Errorf("126 %s 126 = %d, want 0", "%", r)
 	}
 	y = 127
 	r = x % y
 	if r != 126 {
-		t.Errorf("126 % 127 = %d, want 126", r)
+		t.Errorf("126 %s 127 = %d, want 126", "%", r)
 	}
 	x = 127
 	y = -128
 	r = x % y
 	if r != 127 {
-		t.Errorf("127 % -128 = %d, want 127", r)
+		t.Errorf("127 %s -128 = %d, want 127", "%", r)
 	}
 	y = -127
 	r = x % y
 	if r != 0 {
-		t.Errorf("127 % -127 = %d, want 0", r)
+		t.Errorf("127 %s -127 = %d, want 0", "%", r)
 	}
 	y = -1
 	r = x % y
 	if r != 0 {
-		t.Errorf("127 % -1 = %d, want 0", r)
+		t.Errorf("127 %s -1 = %d, want 0", "%", r)
 	}
 	y = 1
 	r = x % y
 	if r != 0 {
-		t.Errorf("127 % 1 = %d, want 0", r)
+		t.Errorf("127 %s 1 = %d, want 0", "%", r)
 	}
 	y = 126
 	r = x % y
 	if r != 1 {
-		t.Errorf("127 % 126 = %d, want 1", r)
+		t.Errorf("127 %s 126 = %d, want 1", "%", r)
 	}
 	y = 127
 	r = x % y
 	if r != 0 {
-		t.Errorf("127 % 127 = %d, want 0", r)
+		t.Errorf("127 %s 127 = %d, want 0", "%", r)
 	}
 }
 func TestConstFolduint64uint64lsh(t *testing.T) {
@@ -6369,85 +6369,85 @@ func TestConstFolduint64uint64lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 4294967296 = %d, want 0", r)
+		t.Errorf("1 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 4294967296
 	y = 0
 	r = x << y
 	if r != 4294967296 {
-		t.Errorf("4294967296 << 0 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 0 = %d, want 4294967296", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 8589934592 {
-		t.Errorf("4294967296 << 1 = %d, want 8589934592", r)
+		t.Errorf("4294967296 %s 1 = %d, want 8589934592", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("4294967296 << 4294967296 = %d, want 0", r)
+		t.Errorf("4294967296 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("4294967296 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("4294967296 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 18446744073709551615
 	y = 0
 	r = x << y
 	if r != 18446744073709551615 {
-		t.Errorf("18446744073709551615 << 0 = %d, want 18446744073709551615", r)
+		t.Errorf("18446744073709551615 %s 0 = %d, want 18446744073709551615", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 18446744073709551614 {
-		t.Errorf("18446744073709551615 << 1 = %d, want 18446744073709551614", r)
+		t.Errorf("18446744073709551615 %s 1 = %d, want 18446744073709551614", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("18446744073709551615 << 4294967296 = %d, want 0", r)
+		t.Errorf("18446744073709551615 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("18446744073709551615 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("18446744073709551615 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFolduint64uint64rsh(t *testing.T) {
@@ -6457,85 +6457,85 @@ func TestConstFolduint64uint64rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 4294967296 = %d, want 0", r)
+		t.Errorf("1 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 4294967296
 	y = 0
 	r = x >> y
 	if r != 4294967296 {
-		t.Errorf("4294967296 >> 0 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 0 = %d, want 4294967296", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 2147483648 {
-		t.Errorf("4294967296 >> 1 = %d, want 2147483648", r)
+		t.Errorf("4294967296 %s 1 = %d, want 2147483648", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("4294967296 >> 4294967296 = %d, want 0", r)
+		t.Errorf("4294967296 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("4294967296 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("4294967296 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 18446744073709551615
 	y = 0
 	r = x >> y
 	if r != 18446744073709551615 {
-		t.Errorf("18446744073709551615 >> 0 = %d, want 18446744073709551615", r)
+		t.Errorf("18446744073709551615 %s 0 = %d, want 18446744073709551615", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 9223372036854775807 {
-		t.Errorf("18446744073709551615 >> 1 = %d, want 9223372036854775807", r)
+		t.Errorf("18446744073709551615 %s 1 = %d, want 9223372036854775807", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("18446744073709551615 >> 4294967296 = %d, want 0", r)
+		t.Errorf("18446744073709551615 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("18446744073709551615 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("18446744073709551615 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFolduint64uint32lsh(t *testing.T) {
@@ -6545,65 +6545,65 @@ func TestConstFolduint64uint32lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 4294967295 = %d, want 0", r)
+		t.Errorf("0 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 4294967295 = %d, want 0", r)
+		t.Errorf("1 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 4294967296
 	y = 0
 	r = x << y
 	if r != 4294967296 {
-		t.Errorf("4294967296 << 0 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 0 = %d, want 4294967296", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 8589934592 {
-		t.Errorf("4294967296 << 1 = %d, want 8589934592", r)
+		t.Errorf("4294967296 %s 1 = %d, want 8589934592", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("4294967296 << 4294967295 = %d, want 0", r)
+		t.Errorf("4294967296 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 18446744073709551615
 	y = 0
 	r = x << y
 	if r != 18446744073709551615 {
-		t.Errorf("18446744073709551615 << 0 = %d, want 18446744073709551615", r)
+		t.Errorf("18446744073709551615 %s 0 = %d, want 18446744073709551615", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 18446744073709551614 {
-		t.Errorf("18446744073709551615 << 1 = %d, want 18446744073709551614", r)
+		t.Errorf("18446744073709551615 %s 1 = %d, want 18446744073709551614", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("18446744073709551615 << 4294967295 = %d, want 0", r)
+		t.Errorf("18446744073709551615 %s 4294967295 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFolduint64uint32rsh(t *testing.T) {
@@ -6613,65 +6613,65 @@ func TestConstFolduint64uint32rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 4294967295 = %d, want 0", r)
+		t.Errorf("0 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 4294967295 = %d, want 0", r)
+		t.Errorf("1 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 4294967296
 	y = 0
 	r = x >> y
 	if r != 4294967296 {
-		t.Errorf("4294967296 >> 0 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 0 = %d, want 4294967296", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 2147483648 {
-		t.Errorf("4294967296 >> 1 = %d, want 2147483648", r)
+		t.Errorf("4294967296 %s 1 = %d, want 2147483648", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("4294967296 >> 4294967295 = %d, want 0", r)
+		t.Errorf("4294967296 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 18446744073709551615
 	y = 0
 	r = x >> y
 	if r != 18446744073709551615 {
-		t.Errorf("18446744073709551615 >> 0 = %d, want 18446744073709551615", r)
+		t.Errorf("18446744073709551615 %s 0 = %d, want 18446744073709551615", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 9223372036854775807 {
-		t.Errorf("18446744073709551615 >> 1 = %d, want 9223372036854775807", r)
+		t.Errorf("18446744073709551615 %s 1 = %d, want 9223372036854775807", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("18446744073709551615 >> 4294967295 = %d, want 0", r)
+		t.Errorf("18446744073709551615 %s 4294967295 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFolduint64uint16lsh(t *testing.T) {
@@ -6681,65 +6681,65 @@ func TestConstFolduint64uint16lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 65535 = %d, want 0", r)
+		t.Errorf("0 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 65535 = %d, want 0", r)
+		t.Errorf("1 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 4294967296
 	y = 0
 	r = x << y
 	if r != 4294967296 {
-		t.Errorf("4294967296 << 0 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 0 = %d, want 4294967296", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 8589934592 {
-		t.Errorf("4294967296 << 1 = %d, want 8589934592", r)
+		t.Errorf("4294967296 %s 1 = %d, want 8589934592", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("4294967296 << 65535 = %d, want 0", r)
+		t.Errorf("4294967296 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 18446744073709551615
 	y = 0
 	r = x << y
 	if r != 18446744073709551615 {
-		t.Errorf("18446744073709551615 << 0 = %d, want 18446744073709551615", r)
+		t.Errorf("18446744073709551615 %s 0 = %d, want 18446744073709551615", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 18446744073709551614 {
-		t.Errorf("18446744073709551615 << 1 = %d, want 18446744073709551614", r)
+		t.Errorf("18446744073709551615 %s 1 = %d, want 18446744073709551614", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("18446744073709551615 << 65535 = %d, want 0", r)
+		t.Errorf("18446744073709551615 %s 65535 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFolduint64uint16rsh(t *testing.T) {
@@ -6749,65 +6749,65 @@ func TestConstFolduint64uint16rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 65535 = %d, want 0", r)
+		t.Errorf("0 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 65535 = %d, want 0", r)
+		t.Errorf("1 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 4294967296
 	y = 0
 	r = x >> y
 	if r != 4294967296 {
-		t.Errorf("4294967296 >> 0 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 0 = %d, want 4294967296", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 2147483648 {
-		t.Errorf("4294967296 >> 1 = %d, want 2147483648", r)
+		t.Errorf("4294967296 %s 1 = %d, want 2147483648", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("4294967296 >> 65535 = %d, want 0", r)
+		t.Errorf("4294967296 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 18446744073709551615
 	y = 0
 	r = x >> y
 	if r != 18446744073709551615 {
-		t.Errorf("18446744073709551615 >> 0 = %d, want 18446744073709551615", r)
+		t.Errorf("18446744073709551615 %s 0 = %d, want 18446744073709551615", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 9223372036854775807 {
-		t.Errorf("18446744073709551615 >> 1 = %d, want 9223372036854775807", r)
+		t.Errorf("18446744073709551615 %s 1 = %d, want 9223372036854775807", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("18446744073709551615 >> 65535 = %d, want 0", r)
+		t.Errorf("18446744073709551615 %s 65535 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFolduint64uint8lsh(t *testing.T) {
@@ -6817,65 +6817,65 @@ func TestConstFolduint64uint8lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 255 = %d, want 0", r)
+		t.Errorf("0 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 255 = %d, want 0", r)
+		t.Errorf("1 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 4294967296
 	y = 0
 	r = x << y
 	if r != 4294967296 {
-		t.Errorf("4294967296 << 0 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 0 = %d, want 4294967296", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 8589934592 {
-		t.Errorf("4294967296 << 1 = %d, want 8589934592", r)
+		t.Errorf("4294967296 %s 1 = %d, want 8589934592", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("4294967296 << 255 = %d, want 0", r)
+		t.Errorf("4294967296 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 18446744073709551615
 	y = 0
 	r = x << y
 	if r != 18446744073709551615 {
-		t.Errorf("18446744073709551615 << 0 = %d, want 18446744073709551615", r)
+		t.Errorf("18446744073709551615 %s 0 = %d, want 18446744073709551615", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 18446744073709551614 {
-		t.Errorf("18446744073709551615 << 1 = %d, want 18446744073709551614", r)
+		t.Errorf("18446744073709551615 %s 1 = %d, want 18446744073709551614", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("18446744073709551615 << 255 = %d, want 0", r)
+		t.Errorf("18446744073709551615 %s 255 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFolduint64uint8rsh(t *testing.T) {
@@ -6885,65 +6885,65 @@ func TestConstFolduint64uint8rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 255 = %d, want 0", r)
+		t.Errorf("0 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 255 = %d, want 0", r)
+		t.Errorf("1 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 4294967296
 	y = 0
 	r = x >> y
 	if r != 4294967296 {
-		t.Errorf("4294967296 >> 0 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 0 = %d, want 4294967296", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 2147483648 {
-		t.Errorf("4294967296 >> 1 = %d, want 2147483648", r)
+		t.Errorf("4294967296 %s 1 = %d, want 2147483648", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("4294967296 >> 255 = %d, want 0", r)
+		t.Errorf("4294967296 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 18446744073709551615
 	y = 0
 	r = x >> y
 	if r != 18446744073709551615 {
-		t.Errorf("18446744073709551615 >> 0 = %d, want 18446744073709551615", r)
+		t.Errorf("18446744073709551615 %s 0 = %d, want 18446744073709551615", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 9223372036854775807 {
-		t.Errorf("18446744073709551615 >> 1 = %d, want 9223372036854775807", r)
+		t.Errorf("18446744073709551615 %s 1 = %d, want 9223372036854775807", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("18446744073709551615 >> 255 = %d, want 0", r)
+		t.Errorf("18446744073709551615 %s 255 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFoldint64uint64lsh(t *testing.T) {
@@ -6953,190 +6953,190 @@ func TestConstFoldint64uint64lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != -9223372036854775808 {
-		t.Errorf("-9223372036854775808 << 0 = %d, want -9223372036854775808", r)
+		t.Errorf("-9223372036854775808 %s 0 = %d, want -9223372036854775808", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 << 1 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 << 4294967296 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = -9223372036854775807
 	y = 0
 	r = x << y
 	if r != -9223372036854775807 {
-		t.Errorf("-9223372036854775807 << 0 = %d, want -9223372036854775807", r)
+		t.Errorf("-9223372036854775807 %s 0 = %d, want -9223372036854775807", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("-9223372036854775807 << 1 = %d, want 2", r)
+		t.Errorf("-9223372036854775807 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("-9223372036854775807 << 4294967296 = %d, want 0", r)
+		t.Errorf("-9223372036854775807 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("-9223372036854775807 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("-9223372036854775807 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = -4294967296
 	y = 0
 	r = x << y
 	if r != -4294967296 {
-		t.Errorf("-4294967296 << 0 = %d, want -4294967296", r)
+		t.Errorf("-4294967296 %s 0 = %d, want -4294967296", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -8589934592 {
-		t.Errorf("-4294967296 << 1 = %d, want -8589934592", r)
+		t.Errorf("-4294967296 %s 1 = %d, want -8589934592", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("-4294967296 << 4294967296 = %d, want 0", r)
+		t.Errorf("-4294967296 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("-4294967296 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("-4294967296 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = -1
 	y = 0
 	r = x << y
 	if r != -1 {
-		t.Errorf("-1 << 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("-1 << 1 = %d, want -2", r)
+		t.Errorf("-1 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("-1 << 4294967296 = %d, want 0", r)
+		t.Errorf("-1 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("-1 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("-1 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 0
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 4294967296 = %d, want 0", r)
+		t.Errorf("1 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 4294967296
 	y = 0
 	r = x << y
 	if r != 4294967296 {
-		t.Errorf("4294967296 << 0 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 0 = %d, want 4294967296", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 8589934592 {
-		t.Errorf("4294967296 << 1 = %d, want 8589934592", r)
+		t.Errorf("4294967296 %s 1 = %d, want 8589934592", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("4294967296 << 4294967296 = %d, want 0", r)
+		t.Errorf("4294967296 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("4294967296 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("4294967296 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 9223372036854775806
 	y = 0
 	r = x << y
 	if r != 9223372036854775806 {
-		t.Errorf("9223372036854775806 << 0 = %d, want 9223372036854775806", r)
+		t.Errorf("9223372036854775806 %s 0 = %d, want 9223372036854775806", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -4 {
-		t.Errorf("9223372036854775806 << 1 = %d, want -4", r)
+		t.Errorf("9223372036854775806 %s 1 = %d, want -4", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("9223372036854775806 << 4294967296 = %d, want 0", r)
+		t.Errorf("9223372036854775806 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("9223372036854775806 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("9223372036854775806 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 9223372036854775807
 	y = 0
 	r = x << y
 	if r != 9223372036854775807 {
-		t.Errorf("9223372036854775807 << 0 = %d, want 9223372036854775807", r)
+		t.Errorf("9223372036854775807 %s 0 = %d, want 9223372036854775807", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("9223372036854775807 << 1 = %d, want -2", r)
+		t.Errorf("9223372036854775807 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("9223372036854775807 << 4294967296 = %d, want 0", r)
+		t.Errorf("9223372036854775807 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("9223372036854775807 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("9223372036854775807 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFoldint64uint64rsh(t *testing.T) {
@@ -7146,190 +7146,190 @@ func TestConstFoldint64uint64rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != -9223372036854775808 {
-		t.Errorf("-9223372036854775808 >> 0 = %d, want -9223372036854775808", r)
+		t.Errorf("-9223372036854775808 %s 0 = %d, want -9223372036854775808", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -4611686018427387904 {
-		t.Errorf("-9223372036854775808 >> 1 = %d, want -4611686018427387904", r)
+		t.Errorf("-9223372036854775808 %s 1 = %d, want -4611686018427387904", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-9223372036854775808 >> 4294967296 = %d, want -1", r)
+		t.Errorf("-9223372036854775808 %s 4294967296 = %d, want -1", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-9223372036854775808 >> 18446744073709551615 = %d, want -1", r)
+		t.Errorf("-9223372036854775808 %s 18446744073709551615 = %d, want -1", ">>", r)
 	}
 	x = -9223372036854775807
 	y = 0
 	r = x >> y
 	if r != -9223372036854775807 {
-		t.Errorf("-9223372036854775807 >> 0 = %d, want -9223372036854775807", r)
+		t.Errorf("-9223372036854775807 %s 0 = %d, want -9223372036854775807", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -4611686018427387904 {
-		t.Errorf("-9223372036854775807 >> 1 = %d, want -4611686018427387904", r)
+		t.Errorf("-9223372036854775807 %s 1 = %d, want -4611686018427387904", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-9223372036854775807 >> 4294967296 = %d, want -1", r)
+		t.Errorf("-9223372036854775807 %s 4294967296 = %d, want -1", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-9223372036854775807 >> 18446744073709551615 = %d, want -1", r)
+		t.Errorf("-9223372036854775807 %s 18446744073709551615 = %d, want -1", ">>", r)
 	}
 	x = -4294967296
 	y = 0
 	r = x >> y
 	if r != -4294967296 {
-		t.Errorf("-4294967296 >> 0 = %d, want -4294967296", r)
+		t.Errorf("-4294967296 %s 0 = %d, want -4294967296", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -2147483648 {
-		t.Errorf("-4294967296 >> 1 = %d, want -2147483648", r)
+		t.Errorf("-4294967296 %s 1 = %d, want -2147483648", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-4294967296 >> 4294967296 = %d, want -1", r)
+		t.Errorf("-4294967296 %s 4294967296 = %d, want -1", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-4294967296 >> 18446744073709551615 = %d, want -1", r)
+		t.Errorf("-4294967296 %s 18446744073709551615 = %d, want -1", ">>", r)
 	}
 	x = -1
 	y = 0
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 4294967296 = %d, want -1", r)
+		t.Errorf("-1 %s 4294967296 = %d, want -1", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 18446744073709551615 = %d, want -1", r)
+		t.Errorf("-1 %s 18446744073709551615 = %d, want -1", ">>", r)
 	}
 	x = 0
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 4294967296 = %d, want 0", r)
+		t.Errorf("1 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 4294967296
 	y = 0
 	r = x >> y
 	if r != 4294967296 {
-		t.Errorf("4294967296 >> 0 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 0 = %d, want 4294967296", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 2147483648 {
-		t.Errorf("4294967296 >> 1 = %d, want 2147483648", r)
+		t.Errorf("4294967296 %s 1 = %d, want 2147483648", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("4294967296 >> 4294967296 = %d, want 0", r)
+		t.Errorf("4294967296 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("4294967296 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("4294967296 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 9223372036854775806
 	y = 0
 	r = x >> y
 	if r != 9223372036854775806 {
-		t.Errorf("9223372036854775806 >> 0 = %d, want 9223372036854775806", r)
+		t.Errorf("9223372036854775806 %s 0 = %d, want 9223372036854775806", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 4611686018427387903 {
-		t.Errorf("9223372036854775806 >> 1 = %d, want 4611686018427387903", r)
+		t.Errorf("9223372036854775806 %s 1 = %d, want 4611686018427387903", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("9223372036854775806 >> 4294967296 = %d, want 0", r)
+		t.Errorf("9223372036854775806 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("9223372036854775806 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("9223372036854775806 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 9223372036854775807
 	y = 0
 	r = x >> y
 	if r != 9223372036854775807 {
-		t.Errorf("9223372036854775807 >> 0 = %d, want 9223372036854775807", r)
+		t.Errorf("9223372036854775807 %s 0 = %d, want 9223372036854775807", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 4611686018427387903 {
-		t.Errorf("9223372036854775807 >> 1 = %d, want 4611686018427387903", r)
+		t.Errorf("9223372036854775807 %s 1 = %d, want 4611686018427387903", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("9223372036854775807 >> 4294967296 = %d, want 0", r)
+		t.Errorf("9223372036854775807 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("9223372036854775807 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("9223372036854775807 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFoldint64uint32lsh(t *testing.T) {
@@ -7339,145 +7339,145 @@ func TestConstFoldint64uint32lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != -9223372036854775808 {
-		t.Errorf("-9223372036854775808 << 0 = %d, want -9223372036854775808", r)
+		t.Errorf("-9223372036854775808 %s 0 = %d, want -9223372036854775808", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 << 1 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 << 4294967295 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = -9223372036854775807
 	y = 0
 	r = x << y
 	if r != -9223372036854775807 {
-		t.Errorf("-9223372036854775807 << 0 = %d, want -9223372036854775807", r)
+		t.Errorf("-9223372036854775807 %s 0 = %d, want -9223372036854775807", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("-9223372036854775807 << 1 = %d, want 2", r)
+		t.Errorf("-9223372036854775807 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("-9223372036854775807 << 4294967295 = %d, want 0", r)
+		t.Errorf("-9223372036854775807 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = -4294967296
 	y = 0
 	r = x << y
 	if r != -4294967296 {
-		t.Errorf("-4294967296 << 0 = %d, want -4294967296", r)
+		t.Errorf("-4294967296 %s 0 = %d, want -4294967296", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -8589934592 {
-		t.Errorf("-4294967296 << 1 = %d, want -8589934592", r)
+		t.Errorf("-4294967296 %s 1 = %d, want -8589934592", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("-4294967296 << 4294967295 = %d, want 0", r)
+		t.Errorf("-4294967296 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = -1
 	y = 0
 	r = x << y
 	if r != -1 {
-		t.Errorf("-1 << 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("-1 << 1 = %d, want -2", r)
+		t.Errorf("-1 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("-1 << 4294967295 = %d, want 0", r)
+		t.Errorf("-1 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 0
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 4294967295 = %d, want 0", r)
+		t.Errorf("0 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 4294967295 = %d, want 0", r)
+		t.Errorf("1 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 4294967296
 	y = 0
 	r = x << y
 	if r != 4294967296 {
-		t.Errorf("4294967296 << 0 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 0 = %d, want 4294967296", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 8589934592 {
-		t.Errorf("4294967296 << 1 = %d, want 8589934592", r)
+		t.Errorf("4294967296 %s 1 = %d, want 8589934592", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("4294967296 << 4294967295 = %d, want 0", r)
+		t.Errorf("4294967296 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 9223372036854775806
 	y = 0
 	r = x << y
 	if r != 9223372036854775806 {
-		t.Errorf("9223372036854775806 << 0 = %d, want 9223372036854775806", r)
+		t.Errorf("9223372036854775806 %s 0 = %d, want 9223372036854775806", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -4 {
-		t.Errorf("9223372036854775806 << 1 = %d, want -4", r)
+		t.Errorf("9223372036854775806 %s 1 = %d, want -4", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("9223372036854775806 << 4294967295 = %d, want 0", r)
+		t.Errorf("9223372036854775806 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 9223372036854775807
 	y = 0
 	r = x << y
 	if r != 9223372036854775807 {
-		t.Errorf("9223372036854775807 << 0 = %d, want 9223372036854775807", r)
+		t.Errorf("9223372036854775807 %s 0 = %d, want 9223372036854775807", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("9223372036854775807 << 1 = %d, want -2", r)
+		t.Errorf("9223372036854775807 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("9223372036854775807 << 4294967295 = %d, want 0", r)
+		t.Errorf("9223372036854775807 %s 4294967295 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFoldint64uint32rsh(t *testing.T) {
@@ -7487,145 +7487,145 @@ func TestConstFoldint64uint32rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != -9223372036854775808 {
-		t.Errorf("-9223372036854775808 >> 0 = %d, want -9223372036854775808", r)
+		t.Errorf("-9223372036854775808 %s 0 = %d, want -9223372036854775808", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -4611686018427387904 {
-		t.Errorf("-9223372036854775808 >> 1 = %d, want -4611686018427387904", r)
+		t.Errorf("-9223372036854775808 %s 1 = %d, want -4611686018427387904", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-9223372036854775808 >> 4294967295 = %d, want -1", r)
+		t.Errorf("-9223372036854775808 %s 4294967295 = %d, want -1", ">>", r)
 	}
 	x = -9223372036854775807
 	y = 0
 	r = x >> y
 	if r != -9223372036854775807 {
-		t.Errorf("-9223372036854775807 >> 0 = %d, want -9223372036854775807", r)
+		t.Errorf("-9223372036854775807 %s 0 = %d, want -9223372036854775807", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -4611686018427387904 {
-		t.Errorf("-9223372036854775807 >> 1 = %d, want -4611686018427387904", r)
+		t.Errorf("-9223372036854775807 %s 1 = %d, want -4611686018427387904", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-9223372036854775807 >> 4294967295 = %d, want -1", r)
+		t.Errorf("-9223372036854775807 %s 4294967295 = %d, want -1", ">>", r)
 	}
 	x = -4294967296
 	y = 0
 	r = x >> y
 	if r != -4294967296 {
-		t.Errorf("-4294967296 >> 0 = %d, want -4294967296", r)
+		t.Errorf("-4294967296 %s 0 = %d, want -4294967296", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -2147483648 {
-		t.Errorf("-4294967296 >> 1 = %d, want -2147483648", r)
+		t.Errorf("-4294967296 %s 1 = %d, want -2147483648", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-4294967296 >> 4294967295 = %d, want -1", r)
+		t.Errorf("-4294967296 %s 4294967295 = %d, want -1", ">>", r)
 	}
 	x = -1
 	y = 0
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 4294967295 = %d, want -1", r)
+		t.Errorf("-1 %s 4294967295 = %d, want -1", ">>", r)
 	}
 	x = 0
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 4294967295 = %d, want 0", r)
+		t.Errorf("0 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 4294967295 = %d, want 0", r)
+		t.Errorf("1 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 4294967296
 	y = 0
 	r = x >> y
 	if r != 4294967296 {
-		t.Errorf("4294967296 >> 0 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 0 = %d, want 4294967296", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 2147483648 {
-		t.Errorf("4294967296 >> 1 = %d, want 2147483648", r)
+		t.Errorf("4294967296 %s 1 = %d, want 2147483648", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("4294967296 >> 4294967295 = %d, want 0", r)
+		t.Errorf("4294967296 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 9223372036854775806
 	y = 0
 	r = x >> y
 	if r != 9223372036854775806 {
-		t.Errorf("9223372036854775806 >> 0 = %d, want 9223372036854775806", r)
+		t.Errorf("9223372036854775806 %s 0 = %d, want 9223372036854775806", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 4611686018427387903 {
-		t.Errorf("9223372036854775806 >> 1 = %d, want 4611686018427387903", r)
+		t.Errorf("9223372036854775806 %s 1 = %d, want 4611686018427387903", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("9223372036854775806 >> 4294967295 = %d, want 0", r)
+		t.Errorf("9223372036854775806 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 9223372036854775807
 	y = 0
 	r = x >> y
 	if r != 9223372036854775807 {
-		t.Errorf("9223372036854775807 >> 0 = %d, want 9223372036854775807", r)
+		t.Errorf("9223372036854775807 %s 0 = %d, want 9223372036854775807", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 4611686018427387903 {
-		t.Errorf("9223372036854775807 >> 1 = %d, want 4611686018427387903", r)
+		t.Errorf("9223372036854775807 %s 1 = %d, want 4611686018427387903", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("9223372036854775807 >> 4294967295 = %d, want 0", r)
+		t.Errorf("9223372036854775807 %s 4294967295 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFoldint64uint16lsh(t *testing.T) {
@@ -7635,145 +7635,145 @@ func TestConstFoldint64uint16lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != -9223372036854775808 {
-		t.Errorf("-9223372036854775808 << 0 = %d, want -9223372036854775808", r)
+		t.Errorf("-9223372036854775808 %s 0 = %d, want -9223372036854775808", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 << 1 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 << 65535 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = -9223372036854775807
 	y = 0
 	r = x << y
 	if r != -9223372036854775807 {
-		t.Errorf("-9223372036854775807 << 0 = %d, want -9223372036854775807", r)
+		t.Errorf("-9223372036854775807 %s 0 = %d, want -9223372036854775807", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("-9223372036854775807 << 1 = %d, want 2", r)
+		t.Errorf("-9223372036854775807 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("-9223372036854775807 << 65535 = %d, want 0", r)
+		t.Errorf("-9223372036854775807 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = -4294967296
 	y = 0
 	r = x << y
 	if r != -4294967296 {
-		t.Errorf("-4294967296 << 0 = %d, want -4294967296", r)
+		t.Errorf("-4294967296 %s 0 = %d, want -4294967296", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -8589934592 {
-		t.Errorf("-4294967296 << 1 = %d, want -8589934592", r)
+		t.Errorf("-4294967296 %s 1 = %d, want -8589934592", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("-4294967296 << 65535 = %d, want 0", r)
+		t.Errorf("-4294967296 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = -1
 	y = 0
 	r = x << y
 	if r != -1 {
-		t.Errorf("-1 << 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("-1 << 1 = %d, want -2", r)
+		t.Errorf("-1 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("-1 << 65535 = %d, want 0", r)
+		t.Errorf("-1 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 0
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 65535 = %d, want 0", r)
+		t.Errorf("0 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 65535 = %d, want 0", r)
+		t.Errorf("1 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 4294967296
 	y = 0
 	r = x << y
 	if r != 4294967296 {
-		t.Errorf("4294967296 << 0 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 0 = %d, want 4294967296", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 8589934592 {
-		t.Errorf("4294967296 << 1 = %d, want 8589934592", r)
+		t.Errorf("4294967296 %s 1 = %d, want 8589934592", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("4294967296 << 65535 = %d, want 0", r)
+		t.Errorf("4294967296 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 9223372036854775806
 	y = 0
 	r = x << y
 	if r != 9223372036854775806 {
-		t.Errorf("9223372036854775806 << 0 = %d, want 9223372036854775806", r)
+		t.Errorf("9223372036854775806 %s 0 = %d, want 9223372036854775806", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -4 {
-		t.Errorf("9223372036854775806 << 1 = %d, want -4", r)
+		t.Errorf("9223372036854775806 %s 1 = %d, want -4", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("9223372036854775806 << 65535 = %d, want 0", r)
+		t.Errorf("9223372036854775806 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 9223372036854775807
 	y = 0
 	r = x << y
 	if r != 9223372036854775807 {
-		t.Errorf("9223372036854775807 << 0 = %d, want 9223372036854775807", r)
+		t.Errorf("9223372036854775807 %s 0 = %d, want 9223372036854775807", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("9223372036854775807 << 1 = %d, want -2", r)
+		t.Errorf("9223372036854775807 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("9223372036854775807 << 65535 = %d, want 0", r)
+		t.Errorf("9223372036854775807 %s 65535 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFoldint64uint16rsh(t *testing.T) {
@@ -7783,145 +7783,145 @@ func TestConstFoldint64uint16rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != -9223372036854775808 {
-		t.Errorf("-9223372036854775808 >> 0 = %d, want -9223372036854775808", r)
+		t.Errorf("-9223372036854775808 %s 0 = %d, want -9223372036854775808", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -4611686018427387904 {
-		t.Errorf("-9223372036854775808 >> 1 = %d, want -4611686018427387904", r)
+		t.Errorf("-9223372036854775808 %s 1 = %d, want -4611686018427387904", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-9223372036854775808 >> 65535 = %d, want -1", r)
+		t.Errorf("-9223372036854775808 %s 65535 = %d, want -1", ">>", r)
 	}
 	x = -9223372036854775807
 	y = 0
 	r = x >> y
 	if r != -9223372036854775807 {
-		t.Errorf("-9223372036854775807 >> 0 = %d, want -9223372036854775807", r)
+		t.Errorf("-9223372036854775807 %s 0 = %d, want -9223372036854775807", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -4611686018427387904 {
-		t.Errorf("-9223372036854775807 >> 1 = %d, want -4611686018427387904", r)
+		t.Errorf("-9223372036854775807 %s 1 = %d, want -4611686018427387904", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-9223372036854775807 >> 65535 = %d, want -1", r)
+		t.Errorf("-9223372036854775807 %s 65535 = %d, want -1", ">>", r)
 	}
 	x = -4294967296
 	y = 0
 	r = x >> y
 	if r != -4294967296 {
-		t.Errorf("-4294967296 >> 0 = %d, want -4294967296", r)
+		t.Errorf("-4294967296 %s 0 = %d, want -4294967296", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -2147483648 {
-		t.Errorf("-4294967296 >> 1 = %d, want -2147483648", r)
+		t.Errorf("-4294967296 %s 1 = %d, want -2147483648", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-4294967296 >> 65535 = %d, want -1", r)
+		t.Errorf("-4294967296 %s 65535 = %d, want -1", ">>", r)
 	}
 	x = -1
 	y = 0
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 65535 = %d, want -1", r)
+		t.Errorf("-1 %s 65535 = %d, want -1", ">>", r)
 	}
 	x = 0
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 65535 = %d, want 0", r)
+		t.Errorf("0 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 65535 = %d, want 0", r)
+		t.Errorf("1 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 4294967296
 	y = 0
 	r = x >> y
 	if r != 4294967296 {
-		t.Errorf("4294967296 >> 0 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 0 = %d, want 4294967296", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 2147483648 {
-		t.Errorf("4294967296 >> 1 = %d, want 2147483648", r)
+		t.Errorf("4294967296 %s 1 = %d, want 2147483648", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("4294967296 >> 65535 = %d, want 0", r)
+		t.Errorf("4294967296 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 9223372036854775806
 	y = 0
 	r = x >> y
 	if r != 9223372036854775806 {
-		t.Errorf("9223372036854775806 >> 0 = %d, want 9223372036854775806", r)
+		t.Errorf("9223372036854775806 %s 0 = %d, want 9223372036854775806", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 4611686018427387903 {
-		t.Errorf("9223372036854775806 >> 1 = %d, want 4611686018427387903", r)
+		t.Errorf("9223372036854775806 %s 1 = %d, want 4611686018427387903", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("9223372036854775806 >> 65535 = %d, want 0", r)
+		t.Errorf("9223372036854775806 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 9223372036854775807
 	y = 0
 	r = x >> y
 	if r != 9223372036854775807 {
-		t.Errorf("9223372036854775807 >> 0 = %d, want 9223372036854775807", r)
+		t.Errorf("9223372036854775807 %s 0 = %d, want 9223372036854775807", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 4611686018427387903 {
-		t.Errorf("9223372036854775807 >> 1 = %d, want 4611686018427387903", r)
+		t.Errorf("9223372036854775807 %s 1 = %d, want 4611686018427387903", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("9223372036854775807 >> 65535 = %d, want 0", r)
+		t.Errorf("9223372036854775807 %s 65535 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFoldint64uint8lsh(t *testing.T) {
@@ -7931,145 +7931,145 @@ func TestConstFoldint64uint8lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != -9223372036854775808 {
-		t.Errorf("-9223372036854775808 << 0 = %d, want -9223372036854775808", r)
+		t.Errorf("-9223372036854775808 %s 0 = %d, want -9223372036854775808", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 << 1 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("-9223372036854775808 << 255 = %d, want 0", r)
+		t.Errorf("-9223372036854775808 %s 255 = %d, want 0", "<<", r)
 	}
 	x = -9223372036854775807
 	y = 0
 	r = x << y
 	if r != -9223372036854775807 {
-		t.Errorf("-9223372036854775807 << 0 = %d, want -9223372036854775807", r)
+		t.Errorf("-9223372036854775807 %s 0 = %d, want -9223372036854775807", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("-9223372036854775807 << 1 = %d, want 2", r)
+		t.Errorf("-9223372036854775807 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("-9223372036854775807 << 255 = %d, want 0", r)
+		t.Errorf("-9223372036854775807 %s 255 = %d, want 0", "<<", r)
 	}
 	x = -4294967296
 	y = 0
 	r = x << y
 	if r != -4294967296 {
-		t.Errorf("-4294967296 << 0 = %d, want -4294967296", r)
+		t.Errorf("-4294967296 %s 0 = %d, want -4294967296", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -8589934592 {
-		t.Errorf("-4294967296 << 1 = %d, want -8589934592", r)
+		t.Errorf("-4294967296 %s 1 = %d, want -8589934592", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("-4294967296 << 255 = %d, want 0", r)
+		t.Errorf("-4294967296 %s 255 = %d, want 0", "<<", r)
 	}
 	x = -1
 	y = 0
 	r = x << y
 	if r != -1 {
-		t.Errorf("-1 << 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("-1 << 1 = %d, want -2", r)
+		t.Errorf("-1 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("-1 << 255 = %d, want 0", r)
+		t.Errorf("-1 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 0
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 255 = %d, want 0", r)
+		t.Errorf("0 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 255 = %d, want 0", r)
+		t.Errorf("1 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 4294967296
 	y = 0
 	r = x << y
 	if r != 4294967296 {
-		t.Errorf("4294967296 << 0 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 0 = %d, want 4294967296", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 8589934592 {
-		t.Errorf("4294967296 << 1 = %d, want 8589934592", r)
+		t.Errorf("4294967296 %s 1 = %d, want 8589934592", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("4294967296 << 255 = %d, want 0", r)
+		t.Errorf("4294967296 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 9223372036854775806
 	y = 0
 	r = x << y
 	if r != 9223372036854775806 {
-		t.Errorf("9223372036854775806 << 0 = %d, want 9223372036854775806", r)
+		t.Errorf("9223372036854775806 %s 0 = %d, want 9223372036854775806", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -4 {
-		t.Errorf("9223372036854775806 << 1 = %d, want -4", r)
+		t.Errorf("9223372036854775806 %s 1 = %d, want -4", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("9223372036854775806 << 255 = %d, want 0", r)
+		t.Errorf("9223372036854775806 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 9223372036854775807
 	y = 0
 	r = x << y
 	if r != 9223372036854775807 {
-		t.Errorf("9223372036854775807 << 0 = %d, want 9223372036854775807", r)
+		t.Errorf("9223372036854775807 %s 0 = %d, want 9223372036854775807", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("9223372036854775807 << 1 = %d, want -2", r)
+		t.Errorf("9223372036854775807 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("9223372036854775807 << 255 = %d, want 0", r)
+		t.Errorf("9223372036854775807 %s 255 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFoldint64uint8rsh(t *testing.T) {
@@ -8079,145 +8079,145 @@ func TestConstFoldint64uint8rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != -9223372036854775808 {
-		t.Errorf("-9223372036854775808 >> 0 = %d, want -9223372036854775808", r)
+		t.Errorf("-9223372036854775808 %s 0 = %d, want -9223372036854775808", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -4611686018427387904 {
-		t.Errorf("-9223372036854775808 >> 1 = %d, want -4611686018427387904", r)
+		t.Errorf("-9223372036854775808 %s 1 = %d, want -4611686018427387904", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-9223372036854775808 >> 255 = %d, want -1", r)
+		t.Errorf("-9223372036854775808 %s 255 = %d, want -1", ">>", r)
 	}
 	x = -9223372036854775807
 	y = 0
 	r = x >> y
 	if r != -9223372036854775807 {
-		t.Errorf("-9223372036854775807 >> 0 = %d, want -9223372036854775807", r)
+		t.Errorf("-9223372036854775807 %s 0 = %d, want -9223372036854775807", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -4611686018427387904 {
-		t.Errorf("-9223372036854775807 >> 1 = %d, want -4611686018427387904", r)
+		t.Errorf("-9223372036854775807 %s 1 = %d, want -4611686018427387904", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-9223372036854775807 >> 255 = %d, want -1", r)
+		t.Errorf("-9223372036854775807 %s 255 = %d, want -1", ">>", r)
 	}
 	x = -4294967296
 	y = 0
 	r = x >> y
 	if r != -4294967296 {
-		t.Errorf("-4294967296 >> 0 = %d, want -4294967296", r)
+		t.Errorf("-4294967296 %s 0 = %d, want -4294967296", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -2147483648 {
-		t.Errorf("-4294967296 >> 1 = %d, want -2147483648", r)
+		t.Errorf("-4294967296 %s 1 = %d, want -2147483648", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-4294967296 >> 255 = %d, want -1", r)
+		t.Errorf("-4294967296 %s 255 = %d, want -1", ">>", r)
 	}
 	x = -1
 	y = 0
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 255 = %d, want -1", r)
+		t.Errorf("-1 %s 255 = %d, want -1", ">>", r)
 	}
 	x = 0
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 255 = %d, want 0", r)
+		t.Errorf("0 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 255 = %d, want 0", r)
+		t.Errorf("1 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 4294967296
 	y = 0
 	r = x >> y
 	if r != 4294967296 {
-		t.Errorf("4294967296 >> 0 = %d, want 4294967296", r)
+		t.Errorf("4294967296 %s 0 = %d, want 4294967296", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 2147483648 {
-		t.Errorf("4294967296 >> 1 = %d, want 2147483648", r)
+		t.Errorf("4294967296 %s 1 = %d, want 2147483648", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("4294967296 >> 255 = %d, want 0", r)
+		t.Errorf("4294967296 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 9223372036854775806
 	y = 0
 	r = x >> y
 	if r != 9223372036854775806 {
-		t.Errorf("9223372036854775806 >> 0 = %d, want 9223372036854775806", r)
+		t.Errorf("9223372036854775806 %s 0 = %d, want 9223372036854775806", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 4611686018427387903 {
-		t.Errorf("9223372036854775806 >> 1 = %d, want 4611686018427387903", r)
+		t.Errorf("9223372036854775806 %s 1 = %d, want 4611686018427387903", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("9223372036854775806 >> 255 = %d, want 0", r)
+		t.Errorf("9223372036854775806 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 9223372036854775807
 	y = 0
 	r = x >> y
 	if r != 9223372036854775807 {
-		t.Errorf("9223372036854775807 >> 0 = %d, want 9223372036854775807", r)
+		t.Errorf("9223372036854775807 %s 0 = %d, want 9223372036854775807", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 4611686018427387903 {
-		t.Errorf("9223372036854775807 >> 1 = %d, want 4611686018427387903", r)
+		t.Errorf("9223372036854775807 %s 1 = %d, want 4611686018427387903", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("9223372036854775807 >> 255 = %d, want 0", r)
+		t.Errorf("9223372036854775807 %s 255 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFolduint32uint64lsh(t *testing.T) {
@@ -8227,64 +8227,64 @@ func TestConstFolduint32uint64lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 4294967296 = %d, want 0", r)
+		t.Errorf("1 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 4294967295
 	y = 0
 	r = x << y
 	if r != 4294967295 {
-		t.Errorf("4294967295 << 0 = %d, want 4294967295", r)
+		t.Errorf("4294967295 %s 0 = %d, want 4294967295", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 4294967294 {
-		t.Errorf("4294967295 << 1 = %d, want 4294967294", r)
+		t.Errorf("4294967295 %s 1 = %d, want 4294967294", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("4294967295 << 4294967296 = %d, want 0", r)
+		t.Errorf("4294967295 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("4294967295 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("4294967295 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFolduint32uint64rsh(t *testing.T) {
@@ -8294,64 +8294,64 @@ func TestConstFolduint32uint64rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 4294967296 = %d, want 0", r)
+		t.Errorf("1 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 4294967295
 	y = 0
 	r = x >> y
 	if r != 4294967295 {
-		t.Errorf("4294967295 >> 0 = %d, want 4294967295", r)
+		t.Errorf("4294967295 %s 0 = %d, want 4294967295", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 2147483647 {
-		t.Errorf("4294967295 >> 1 = %d, want 2147483647", r)
+		t.Errorf("4294967295 %s 1 = %d, want 2147483647", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("4294967295 >> 4294967296 = %d, want 0", r)
+		t.Errorf("4294967295 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("4294967295 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("4294967295 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFolduint32uint32lsh(t *testing.T) {
@@ -8361,49 +8361,49 @@ func TestConstFolduint32uint32lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 4294967295 = %d, want 0", r)
+		t.Errorf("0 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 4294967295 = %d, want 0", r)
+		t.Errorf("1 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 4294967295
 	y = 0
 	r = x << y
 	if r != 4294967295 {
-		t.Errorf("4294967295 << 0 = %d, want 4294967295", r)
+		t.Errorf("4294967295 %s 0 = %d, want 4294967295", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 4294967294 {
-		t.Errorf("4294967295 << 1 = %d, want 4294967294", r)
+		t.Errorf("4294967295 %s 1 = %d, want 4294967294", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("4294967295 << 4294967295 = %d, want 0", r)
+		t.Errorf("4294967295 %s 4294967295 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFolduint32uint32rsh(t *testing.T) {
@@ -8413,49 +8413,49 @@ func TestConstFolduint32uint32rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 4294967295 = %d, want 0", r)
+		t.Errorf("0 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 4294967295 = %d, want 0", r)
+		t.Errorf("1 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 4294967295
 	y = 0
 	r = x >> y
 	if r != 4294967295 {
-		t.Errorf("4294967295 >> 0 = %d, want 4294967295", r)
+		t.Errorf("4294967295 %s 0 = %d, want 4294967295", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 2147483647 {
-		t.Errorf("4294967295 >> 1 = %d, want 2147483647", r)
+		t.Errorf("4294967295 %s 1 = %d, want 2147483647", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("4294967295 >> 4294967295 = %d, want 0", r)
+		t.Errorf("4294967295 %s 4294967295 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFolduint32uint16lsh(t *testing.T) {
@@ -8465,49 +8465,49 @@ func TestConstFolduint32uint16lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 65535 = %d, want 0", r)
+		t.Errorf("0 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 65535 = %d, want 0", r)
+		t.Errorf("1 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 4294967295
 	y = 0
 	r = x << y
 	if r != 4294967295 {
-		t.Errorf("4294967295 << 0 = %d, want 4294967295", r)
+		t.Errorf("4294967295 %s 0 = %d, want 4294967295", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 4294967294 {
-		t.Errorf("4294967295 << 1 = %d, want 4294967294", r)
+		t.Errorf("4294967295 %s 1 = %d, want 4294967294", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("4294967295 << 65535 = %d, want 0", r)
+		t.Errorf("4294967295 %s 65535 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFolduint32uint16rsh(t *testing.T) {
@@ -8517,49 +8517,49 @@ func TestConstFolduint32uint16rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 65535 = %d, want 0", r)
+		t.Errorf("0 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 65535 = %d, want 0", r)
+		t.Errorf("1 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 4294967295
 	y = 0
 	r = x >> y
 	if r != 4294967295 {
-		t.Errorf("4294967295 >> 0 = %d, want 4294967295", r)
+		t.Errorf("4294967295 %s 0 = %d, want 4294967295", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 2147483647 {
-		t.Errorf("4294967295 >> 1 = %d, want 2147483647", r)
+		t.Errorf("4294967295 %s 1 = %d, want 2147483647", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("4294967295 >> 65535 = %d, want 0", r)
+		t.Errorf("4294967295 %s 65535 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFolduint32uint8lsh(t *testing.T) {
@@ -8569,49 +8569,49 @@ func TestConstFolduint32uint8lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 255 = %d, want 0", r)
+		t.Errorf("0 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 255 = %d, want 0", r)
+		t.Errorf("1 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 4294967295
 	y = 0
 	r = x << y
 	if r != 4294967295 {
-		t.Errorf("4294967295 << 0 = %d, want 4294967295", r)
+		t.Errorf("4294967295 %s 0 = %d, want 4294967295", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 4294967294 {
-		t.Errorf("4294967295 << 1 = %d, want 4294967294", r)
+		t.Errorf("4294967295 %s 1 = %d, want 4294967294", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("4294967295 << 255 = %d, want 0", r)
+		t.Errorf("4294967295 %s 255 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFolduint32uint8rsh(t *testing.T) {
@@ -8621,49 +8621,49 @@ func TestConstFolduint32uint8rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 255 = %d, want 0", r)
+		t.Errorf("0 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 255 = %d, want 0", r)
+		t.Errorf("1 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 4294967295
 	y = 0
 	r = x >> y
 	if r != 4294967295 {
-		t.Errorf("4294967295 >> 0 = %d, want 4294967295", r)
+		t.Errorf("4294967295 %s 0 = %d, want 4294967295", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 2147483647 {
-		t.Errorf("4294967295 >> 1 = %d, want 2147483647", r)
+		t.Errorf("4294967295 %s 1 = %d, want 2147483647", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("4294967295 >> 255 = %d, want 0", r)
+		t.Errorf("4294967295 %s 255 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFoldint32uint64lsh(t *testing.T) {
@@ -8673,127 +8673,127 @@ func TestConstFoldint32uint64lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != -2147483648 {
-		t.Errorf("-2147483648 << 0 = %d, want -2147483648", r)
+		t.Errorf("-2147483648 %s 0 = %d, want -2147483648", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("-2147483648 << 1 = %d, want 0", r)
+		t.Errorf("-2147483648 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("-2147483648 << 4294967296 = %d, want 0", r)
+		t.Errorf("-2147483648 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("-2147483648 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("-2147483648 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = -2147483647
 	y = 0
 	r = x << y
 	if r != -2147483647 {
-		t.Errorf("-2147483647 << 0 = %d, want -2147483647", r)
+		t.Errorf("-2147483647 %s 0 = %d, want -2147483647", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("-2147483647 << 1 = %d, want 2", r)
+		t.Errorf("-2147483647 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("-2147483647 << 4294967296 = %d, want 0", r)
+		t.Errorf("-2147483647 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("-2147483647 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("-2147483647 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = -1
 	y = 0
 	r = x << y
 	if r != -1 {
-		t.Errorf("-1 << 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("-1 << 1 = %d, want -2", r)
+		t.Errorf("-1 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("-1 << 4294967296 = %d, want 0", r)
+		t.Errorf("-1 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("-1 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("-1 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 0
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 4294967296 = %d, want 0", r)
+		t.Errorf("1 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 2147483647
 	y = 0
 	r = x << y
 	if r != 2147483647 {
-		t.Errorf("2147483647 << 0 = %d, want 2147483647", r)
+		t.Errorf("2147483647 %s 0 = %d, want 2147483647", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("2147483647 << 1 = %d, want -2", r)
+		t.Errorf("2147483647 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("2147483647 << 4294967296 = %d, want 0", r)
+		t.Errorf("2147483647 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("2147483647 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("2147483647 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFoldint32uint64rsh(t *testing.T) {
@@ -8803,127 +8803,127 @@ func TestConstFoldint32uint64rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != -2147483648 {
-		t.Errorf("-2147483648 >> 0 = %d, want -2147483648", r)
+		t.Errorf("-2147483648 %s 0 = %d, want -2147483648", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1073741824 {
-		t.Errorf("-2147483648 >> 1 = %d, want -1073741824", r)
+		t.Errorf("-2147483648 %s 1 = %d, want -1073741824", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-2147483648 >> 4294967296 = %d, want -1", r)
+		t.Errorf("-2147483648 %s 4294967296 = %d, want -1", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-2147483648 >> 18446744073709551615 = %d, want -1", r)
+		t.Errorf("-2147483648 %s 18446744073709551615 = %d, want -1", ">>", r)
 	}
 	x = -2147483647
 	y = 0
 	r = x >> y
 	if r != -2147483647 {
-		t.Errorf("-2147483647 >> 0 = %d, want -2147483647", r)
+		t.Errorf("-2147483647 %s 0 = %d, want -2147483647", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1073741824 {
-		t.Errorf("-2147483647 >> 1 = %d, want -1073741824", r)
+		t.Errorf("-2147483647 %s 1 = %d, want -1073741824", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-2147483647 >> 4294967296 = %d, want -1", r)
+		t.Errorf("-2147483647 %s 4294967296 = %d, want -1", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-2147483647 >> 18446744073709551615 = %d, want -1", r)
+		t.Errorf("-2147483647 %s 18446744073709551615 = %d, want -1", ">>", r)
 	}
 	x = -1
 	y = 0
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 4294967296 = %d, want -1", r)
+		t.Errorf("-1 %s 4294967296 = %d, want -1", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 18446744073709551615 = %d, want -1", r)
+		t.Errorf("-1 %s 18446744073709551615 = %d, want -1", ">>", r)
 	}
 	x = 0
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 4294967296 = %d, want 0", r)
+		t.Errorf("1 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 2147483647
 	y = 0
 	r = x >> y
 	if r != 2147483647 {
-		t.Errorf("2147483647 >> 0 = %d, want 2147483647", r)
+		t.Errorf("2147483647 %s 0 = %d, want 2147483647", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 1073741823 {
-		t.Errorf("2147483647 >> 1 = %d, want 1073741823", r)
+		t.Errorf("2147483647 %s 1 = %d, want 1073741823", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("2147483647 >> 4294967296 = %d, want 0", r)
+		t.Errorf("2147483647 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("2147483647 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("2147483647 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFoldint32uint32lsh(t *testing.T) {
@@ -8933,97 +8933,97 @@ func TestConstFoldint32uint32lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != -2147483648 {
-		t.Errorf("-2147483648 << 0 = %d, want -2147483648", r)
+		t.Errorf("-2147483648 %s 0 = %d, want -2147483648", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("-2147483648 << 1 = %d, want 0", r)
+		t.Errorf("-2147483648 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("-2147483648 << 4294967295 = %d, want 0", r)
+		t.Errorf("-2147483648 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = -2147483647
 	y = 0
 	r = x << y
 	if r != -2147483647 {
-		t.Errorf("-2147483647 << 0 = %d, want -2147483647", r)
+		t.Errorf("-2147483647 %s 0 = %d, want -2147483647", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("-2147483647 << 1 = %d, want 2", r)
+		t.Errorf("-2147483647 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("-2147483647 << 4294967295 = %d, want 0", r)
+		t.Errorf("-2147483647 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = -1
 	y = 0
 	r = x << y
 	if r != -1 {
-		t.Errorf("-1 << 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("-1 << 1 = %d, want -2", r)
+		t.Errorf("-1 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("-1 << 4294967295 = %d, want 0", r)
+		t.Errorf("-1 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 0
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 4294967295 = %d, want 0", r)
+		t.Errorf("0 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 4294967295 = %d, want 0", r)
+		t.Errorf("1 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 2147483647
 	y = 0
 	r = x << y
 	if r != 2147483647 {
-		t.Errorf("2147483647 << 0 = %d, want 2147483647", r)
+		t.Errorf("2147483647 %s 0 = %d, want 2147483647", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("2147483647 << 1 = %d, want -2", r)
+		t.Errorf("2147483647 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("2147483647 << 4294967295 = %d, want 0", r)
+		t.Errorf("2147483647 %s 4294967295 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFoldint32uint32rsh(t *testing.T) {
@@ -9033,97 +9033,97 @@ func TestConstFoldint32uint32rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != -2147483648 {
-		t.Errorf("-2147483648 >> 0 = %d, want -2147483648", r)
+		t.Errorf("-2147483648 %s 0 = %d, want -2147483648", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1073741824 {
-		t.Errorf("-2147483648 >> 1 = %d, want -1073741824", r)
+		t.Errorf("-2147483648 %s 1 = %d, want -1073741824", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-2147483648 >> 4294967295 = %d, want -1", r)
+		t.Errorf("-2147483648 %s 4294967295 = %d, want -1", ">>", r)
 	}
 	x = -2147483647
 	y = 0
 	r = x >> y
 	if r != -2147483647 {
-		t.Errorf("-2147483647 >> 0 = %d, want -2147483647", r)
+		t.Errorf("-2147483647 %s 0 = %d, want -2147483647", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1073741824 {
-		t.Errorf("-2147483647 >> 1 = %d, want -1073741824", r)
+		t.Errorf("-2147483647 %s 1 = %d, want -1073741824", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-2147483647 >> 4294967295 = %d, want -1", r)
+		t.Errorf("-2147483647 %s 4294967295 = %d, want -1", ">>", r)
 	}
 	x = -1
 	y = 0
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 4294967295 = %d, want -1", r)
+		t.Errorf("-1 %s 4294967295 = %d, want -1", ">>", r)
 	}
 	x = 0
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 4294967295 = %d, want 0", r)
+		t.Errorf("0 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 4294967295 = %d, want 0", r)
+		t.Errorf("1 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 2147483647
 	y = 0
 	r = x >> y
 	if r != 2147483647 {
-		t.Errorf("2147483647 >> 0 = %d, want 2147483647", r)
+		t.Errorf("2147483647 %s 0 = %d, want 2147483647", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 1073741823 {
-		t.Errorf("2147483647 >> 1 = %d, want 1073741823", r)
+		t.Errorf("2147483647 %s 1 = %d, want 1073741823", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("2147483647 >> 4294967295 = %d, want 0", r)
+		t.Errorf("2147483647 %s 4294967295 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFoldint32uint16lsh(t *testing.T) {
@@ -9133,97 +9133,97 @@ func TestConstFoldint32uint16lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != -2147483648 {
-		t.Errorf("-2147483648 << 0 = %d, want -2147483648", r)
+		t.Errorf("-2147483648 %s 0 = %d, want -2147483648", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("-2147483648 << 1 = %d, want 0", r)
+		t.Errorf("-2147483648 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("-2147483648 << 65535 = %d, want 0", r)
+		t.Errorf("-2147483648 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = -2147483647
 	y = 0
 	r = x << y
 	if r != -2147483647 {
-		t.Errorf("-2147483647 << 0 = %d, want -2147483647", r)
+		t.Errorf("-2147483647 %s 0 = %d, want -2147483647", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("-2147483647 << 1 = %d, want 2", r)
+		t.Errorf("-2147483647 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("-2147483647 << 65535 = %d, want 0", r)
+		t.Errorf("-2147483647 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = -1
 	y = 0
 	r = x << y
 	if r != -1 {
-		t.Errorf("-1 << 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("-1 << 1 = %d, want -2", r)
+		t.Errorf("-1 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("-1 << 65535 = %d, want 0", r)
+		t.Errorf("-1 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 0
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 65535 = %d, want 0", r)
+		t.Errorf("0 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 65535 = %d, want 0", r)
+		t.Errorf("1 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 2147483647
 	y = 0
 	r = x << y
 	if r != 2147483647 {
-		t.Errorf("2147483647 << 0 = %d, want 2147483647", r)
+		t.Errorf("2147483647 %s 0 = %d, want 2147483647", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("2147483647 << 1 = %d, want -2", r)
+		t.Errorf("2147483647 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("2147483647 << 65535 = %d, want 0", r)
+		t.Errorf("2147483647 %s 65535 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFoldint32uint16rsh(t *testing.T) {
@@ -9233,97 +9233,97 @@ func TestConstFoldint32uint16rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != -2147483648 {
-		t.Errorf("-2147483648 >> 0 = %d, want -2147483648", r)
+		t.Errorf("-2147483648 %s 0 = %d, want -2147483648", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1073741824 {
-		t.Errorf("-2147483648 >> 1 = %d, want -1073741824", r)
+		t.Errorf("-2147483648 %s 1 = %d, want -1073741824", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-2147483648 >> 65535 = %d, want -1", r)
+		t.Errorf("-2147483648 %s 65535 = %d, want -1", ">>", r)
 	}
 	x = -2147483647
 	y = 0
 	r = x >> y
 	if r != -2147483647 {
-		t.Errorf("-2147483647 >> 0 = %d, want -2147483647", r)
+		t.Errorf("-2147483647 %s 0 = %d, want -2147483647", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1073741824 {
-		t.Errorf("-2147483647 >> 1 = %d, want -1073741824", r)
+		t.Errorf("-2147483647 %s 1 = %d, want -1073741824", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-2147483647 >> 65535 = %d, want -1", r)
+		t.Errorf("-2147483647 %s 65535 = %d, want -1", ">>", r)
 	}
 	x = -1
 	y = 0
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 65535 = %d, want -1", r)
+		t.Errorf("-1 %s 65535 = %d, want -1", ">>", r)
 	}
 	x = 0
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 65535 = %d, want 0", r)
+		t.Errorf("0 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 65535 = %d, want 0", r)
+		t.Errorf("1 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 2147483647
 	y = 0
 	r = x >> y
 	if r != 2147483647 {
-		t.Errorf("2147483647 >> 0 = %d, want 2147483647", r)
+		t.Errorf("2147483647 %s 0 = %d, want 2147483647", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 1073741823 {
-		t.Errorf("2147483647 >> 1 = %d, want 1073741823", r)
+		t.Errorf("2147483647 %s 1 = %d, want 1073741823", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("2147483647 >> 65535 = %d, want 0", r)
+		t.Errorf("2147483647 %s 65535 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFoldint32uint8lsh(t *testing.T) {
@@ -9333,97 +9333,97 @@ func TestConstFoldint32uint8lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != -2147483648 {
-		t.Errorf("-2147483648 << 0 = %d, want -2147483648", r)
+		t.Errorf("-2147483648 %s 0 = %d, want -2147483648", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("-2147483648 << 1 = %d, want 0", r)
+		t.Errorf("-2147483648 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("-2147483648 << 255 = %d, want 0", r)
+		t.Errorf("-2147483648 %s 255 = %d, want 0", "<<", r)
 	}
 	x = -2147483647
 	y = 0
 	r = x << y
 	if r != -2147483647 {
-		t.Errorf("-2147483647 << 0 = %d, want -2147483647", r)
+		t.Errorf("-2147483647 %s 0 = %d, want -2147483647", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("-2147483647 << 1 = %d, want 2", r)
+		t.Errorf("-2147483647 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("-2147483647 << 255 = %d, want 0", r)
+		t.Errorf("-2147483647 %s 255 = %d, want 0", "<<", r)
 	}
 	x = -1
 	y = 0
 	r = x << y
 	if r != -1 {
-		t.Errorf("-1 << 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("-1 << 1 = %d, want -2", r)
+		t.Errorf("-1 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("-1 << 255 = %d, want 0", r)
+		t.Errorf("-1 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 0
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 255 = %d, want 0", r)
+		t.Errorf("0 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 255 = %d, want 0", r)
+		t.Errorf("1 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 2147483647
 	y = 0
 	r = x << y
 	if r != 2147483647 {
-		t.Errorf("2147483647 << 0 = %d, want 2147483647", r)
+		t.Errorf("2147483647 %s 0 = %d, want 2147483647", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("2147483647 << 1 = %d, want -2", r)
+		t.Errorf("2147483647 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("2147483647 << 255 = %d, want 0", r)
+		t.Errorf("2147483647 %s 255 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFoldint32uint8rsh(t *testing.T) {
@@ -9433,97 +9433,97 @@ func TestConstFoldint32uint8rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != -2147483648 {
-		t.Errorf("-2147483648 >> 0 = %d, want -2147483648", r)
+		t.Errorf("-2147483648 %s 0 = %d, want -2147483648", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1073741824 {
-		t.Errorf("-2147483648 >> 1 = %d, want -1073741824", r)
+		t.Errorf("-2147483648 %s 1 = %d, want -1073741824", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-2147483648 >> 255 = %d, want -1", r)
+		t.Errorf("-2147483648 %s 255 = %d, want -1", ">>", r)
 	}
 	x = -2147483647
 	y = 0
 	r = x >> y
 	if r != -2147483647 {
-		t.Errorf("-2147483647 >> 0 = %d, want -2147483647", r)
+		t.Errorf("-2147483647 %s 0 = %d, want -2147483647", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1073741824 {
-		t.Errorf("-2147483647 >> 1 = %d, want -1073741824", r)
+		t.Errorf("-2147483647 %s 1 = %d, want -1073741824", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-2147483647 >> 255 = %d, want -1", r)
+		t.Errorf("-2147483647 %s 255 = %d, want -1", ">>", r)
 	}
 	x = -1
 	y = 0
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 255 = %d, want -1", r)
+		t.Errorf("-1 %s 255 = %d, want -1", ">>", r)
 	}
 	x = 0
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 255 = %d, want 0", r)
+		t.Errorf("0 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 255 = %d, want 0", r)
+		t.Errorf("1 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 2147483647
 	y = 0
 	r = x >> y
 	if r != 2147483647 {
-		t.Errorf("2147483647 >> 0 = %d, want 2147483647", r)
+		t.Errorf("2147483647 %s 0 = %d, want 2147483647", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 1073741823 {
-		t.Errorf("2147483647 >> 1 = %d, want 1073741823", r)
+		t.Errorf("2147483647 %s 1 = %d, want 1073741823", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("2147483647 >> 255 = %d, want 0", r)
+		t.Errorf("2147483647 %s 255 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFolduint16uint64lsh(t *testing.T) {
@@ -9533,64 +9533,64 @@ func TestConstFolduint16uint64lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 4294967296 = %d, want 0", r)
+		t.Errorf("1 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 65535
 	y = 0
 	r = x << y
 	if r != 65535 {
-		t.Errorf("65535 << 0 = %d, want 65535", r)
+		t.Errorf("65535 %s 0 = %d, want 65535", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 65534 {
-		t.Errorf("65535 << 1 = %d, want 65534", r)
+		t.Errorf("65535 %s 1 = %d, want 65534", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("65535 << 4294967296 = %d, want 0", r)
+		t.Errorf("65535 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("65535 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("65535 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFolduint16uint64rsh(t *testing.T) {
@@ -9600,64 +9600,64 @@ func TestConstFolduint16uint64rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 4294967296 = %d, want 0", r)
+		t.Errorf("1 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 65535
 	y = 0
 	r = x >> y
 	if r != 65535 {
-		t.Errorf("65535 >> 0 = %d, want 65535", r)
+		t.Errorf("65535 %s 0 = %d, want 65535", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 32767 {
-		t.Errorf("65535 >> 1 = %d, want 32767", r)
+		t.Errorf("65535 %s 1 = %d, want 32767", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("65535 >> 4294967296 = %d, want 0", r)
+		t.Errorf("65535 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("65535 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("65535 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFolduint16uint32lsh(t *testing.T) {
@@ -9667,49 +9667,49 @@ func TestConstFolduint16uint32lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 4294967295 = %d, want 0", r)
+		t.Errorf("0 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 4294967295 = %d, want 0", r)
+		t.Errorf("1 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 65535
 	y = 0
 	r = x << y
 	if r != 65535 {
-		t.Errorf("65535 << 0 = %d, want 65535", r)
+		t.Errorf("65535 %s 0 = %d, want 65535", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 65534 {
-		t.Errorf("65535 << 1 = %d, want 65534", r)
+		t.Errorf("65535 %s 1 = %d, want 65534", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("65535 << 4294967295 = %d, want 0", r)
+		t.Errorf("65535 %s 4294967295 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFolduint16uint32rsh(t *testing.T) {
@@ -9719,49 +9719,49 @@ func TestConstFolduint16uint32rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 4294967295 = %d, want 0", r)
+		t.Errorf("0 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 4294967295 = %d, want 0", r)
+		t.Errorf("1 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 65535
 	y = 0
 	r = x >> y
 	if r != 65535 {
-		t.Errorf("65535 >> 0 = %d, want 65535", r)
+		t.Errorf("65535 %s 0 = %d, want 65535", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 32767 {
-		t.Errorf("65535 >> 1 = %d, want 32767", r)
+		t.Errorf("65535 %s 1 = %d, want 32767", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("65535 >> 4294967295 = %d, want 0", r)
+		t.Errorf("65535 %s 4294967295 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFolduint16uint16lsh(t *testing.T) {
@@ -9771,49 +9771,49 @@ func TestConstFolduint16uint16lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 65535 = %d, want 0", r)
+		t.Errorf("0 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 65535 = %d, want 0", r)
+		t.Errorf("1 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 65535
 	y = 0
 	r = x << y
 	if r != 65535 {
-		t.Errorf("65535 << 0 = %d, want 65535", r)
+		t.Errorf("65535 %s 0 = %d, want 65535", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 65534 {
-		t.Errorf("65535 << 1 = %d, want 65534", r)
+		t.Errorf("65535 %s 1 = %d, want 65534", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("65535 << 65535 = %d, want 0", r)
+		t.Errorf("65535 %s 65535 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFolduint16uint16rsh(t *testing.T) {
@@ -9823,49 +9823,49 @@ func TestConstFolduint16uint16rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 65535 = %d, want 0", r)
+		t.Errorf("0 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 65535 = %d, want 0", r)
+		t.Errorf("1 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 65535
 	y = 0
 	r = x >> y
 	if r != 65535 {
-		t.Errorf("65535 >> 0 = %d, want 65535", r)
+		t.Errorf("65535 %s 0 = %d, want 65535", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 32767 {
-		t.Errorf("65535 >> 1 = %d, want 32767", r)
+		t.Errorf("65535 %s 1 = %d, want 32767", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("65535 >> 65535 = %d, want 0", r)
+		t.Errorf("65535 %s 65535 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFolduint16uint8lsh(t *testing.T) {
@@ -9875,49 +9875,49 @@ func TestConstFolduint16uint8lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 255 = %d, want 0", r)
+		t.Errorf("0 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 255 = %d, want 0", r)
+		t.Errorf("1 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 65535
 	y = 0
 	r = x << y
 	if r != 65535 {
-		t.Errorf("65535 << 0 = %d, want 65535", r)
+		t.Errorf("65535 %s 0 = %d, want 65535", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 65534 {
-		t.Errorf("65535 << 1 = %d, want 65534", r)
+		t.Errorf("65535 %s 1 = %d, want 65534", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("65535 << 255 = %d, want 0", r)
+		t.Errorf("65535 %s 255 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFolduint16uint8rsh(t *testing.T) {
@@ -9927,49 +9927,49 @@ func TestConstFolduint16uint8rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 255 = %d, want 0", r)
+		t.Errorf("0 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 255 = %d, want 0", r)
+		t.Errorf("1 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 65535
 	y = 0
 	r = x >> y
 	if r != 65535 {
-		t.Errorf("65535 >> 0 = %d, want 65535", r)
+		t.Errorf("65535 %s 0 = %d, want 65535", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 32767 {
-		t.Errorf("65535 >> 1 = %d, want 32767", r)
+		t.Errorf("65535 %s 1 = %d, want 32767", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("65535 >> 255 = %d, want 0", r)
+		t.Errorf("65535 %s 255 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFoldint16uint64lsh(t *testing.T) {
@@ -9979,148 +9979,148 @@ func TestConstFoldint16uint64lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != -32768 {
-		t.Errorf("-32768 << 0 = %d, want -32768", r)
+		t.Errorf("-32768 %s 0 = %d, want -32768", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("-32768 << 1 = %d, want 0", r)
+		t.Errorf("-32768 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("-32768 << 4294967296 = %d, want 0", r)
+		t.Errorf("-32768 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("-32768 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("-32768 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = -32767
 	y = 0
 	r = x << y
 	if r != -32767 {
-		t.Errorf("-32767 << 0 = %d, want -32767", r)
+		t.Errorf("-32767 %s 0 = %d, want -32767", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("-32767 << 1 = %d, want 2", r)
+		t.Errorf("-32767 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("-32767 << 4294967296 = %d, want 0", r)
+		t.Errorf("-32767 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("-32767 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("-32767 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = -1
 	y = 0
 	r = x << y
 	if r != -1 {
-		t.Errorf("-1 << 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("-1 << 1 = %d, want -2", r)
+		t.Errorf("-1 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("-1 << 4294967296 = %d, want 0", r)
+		t.Errorf("-1 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("-1 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("-1 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 0
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 4294967296 = %d, want 0", r)
+		t.Errorf("1 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 32766
 	y = 0
 	r = x << y
 	if r != 32766 {
-		t.Errorf("32766 << 0 = %d, want 32766", r)
+		t.Errorf("32766 %s 0 = %d, want 32766", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -4 {
-		t.Errorf("32766 << 1 = %d, want -4", r)
+		t.Errorf("32766 %s 1 = %d, want -4", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("32766 << 4294967296 = %d, want 0", r)
+		t.Errorf("32766 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("32766 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("32766 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 32767
 	y = 0
 	r = x << y
 	if r != 32767 {
-		t.Errorf("32767 << 0 = %d, want 32767", r)
+		t.Errorf("32767 %s 0 = %d, want 32767", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("32767 << 1 = %d, want -2", r)
+		t.Errorf("32767 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("32767 << 4294967296 = %d, want 0", r)
+		t.Errorf("32767 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("32767 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("32767 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFoldint16uint64rsh(t *testing.T) {
@@ -10130,148 +10130,148 @@ func TestConstFoldint16uint64rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != -32768 {
-		t.Errorf("-32768 >> 0 = %d, want -32768", r)
+		t.Errorf("-32768 %s 0 = %d, want -32768", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -16384 {
-		t.Errorf("-32768 >> 1 = %d, want -16384", r)
+		t.Errorf("-32768 %s 1 = %d, want -16384", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-32768 >> 4294967296 = %d, want -1", r)
+		t.Errorf("-32768 %s 4294967296 = %d, want -1", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-32768 >> 18446744073709551615 = %d, want -1", r)
+		t.Errorf("-32768 %s 18446744073709551615 = %d, want -1", ">>", r)
 	}
 	x = -32767
 	y = 0
 	r = x >> y
 	if r != -32767 {
-		t.Errorf("-32767 >> 0 = %d, want -32767", r)
+		t.Errorf("-32767 %s 0 = %d, want -32767", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -16384 {
-		t.Errorf("-32767 >> 1 = %d, want -16384", r)
+		t.Errorf("-32767 %s 1 = %d, want -16384", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-32767 >> 4294967296 = %d, want -1", r)
+		t.Errorf("-32767 %s 4294967296 = %d, want -1", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-32767 >> 18446744073709551615 = %d, want -1", r)
+		t.Errorf("-32767 %s 18446744073709551615 = %d, want -1", ">>", r)
 	}
 	x = -1
 	y = 0
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 4294967296 = %d, want -1", r)
+		t.Errorf("-1 %s 4294967296 = %d, want -1", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 18446744073709551615 = %d, want -1", r)
+		t.Errorf("-1 %s 18446744073709551615 = %d, want -1", ">>", r)
 	}
 	x = 0
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 4294967296 = %d, want 0", r)
+		t.Errorf("1 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 32766
 	y = 0
 	r = x >> y
 	if r != 32766 {
-		t.Errorf("32766 >> 0 = %d, want 32766", r)
+		t.Errorf("32766 %s 0 = %d, want 32766", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 16383 {
-		t.Errorf("32766 >> 1 = %d, want 16383", r)
+		t.Errorf("32766 %s 1 = %d, want 16383", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("32766 >> 4294967296 = %d, want 0", r)
+		t.Errorf("32766 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("32766 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("32766 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 32767
 	y = 0
 	r = x >> y
 	if r != 32767 {
-		t.Errorf("32767 >> 0 = %d, want 32767", r)
+		t.Errorf("32767 %s 0 = %d, want 32767", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 16383 {
-		t.Errorf("32767 >> 1 = %d, want 16383", r)
+		t.Errorf("32767 %s 1 = %d, want 16383", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("32767 >> 4294967296 = %d, want 0", r)
+		t.Errorf("32767 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("32767 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("32767 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFoldint16uint32lsh(t *testing.T) {
@@ -10281,113 +10281,113 @@ func TestConstFoldint16uint32lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != -32768 {
-		t.Errorf("-32768 << 0 = %d, want -32768", r)
+		t.Errorf("-32768 %s 0 = %d, want -32768", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("-32768 << 1 = %d, want 0", r)
+		t.Errorf("-32768 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("-32768 << 4294967295 = %d, want 0", r)
+		t.Errorf("-32768 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = -32767
 	y = 0
 	r = x << y
 	if r != -32767 {
-		t.Errorf("-32767 << 0 = %d, want -32767", r)
+		t.Errorf("-32767 %s 0 = %d, want -32767", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("-32767 << 1 = %d, want 2", r)
+		t.Errorf("-32767 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("-32767 << 4294967295 = %d, want 0", r)
+		t.Errorf("-32767 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = -1
 	y = 0
 	r = x << y
 	if r != -1 {
-		t.Errorf("-1 << 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("-1 << 1 = %d, want -2", r)
+		t.Errorf("-1 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("-1 << 4294967295 = %d, want 0", r)
+		t.Errorf("-1 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 0
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 4294967295 = %d, want 0", r)
+		t.Errorf("0 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 4294967295 = %d, want 0", r)
+		t.Errorf("1 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 32766
 	y = 0
 	r = x << y
 	if r != 32766 {
-		t.Errorf("32766 << 0 = %d, want 32766", r)
+		t.Errorf("32766 %s 0 = %d, want 32766", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -4 {
-		t.Errorf("32766 << 1 = %d, want -4", r)
+		t.Errorf("32766 %s 1 = %d, want -4", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("32766 << 4294967295 = %d, want 0", r)
+		t.Errorf("32766 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 32767
 	y = 0
 	r = x << y
 	if r != 32767 {
-		t.Errorf("32767 << 0 = %d, want 32767", r)
+		t.Errorf("32767 %s 0 = %d, want 32767", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("32767 << 1 = %d, want -2", r)
+		t.Errorf("32767 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("32767 << 4294967295 = %d, want 0", r)
+		t.Errorf("32767 %s 4294967295 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFoldint16uint32rsh(t *testing.T) {
@@ -10397,113 +10397,113 @@ func TestConstFoldint16uint32rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != -32768 {
-		t.Errorf("-32768 >> 0 = %d, want -32768", r)
+		t.Errorf("-32768 %s 0 = %d, want -32768", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -16384 {
-		t.Errorf("-32768 >> 1 = %d, want -16384", r)
+		t.Errorf("-32768 %s 1 = %d, want -16384", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-32768 >> 4294967295 = %d, want -1", r)
+		t.Errorf("-32768 %s 4294967295 = %d, want -1", ">>", r)
 	}
 	x = -32767
 	y = 0
 	r = x >> y
 	if r != -32767 {
-		t.Errorf("-32767 >> 0 = %d, want -32767", r)
+		t.Errorf("-32767 %s 0 = %d, want -32767", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -16384 {
-		t.Errorf("-32767 >> 1 = %d, want -16384", r)
+		t.Errorf("-32767 %s 1 = %d, want -16384", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-32767 >> 4294967295 = %d, want -1", r)
+		t.Errorf("-32767 %s 4294967295 = %d, want -1", ">>", r)
 	}
 	x = -1
 	y = 0
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 4294967295 = %d, want -1", r)
+		t.Errorf("-1 %s 4294967295 = %d, want -1", ">>", r)
 	}
 	x = 0
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 4294967295 = %d, want 0", r)
+		t.Errorf("0 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 4294967295 = %d, want 0", r)
+		t.Errorf("1 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 32766
 	y = 0
 	r = x >> y
 	if r != 32766 {
-		t.Errorf("32766 >> 0 = %d, want 32766", r)
+		t.Errorf("32766 %s 0 = %d, want 32766", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 16383 {
-		t.Errorf("32766 >> 1 = %d, want 16383", r)
+		t.Errorf("32766 %s 1 = %d, want 16383", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("32766 >> 4294967295 = %d, want 0", r)
+		t.Errorf("32766 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 32767
 	y = 0
 	r = x >> y
 	if r != 32767 {
-		t.Errorf("32767 >> 0 = %d, want 32767", r)
+		t.Errorf("32767 %s 0 = %d, want 32767", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 16383 {
-		t.Errorf("32767 >> 1 = %d, want 16383", r)
+		t.Errorf("32767 %s 1 = %d, want 16383", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("32767 >> 4294967295 = %d, want 0", r)
+		t.Errorf("32767 %s 4294967295 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFoldint16uint16lsh(t *testing.T) {
@@ -10513,113 +10513,113 @@ func TestConstFoldint16uint16lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != -32768 {
-		t.Errorf("-32768 << 0 = %d, want -32768", r)
+		t.Errorf("-32768 %s 0 = %d, want -32768", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("-32768 << 1 = %d, want 0", r)
+		t.Errorf("-32768 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("-32768 << 65535 = %d, want 0", r)
+		t.Errorf("-32768 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = -32767
 	y = 0
 	r = x << y
 	if r != -32767 {
-		t.Errorf("-32767 << 0 = %d, want -32767", r)
+		t.Errorf("-32767 %s 0 = %d, want -32767", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("-32767 << 1 = %d, want 2", r)
+		t.Errorf("-32767 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("-32767 << 65535 = %d, want 0", r)
+		t.Errorf("-32767 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = -1
 	y = 0
 	r = x << y
 	if r != -1 {
-		t.Errorf("-1 << 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("-1 << 1 = %d, want -2", r)
+		t.Errorf("-1 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("-1 << 65535 = %d, want 0", r)
+		t.Errorf("-1 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 0
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 65535 = %d, want 0", r)
+		t.Errorf("0 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 65535 = %d, want 0", r)
+		t.Errorf("1 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 32766
 	y = 0
 	r = x << y
 	if r != 32766 {
-		t.Errorf("32766 << 0 = %d, want 32766", r)
+		t.Errorf("32766 %s 0 = %d, want 32766", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -4 {
-		t.Errorf("32766 << 1 = %d, want -4", r)
+		t.Errorf("32766 %s 1 = %d, want -4", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("32766 << 65535 = %d, want 0", r)
+		t.Errorf("32766 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 32767
 	y = 0
 	r = x << y
 	if r != 32767 {
-		t.Errorf("32767 << 0 = %d, want 32767", r)
+		t.Errorf("32767 %s 0 = %d, want 32767", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("32767 << 1 = %d, want -2", r)
+		t.Errorf("32767 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("32767 << 65535 = %d, want 0", r)
+		t.Errorf("32767 %s 65535 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFoldint16uint16rsh(t *testing.T) {
@@ -10629,113 +10629,113 @@ func TestConstFoldint16uint16rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != -32768 {
-		t.Errorf("-32768 >> 0 = %d, want -32768", r)
+		t.Errorf("-32768 %s 0 = %d, want -32768", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -16384 {
-		t.Errorf("-32768 >> 1 = %d, want -16384", r)
+		t.Errorf("-32768 %s 1 = %d, want -16384", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-32768 >> 65535 = %d, want -1", r)
+		t.Errorf("-32768 %s 65535 = %d, want -1", ">>", r)
 	}
 	x = -32767
 	y = 0
 	r = x >> y
 	if r != -32767 {
-		t.Errorf("-32767 >> 0 = %d, want -32767", r)
+		t.Errorf("-32767 %s 0 = %d, want -32767", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -16384 {
-		t.Errorf("-32767 >> 1 = %d, want -16384", r)
+		t.Errorf("-32767 %s 1 = %d, want -16384", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-32767 >> 65535 = %d, want -1", r)
+		t.Errorf("-32767 %s 65535 = %d, want -1", ">>", r)
 	}
 	x = -1
 	y = 0
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 65535 = %d, want -1", r)
+		t.Errorf("-1 %s 65535 = %d, want -1", ">>", r)
 	}
 	x = 0
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 65535 = %d, want 0", r)
+		t.Errorf("0 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 65535 = %d, want 0", r)
+		t.Errorf("1 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 32766
 	y = 0
 	r = x >> y
 	if r != 32766 {
-		t.Errorf("32766 >> 0 = %d, want 32766", r)
+		t.Errorf("32766 %s 0 = %d, want 32766", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 16383 {
-		t.Errorf("32766 >> 1 = %d, want 16383", r)
+		t.Errorf("32766 %s 1 = %d, want 16383", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("32766 >> 65535 = %d, want 0", r)
+		t.Errorf("32766 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 32767
 	y = 0
 	r = x >> y
 	if r != 32767 {
-		t.Errorf("32767 >> 0 = %d, want 32767", r)
+		t.Errorf("32767 %s 0 = %d, want 32767", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 16383 {
-		t.Errorf("32767 >> 1 = %d, want 16383", r)
+		t.Errorf("32767 %s 1 = %d, want 16383", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("32767 >> 65535 = %d, want 0", r)
+		t.Errorf("32767 %s 65535 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFoldint16uint8lsh(t *testing.T) {
@@ -10745,113 +10745,113 @@ func TestConstFoldint16uint8lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != -32768 {
-		t.Errorf("-32768 << 0 = %d, want -32768", r)
+		t.Errorf("-32768 %s 0 = %d, want -32768", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("-32768 << 1 = %d, want 0", r)
+		t.Errorf("-32768 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("-32768 << 255 = %d, want 0", r)
+		t.Errorf("-32768 %s 255 = %d, want 0", "<<", r)
 	}
 	x = -32767
 	y = 0
 	r = x << y
 	if r != -32767 {
-		t.Errorf("-32767 << 0 = %d, want -32767", r)
+		t.Errorf("-32767 %s 0 = %d, want -32767", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("-32767 << 1 = %d, want 2", r)
+		t.Errorf("-32767 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("-32767 << 255 = %d, want 0", r)
+		t.Errorf("-32767 %s 255 = %d, want 0", "<<", r)
 	}
 	x = -1
 	y = 0
 	r = x << y
 	if r != -1 {
-		t.Errorf("-1 << 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("-1 << 1 = %d, want -2", r)
+		t.Errorf("-1 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("-1 << 255 = %d, want 0", r)
+		t.Errorf("-1 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 0
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 255 = %d, want 0", r)
+		t.Errorf("0 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 255 = %d, want 0", r)
+		t.Errorf("1 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 32766
 	y = 0
 	r = x << y
 	if r != 32766 {
-		t.Errorf("32766 << 0 = %d, want 32766", r)
+		t.Errorf("32766 %s 0 = %d, want 32766", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -4 {
-		t.Errorf("32766 << 1 = %d, want -4", r)
+		t.Errorf("32766 %s 1 = %d, want -4", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("32766 << 255 = %d, want 0", r)
+		t.Errorf("32766 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 32767
 	y = 0
 	r = x << y
 	if r != 32767 {
-		t.Errorf("32767 << 0 = %d, want 32767", r)
+		t.Errorf("32767 %s 0 = %d, want 32767", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("32767 << 1 = %d, want -2", r)
+		t.Errorf("32767 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("32767 << 255 = %d, want 0", r)
+		t.Errorf("32767 %s 255 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFoldint16uint8rsh(t *testing.T) {
@@ -10861,113 +10861,113 @@ func TestConstFoldint16uint8rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != -32768 {
-		t.Errorf("-32768 >> 0 = %d, want -32768", r)
+		t.Errorf("-32768 %s 0 = %d, want -32768", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -16384 {
-		t.Errorf("-32768 >> 1 = %d, want -16384", r)
+		t.Errorf("-32768 %s 1 = %d, want -16384", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-32768 >> 255 = %d, want -1", r)
+		t.Errorf("-32768 %s 255 = %d, want -1", ">>", r)
 	}
 	x = -32767
 	y = 0
 	r = x >> y
 	if r != -32767 {
-		t.Errorf("-32767 >> 0 = %d, want -32767", r)
+		t.Errorf("-32767 %s 0 = %d, want -32767", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -16384 {
-		t.Errorf("-32767 >> 1 = %d, want -16384", r)
+		t.Errorf("-32767 %s 1 = %d, want -16384", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-32767 >> 255 = %d, want -1", r)
+		t.Errorf("-32767 %s 255 = %d, want -1", ">>", r)
 	}
 	x = -1
 	y = 0
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 255 = %d, want -1", r)
+		t.Errorf("-1 %s 255 = %d, want -1", ">>", r)
 	}
 	x = 0
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 255 = %d, want 0", r)
+		t.Errorf("0 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 255 = %d, want 0", r)
+		t.Errorf("1 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 32766
 	y = 0
 	r = x >> y
 	if r != 32766 {
-		t.Errorf("32766 >> 0 = %d, want 32766", r)
+		t.Errorf("32766 %s 0 = %d, want 32766", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 16383 {
-		t.Errorf("32766 >> 1 = %d, want 16383", r)
+		t.Errorf("32766 %s 1 = %d, want 16383", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("32766 >> 255 = %d, want 0", r)
+		t.Errorf("32766 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 32767
 	y = 0
 	r = x >> y
 	if r != 32767 {
-		t.Errorf("32767 >> 0 = %d, want 32767", r)
+		t.Errorf("32767 %s 0 = %d, want 32767", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 16383 {
-		t.Errorf("32767 >> 1 = %d, want 16383", r)
+		t.Errorf("32767 %s 1 = %d, want 16383", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("32767 >> 255 = %d, want 0", r)
+		t.Errorf("32767 %s 255 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFolduint8uint64lsh(t *testing.T) {
@@ -10977,64 +10977,64 @@ func TestConstFolduint8uint64lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 4294967296 = %d, want 0", r)
+		t.Errorf("1 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 255
 	y = 0
 	r = x << y
 	if r != 255 {
-		t.Errorf("255 << 0 = %d, want 255", r)
+		t.Errorf("255 %s 0 = %d, want 255", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 254 {
-		t.Errorf("255 << 1 = %d, want 254", r)
+		t.Errorf("255 %s 1 = %d, want 254", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("255 << 4294967296 = %d, want 0", r)
+		t.Errorf("255 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("255 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("255 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFolduint8uint64rsh(t *testing.T) {
@@ -11044,64 +11044,64 @@ func TestConstFolduint8uint64rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 4294967296 = %d, want 0", r)
+		t.Errorf("1 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 255
 	y = 0
 	r = x >> y
 	if r != 255 {
-		t.Errorf("255 >> 0 = %d, want 255", r)
+		t.Errorf("255 %s 0 = %d, want 255", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 127 {
-		t.Errorf("255 >> 1 = %d, want 127", r)
+		t.Errorf("255 %s 1 = %d, want 127", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("255 >> 4294967296 = %d, want 0", r)
+		t.Errorf("255 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("255 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("255 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFolduint8uint32lsh(t *testing.T) {
@@ -11111,49 +11111,49 @@ func TestConstFolduint8uint32lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 4294967295 = %d, want 0", r)
+		t.Errorf("0 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 4294967295 = %d, want 0", r)
+		t.Errorf("1 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 255
 	y = 0
 	r = x << y
 	if r != 255 {
-		t.Errorf("255 << 0 = %d, want 255", r)
+		t.Errorf("255 %s 0 = %d, want 255", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 254 {
-		t.Errorf("255 << 1 = %d, want 254", r)
+		t.Errorf("255 %s 1 = %d, want 254", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("255 << 4294967295 = %d, want 0", r)
+		t.Errorf("255 %s 4294967295 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFolduint8uint32rsh(t *testing.T) {
@@ -11163,49 +11163,49 @@ func TestConstFolduint8uint32rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 4294967295 = %d, want 0", r)
+		t.Errorf("0 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 4294967295 = %d, want 0", r)
+		t.Errorf("1 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 255
 	y = 0
 	r = x >> y
 	if r != 255 {
-		t.Errorf("255 >> 0 = %d, want 255", r)
+		t.Errorf("255 %s 0 = %d, want 255", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 127 {
-		t.Errorf("255 >> 1 = %d, want 127", r)
+		t.Errorf("255 %s 1 = %d, want 127", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("255 >> 4294967295 = %d, want 0", r)
+		t.Errorf("255 %s 4294967295 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFolduint8uint16lsh(t *testing.T) {
@@ -11215,49 +11215,49 @@ func TestConstFolduint8uint16lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 65535 = %d, want 0", r)
+		t.Errorf("0 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 65535 = %d, want 0", r)
+		t.Errorf("1 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 255
 	y = 0
 	r = x << y
 	if r != 255 {
-		t.Errorf("255 << 0 = %d, want 255", r)
+		t.Errorf("255 %s 0 = %d, want 255", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 254 {
-		t.Errorf("255 << 1 = %d, want 254", r)
+		t.Errorf("255 %s 1 = %d, want 254", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("255 << 65535 = %d, want 0", r)
+		t.Errorf("255 %s 65535 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFolduint8uint16rsh(t *testing.T) {
@@ -11267,49 +11267,49 @@ func TestConstFolduint8uint16rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 65535 = %d, want 0", r)
+		t.Errorf("0 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 65535 = %d, want 0", r)
+		t.Errorf("1 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 255
 	y = 0
 	r = x >> y
 	if r != 255 {
-		t.Errorf("255 >> 0 = %d, want 255", r)
+		t.Errorf("255 %s 0 = %d, want 255", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 127 {
-		t.Errorf("255 >> 1 = %d, want 127", r)
+		t.Errorf("255 %s 1 = %d, want 127", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("255 >> 65535 = %d, want 0", r)
+		t.Errorf("255 %s 65535 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFolduint8uint8lsh(t *testing.T) {
@@ -11319,49 +11319,49 @@ func TestConstFolduint8uint8lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 255 = %d, want 0", r)
+		t.Errorf("0 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 255 = %d, want 0", r)
+		t.Errorf("1 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 255
 	y = 0
 	r = x << y
 	if r != 255 {
-		t.Errorf("255 << 0 = %d, want 255", r)
+		t.Errorf("255 %s 0 = %d, want 255", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 254 {
-		t.Errorf("255 << 1 = %d, want 254", r)
+		t.Errorf("255 %s 1 = %d, want 254", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("255 << 255 = %d, want 0", r)
+		t.Errorf("255 %s 255 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFolduint8uint8rsh(t *testing.T) {
@@ -11371,49 +11371,49 @@ func TestConstFolduint8uint8rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 255 = %d, want 0", r)
+		t.Errorf("0 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 255 = %d, want 0", r)
+		t.Errorf("1 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 255
 	y = 0
 	r = x >> y
 	if r != 255 {
-		t.Errorf("255 >> 0 = %d, want 255", r)
+		t.Errorf("255 %s 0 = %d, want 255", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 127 {
-		t.Errorf("255 >> 1 = %d, want 127", r)
+		t.Errorf("255 %s 1 = %d, want 127", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("255 >> 255 = %d, want 0", r)
+		t.Errorf("255 %s 255 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFoldint8uint64lsh(t *testing.T) {
@@ -11423,148 +11423,148 @@ func TestConstFoldint8uint64lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != -128 {
-		t.Errorf("-128 << 0 = %d, want -128", r)
+		t.Errorf("-128 %s 0 = %d, want -128", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("-128 << 1 = %d, want 0", r)
+		t.Errorf("-128 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("-128 << 4294967296 = %d, want 0", r)
+		t.Errorf("-128 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("-128 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("-128 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = -127
 	y = 0
 	r = x << y
 	if r != -127 {
-		t.Errorf("-127 << 0 = %d, want -127", r)
+		t.Errorf("-127 %s 0 = %d, want -127", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("-127 << 1 = %d, want 2", r)
+		t.Errorf("-127 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("-127 << 4294967296 = %d, want 0", r)
+		t.Errorf("-127 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("-127 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("-127 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = -1
 	y = 0
 	r = x << y
 	if r != -1 {
-		t.Errorf("-1 << 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("-1 << 1 = %d, want -2", r)
+		t.Errorf("-1 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("-1 << 4294967296 = %d, want 0", r)
+		t.Errorf("-1 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("-1 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("-1 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 0
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 4294967296 = %d, want 0", r)
+		t.Errorf("1 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 126
 	y = 0
 	r = x << y
 	if r != 126 {
-		t.Errorf("126 << 0 = %d, want 126", r)
+		t.Errorf("126 %s 0 = %d, want 126", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -4 {
-		t.Errorf("126 << 1 = %d, want -4", r)
+		t.Errorf("126 %s 1 = %d, want -4", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("126 << 4294967296 = %d, want 0", r)
+		t.Errorf("126 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("126 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("126 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 	x = 127
 	y = 0
 	r = x << y
 	if r != 127 {
-		t.Errorf("127 << 0 = %d, want 127", r)
+		t.Errorf("127 %s 0 = %d, want 127", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("127 << 1 = %d, want -2", r)
+		t.Errorf("127 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 4294967296
 	r = x << y
 	if r != 0 {
-		t.Errorf("127 << 4294967296 = %d, want 0", r)
+		t.Errorf("127 %s 4294967296 = %d, want 0", "<<", r)
 	}
 	y = 18446744073709551615
 	r = x << y
 	if r != 0 {
-		t.Errorf("127 << 18446744073709551615 = %d, want 0", r)
+		t.Errorf("127 %s 18446744073709551615 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFoldint8uint64rsh(t *testing.T) {
@@ -11574,148 +11574,148 @@ func TestConstFoldint8uint64rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != -128 {
-		t.Errorf("-128 >> 0 = %d, want -128", r)
+		t.Errorf("-128 %s 0 = %d, want -128", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -64 {
-		t.Errorf("-128 >> 1 = %d, want -64", r)
+		t.Errorf("-128 %s 1 = %d, want -64", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-128 >> 4294967296 = %d, want -1", r)
+		t.Errorf("-128 %s 4294967296 = %d, want -1", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-128 >> 18446744073709551615 = %d, want -1", r)
+		t.Errorf("-128 %s 18446744073709551615 = %d, want -1", ">>", r)
 	}
 	x = -127
 	y = 0
 	r = x >> y
 	if r != -127 {
-		t.Errorf("-127 >> 0 = %d, want -127", r)
+		t.Errorf("-127 %s 0 = %d, want -127", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -64 {
-		t.Errorf("-127 >> 1 = %d, want -64", r)
+		t.Errorf("-127 %s 1 = %d, want -64", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-127 >> 4294967296 = %d, want -1", r)
+		t.Errorf("-127 %s 4294967296 = %d, want -1", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-127 >> 18446744073709551615 = %d, want -1", r)
+		t.Errorf("-127 %s 18446744073709551615 = %d, want -1", ">>", r)
 	}
 	x = -1
 	y = 0
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 4294967296 = %d, want -1", r)
+		t.Errorf("-1 %s 4294967296 = %d, want -1", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 18446744073709551615 = %d, want -1", r)
+		t.Errorf("-1 %s 18446744073709551615 = %d, want -1", ">>", r)
 	}
 	x = 0
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 4294967296 = %d, want 0", r)
+		t.Errorf("0 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("0 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 4294967296 = %d, want 0", r)
+		t.Errorf("1 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("1 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 126
 	y = 0
 	r = x >> y
 	if r != 126 {
-		t.Errorf("126 >> 0 = %d, want 126", r)
+		t.Errorf("126 %s 0 = %d, want 126", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 63 {
-		t.Errorf("126 >> 1 = %d, want 63", r)
+		t.Errorf("126 %s 1 = %d, want 63", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("126 >> 4294967296 = %d, want 0", r)
+		t.Errorf("126 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("126 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("126 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 	x = 127
 	y = 0
 	r = x >> y
 	if r != 127 {
-		t.Errorf("127 >> 0 = %d, want 127", r)
+		t.Errorf("127 %s 0 = %d, want 127", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 63 {
-		t.Errorf("127 >> 1 = %d, want 63", r)
+		t.Errorf("127 %s 1 = %d, want 63", ">>", r)
 	}
 	y = 4294967296
 	r = x >> y
 	if r != 0 {
-		t.Errorf("127 >> 4294967296 = %d, want 0", r)
+		t.Errorf("127 %s 4294967296 = %d, want 0", ">>", r)
 	}
 	y = 18446744073709551615
 	r = x >> y
 	if r != 0 {
-		t.Errorf("127 >> 18446744073709551615 = %d, want 0", r)
+		t.Errorf("127 %s 18446744073709551615 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFoldint8uint32lsh(t *testing.T) {
@@ -11725,113 +11725,113 @@ func TestConstFoldint8uint32lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != -128 {
-		t.Errorf("-128 << 0 = %d, want -128", r)
+		t.Errorf("-128 %s 0 = %d, want -128", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("-128 << 1 = %d, want 0", r)
+		t.Errorf("-128 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("-128 << 4294967295 = %d, want 0", r)
+		t.Errorf("-128 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = -127
 	y = 0
 	r = x << y
 	if r != -127 {
-		t.Errorf("-127 << 0 = %d, want -127", r)
+		t.Errorf("-127 %s 0 = %d, want -127", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("-127 << 1 = %d, want 2", r)
+		t.Errorf("-127 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("-127 << 4294967295 = %d, want 0", r)
+		t.Errorf("-127 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = -1
 	y = 0
 	r = x << y
 	if r != -1 {
-		t.Errorf("-1 << 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("-1 << 1 = %d, want -2", r)
+		t.Errorf("-1 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("-1 << 4294967295 = %d, want 0", r)
+		t.Errorf("-1 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 0
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 4294967295 = %d, want 0", r)
+		t.Errorf("0 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 4294967295 = %d, want 0", r)
+		t.Errorf("1 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 126
 	y = 0
 	r = x << y
 	if r != 126 {
-		t.Errorf("126 << 0 = %d, want 126", r)
+		t.Errorf("126 %s 0 = %d, want 126", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -4 {
-		t.Errorf("126 << 1 = %d, want -4", r)
+		t.Errorf("126 %s 1 = %d, want -4", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("126 << 4294967295 = %d, want 0", r)
+		t.Errorf("126 %s 4294967295 = %d, want 0", "<<", r)
 	}
 	x = 127
 	y = 0
 	r = x << y
 	if r != 127 {
-		t.Errorf("127 << 0 = %d, want 127", r)
+		t.Errorf("127 %s 0 = %d, want 127", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("127 << 1 = %d, want -2", r)
+		t.Errorf("127 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 4294967295
 	r = x << y
 	if r != 0 {
-		t.Errorf("127 << 4294967295 = %d, want 0", r)
+		t.Errorf("127 %s 4294967295 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFoldint8uint32rsh(t *testing.T) {
@@ -11841,113 +11841,113 @@ func TestConstFoldint8uint32rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != -128 {
-		t.Errorf("-128 >> 0 = %d, want -128", r)
+		t.Errorf("-128 %s 0 = %d, want -128", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -64 {
-		t.Errorf("-128 >> 1 = %d, want -64", r)
+		t.Errorf("-128 %s 1 = %d, want -64", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-128 >> 4294967295 = %d, want -1", r)
+		t.Errorf("-128 %s 4294967295 = %d, want -1", ">>", r)
 	}
 	x = -127
 	y = 0
 	r = x >> y
 	if r != -127 {
-		t.Errorf("-127 >> 0 = %d, want -127", r)
+		t.Errorf("-127 %s 0 = %d, want -127", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -64 {
-		t.Errorf("-127 >> 1 = %d, want -64", r)
+		t.Errorf("-127 %s 1 = %d, want -64", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-127 >> 4294967295 = %d, want -1", r)
+		t.Errorf("-127 %s 4294967295 = %d, want -1", ">>", r)
 	}
 	x = -1
 	y = 0
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 4294967295 = %d, want -1", r)
+		t.Errorf("-1 %s 4294967295 = %d, want -1", ">>", r)
 	}
 	x = 0
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 4294967295 = %d, want 0", r)
+		t.Errorf("0 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 4294967295 = %d, want 0", r)
+		t.Errorf("1 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 126
 	y = 0
 	r = x >> y
 	if r != 126 {
-		t.Errorf("126 >> 0 = %d, want 126", r)
+		t.Errorf("126 %s 0 = %d, want 126", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 63 {
-		t.Errorf("126 >> 1 = %d, want 63", r)
+		t.Errorf("126 %s 1 = %d, want 63", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("126 >> 4294967295 = %d, want 0", r)
+		t.Errorf("126 %s 4294967295 = %d, want 0", ">>", r)
 	}
 	x = 127
 	y = 0
 	r = x >> y
 	if r != 127 {
-		t.Errorf("127 >> 0 = %d, want 127", r)
+		t.Errorf("127 %s 0 = %d, want 127", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 63 {
-		t.Errorf("127 >> 1 = %d, want 63", r)
+		t.Errorf("127 %s 1 = %d, want 63", ">>", r)
 	}
 	y = 4294967295
 	r = x >> y
 	if r != 0 {
-		t.Errorf("127 >> 4294967295 = %d, want 0", r)
+		t.Errorf("127 %s 4294967295 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFoldint8uint16lsh(t *testing.T) {
@@ -11957,113 +11957,113 @@ func TestConstFoldint8uint16lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != -128 {
-		t.Errorf("-128 << 0 = %d, want -128", r)
+		t.Errorf("-128 %s 0 = %d, want -128", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("-128 << 1 = %d, want 0", r)
+		t.Errorf("-128 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("-128 << 65535 = %d, want 0", r)
+		t.Errorf("-128 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = -127
 	y = 0
 	r = x << y
 	if r != -127 {
-		t.Errorf("-127 << 0 = %d, want -127", r)
+		t.Errorf("-127 %s 0 = %d, want -127", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("-127 << 1 = %d, want 2", r)
+		t.Errorf("-127 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("-127 << 65535 = %d, want 0", r)
+		t.Errorf("-127 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = -1
 	y = 0
 	r = x << y
 	if r != -1 {
-		t.Errorf("-1 << 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("-1 << 1 = %d, want -2", r)
+		t.Errorf("-1 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("-1 << 65535 = %d, want 0", r)
+		t.Errorf("-1 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 0
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 65535 = %d, want 0", r)
+		t.Errorf("0 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 65535 = %d, want 0", r)
+		t.Errorf("1 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 126
 	y = 0
 	r = x << y
 	if r != 126 {
-		t.Errorf("126 << 0 = %d, want 126", r)
+		t.Errorf("126 %s 0 = %d, want 126", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -4 {
-		t.Errorf("126 << 1 = %d, want -4", r)
+		t.Errorf("126 %s 1 = %d, want -4", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("126 << 65535 = %d, want 0", r)
+		t.Errorf("126 %s 65535 = %d, want 0", "<<", r)
 	}
 	x = 127
 	y = 0
 	r = x << y
 	if r != 127 {
-		t.Errorf("127 << 0 = %d, want 127", r)
+		t.Errorf("127 %s 0 = %d, want 127", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("127 << 1 = %d, want -2", r)
+		t.Errorf("127 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 65535
 	r = x << y
 	if r != 0 {
-		t.Errorf("127 << 65535 = %d, want 0", r)
+		t.Errorf("127 %s 65535 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFoldint8uint16rsh(t *testing.T) {
@@ -12073,113 +12073,113 @@ func TestConstFoldint8uint16rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != -128 {
-		t.Errorf("-128 >> 0 = %d, want -128", r)
+		t.Errorf("-128 %s 0 = %d, want -128", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -64 {
-		t.Errorf("-128 >> 1 = %d, want -64", r)
+		t.Errorf("-128 %s 1 = %d, want -64", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-128 >> 65535 = %d, want -1", r)
+		t.Errorf("-128 %s 65535 = %d, want -1", ">>", r)
 	}
 	x = -127
 	y = 0
 	r = x >> y
 	if r != -127 {
-		t.Errorf("-127 >> 0 = %d, want -127", r)
+		t.Errorf("-127 %s 0 = %d, want -127", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -64 {
-		t.Errorf("-127 >> 1 = %d, want -64", r)
+		t.Errorf("-127 %s 1 = %d, want -64", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-127 >> 65535 = %d, want -1", r)
+		t.Errorf("-127 %s 65535 = %d, want -1", ">>", r)
 	}
 	x = -1
 	y = 0
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 65535 = %d, want -1", r)
+		t.Errorf("-1 %s 65535 = %d, want -1", ">>", r)
 	}
 	x = 0
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 65535 = %d, want 0", r)
+		t.Errorf("0 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 65535 = %d, want 0", r)
+		t.Errorf("1 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 126
 	y = 0
 	r = x >> y
 	if r != 126 {
-		t.Errorf("126 >> 0 = %d, want 126", r)
+		t.Errorf("126 %s 0 = %d, want 126", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 63 {
-		t.Errorf("126 >> 1 = %d, want 63", r)
+		t.Errorf("126 %s 1 = %d, want 63", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("126 >> 65535 = %d, want 0", r)
+		t.Errorf("126 %s 65535 = %d, want 0", ">>", r)
 	}
 	x = 127
 	y = 0
 	r = x >> y
 	if r != 127 {
-		t.Errorf("127 >> 0 = %d, want 127", r)
+		t.Errorf("127 %s 0 = %d, want 127", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 63 {
-		t.Errorf("127 >> 1 = %d, want 63", r)
+		t.Errorf("127 %s 1 = %d, want 63", ">>", r)
 	}
 	y = 65535
 	r = x >> y
 	if r != 0 {
-		t.Errorf("127 >> 65535 = %d, want 0", r)
+		t.Errorf("127 %s 65535 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFoldint8uint8lsh(t *testing.T) {
@@ -12189,113 +12189,113 @@ func TestConstFoldint8uint8lsh(t *testing.T) {
 	y = 0
 	r = x << y
 	if r != -128 {
-		t.Errorf("-128 << 0 = %d, want -128", r)
+		t.Errorf("-128 %s 0 = %d, want -128", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("-128 << 1 = %d, want 0", r)
+		t.Errorf("-128 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("-128 << 255 = %d, want 0", r)
+		t.Errorf("-128 %s 255 = %d, want 0", "<<", r)
 	}
 	x = -127
 	y = 0
 	r = x << y
 	if r != -127 {
-		t.Errorf("-127 << 0 = %d, want -127", r)
+		t.Errorf("-127 %s 0 = %d, want -127", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("-127 << 1 = %d, want 2", r)
+		t.Errorf("-127 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("-127 << 255 = %d, want 0", r)
+		t.Errorf("-127 %s 255 = %d, want 0", "<<", r)
 	}
 	x = -1
 	y = 0
 	r = x << y
 	if r != -1 {
-		t.Errorf("-1 << 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("-1 << 1 = %d, want -2", r)
+		t.Errorf("-1 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("-1 << 255 = %d, want 0", r)
+		t.Errorf("-1 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 0
 	y = 0
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("0 << 255 = %d, want 0", r)
+		t.Errorf("0 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 1
 	y = 0
 	r = x << y
 	if r != 1 {
-		t.Errorf("1 << 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != 2 {
-		t.Errorf("1 << 1 = %d, want 2", r)
+		t.Errorf("1 %s 1 = %d, want 2", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("1 << 255 = %d, want 0", r)
+		t.Errorf("1 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 126
 	y = 0
 	r = x << y
 	if r != 126 {
-		t.Errorf("126 << 0 = %d, want 126", r)
+		t.Errorf("126 %s 0 = %d, want 126", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -4 {
-		t.Errorf("126 << 1 = %d, want -4", r)
+		t.Errorf("126 %s 1 = %d, want -4", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("126 << 255 = %d, want 0", r)
+		t.Errorf("126 %s 255 = %d, want 0", "<<", r)
 	}
 	x = 127
 	y = 0
 	r = x << y
 	if r != 127 {
-		t.Errorf("127 << 0 = %d, want 127", r)
+		t.Errorf("127 %s 0 = %d, want 127", "<<", r)
 	}
 	y = 1
 	r = x << y
 	if r != -2 {
-		t.Errorf("127 << 1 = %d, want -2", r)
+		t.Errorf("127 %s 1 = %d, want -2", "<<", r)
 	}
 	y = 255
 	r = x << y
 	if r != 0 {
-		t.Errorf("127 << 255 = %d, want 0", r)
+		t.Errorf("127 %s 255 = %d, want 0", "<<", r)
 	}
 }
 func TestConstFoldint8uint8rsh(t *testing.T) {
@@ -12305,113 +12305,113 @@ func TestConstFoldint8uint8rsh(t *testing.T) {
 	y = 0
 	r = x >> y
 	if r != -128 {
-		t.Errorf("-128 >> 0 = %d, want -128", r)
+		t.Errorf("-128 %s 0 = %d, want -128", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -64 {
-		t.Errorf("-128 >> 1 = %d, want -64", r)
+		t.Errorf("-128 %s 1 = %d, want -64", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-128 >> 255 = %d, want -1", r)
+		t.Errorf("-128 %s 255 = %d, want -1", ">>", r)
 	}
 	x = -127
 	y = 0
 	r = x >> y
 	if r != -127 {
-		t.Errorf("-127 >> 0 = %d, want -127", r)
+		t.Errorf("-127 %s 0 = %d, want -127", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -64 {
-		t.Errorf("-127 >> 1 = %d, want -64", r)
+		t.Errorf("-127 %s 1 = %d, want -64", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-127 >> 255 = %d, want -1", r)
+		t.Errorf("-127 %s 255 = %d, want -1", ">>", r)
 	}
 	x = -1
 	y = 0
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 0 = %d, want -1", r)
+		t.Errorf("-1 %s 0 = %d, want -1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 1 = %d, want -1", r)
+		t.Errorf("-1 %s 1 = %d, want -1", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != -1 {
-		t.Errorf("-1 >> 255 = %d, want -1", r)
+		t.Errorf("-1 %s 255 = %d, want -1", ">>", r)
 	}
 	x = 0
 	y = 0
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 0 = %d, want 0", r)
+		t.Errorf("0 %s 0 = %d, want 0", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 1 = %d, want 0", r)
+		t.Errorf("0 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("0 >> 255 = %d, want 0", r)
+		t.Errorf("0 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 1
 	y = 0
 	r = x >> y
 	if r != 1 {
-		t.Errorf("1 >> 0 = %d, want 1", r)
+		t.Errorf("1 %s 0 = %d, want 1", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 1 = %d, want 0", r)
+		t.Errorf("1 %s 1 = %d, want 0", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("1 >> 255 = %d, want 0", r)
+		t.Errorf("1 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 126
 	y = 0
 	r = x >> y
 	if r != 126 {
-		t.Errorf("126 >> 0 = %d, want 126", r)
+		t.Errorf("126 %s 0 = %d, want 126", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 63 {
-		t.Errorf("126 >> 1 = %d, want 63", r)
+		t.Errorf("126 %s 1 = %d, want 63", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("126 >> 255 = %d, want 0", r)
+		t.Errorf("126 %s 255 = %d, want 0", ">>", r)
 	}
 	x = 127
 	y = 0
 	r = x >> y
 	if r != 127 {
-		t.Errorf("127 >> 0 = %d, want 127", r)
+		t.Errorf("127 %s 0 = %d, want 127", ">>", r)
 	}
 	y = 1
 	r = x >> y
 	if r != 63 {
-		t.Errorf("127 >> 1 = %d, want 63", r)
+		t.Errorf("127 %s 1 = %d, want 63", ">>", r)
 	}
 	y = 255
 	r = x >> y
 	if r != 0 {
-		t.Errorf("127 >> 255 = %d, want 0", r)
+		t.Errorf("127 %s 255 = %d, want 0", ">>", r)
 	}
 }
 func TestConstFoldCompareuint64(t *testing.T) {
diff --git a/src/cmd/compile/internal/gc/testdata/gen/constFoldGen.go b/src/cmd/compile/internal/gc/testdata/gen/constFoldGen.go
index 28cdcc339b..f266749ce9 100644
--- a/src/cmd/compile/internal/gc/testdata/gen/constFoldGen.go
+++ b/src/cmd/compile/internal/gc/testdata/gen/constFoldGen.go
@@ -144,7 +144,7 @@ func main() {
 					fmt.Fprintf(w, "\tr = x %s y\n", o.symbol)
 					want := ansU(c, d, s.name, o.symbol)
 					fmt.Fprintf(w, "\tif r != %s {\n", want)
-					fmt.Fprintf(w, "\t\tt.Errorf(\"%d %s %d = %%d, want %s\", r)\n", c, o.symbol, d, want)
+					fmt.Fprintf(w, "\t\tt.Errorf(\"%d %%s %d = %%d, want %s\", %q, r)\n", c, d, want, o.symbol)
 					fmt.Fprintf(w, "\t}\n")
 				}
 			}
@@ -159,7 +159,7 @@ func main() {
 					fmt.Fprintf(w, "\tr = x %s y\n", o.symbol)
 					want := ansS(c, d, s.name, o.symbol)
 					fmt.Fprintf(w, "\tif r != %s {\n", want)
-					fmt.Fprintf(w, "\t\tt.Errorf(\"%d %s %d = %%d, want %s\", r)\n", c, o.symbol, d, want)
+					fmt.Fprintf(w, "\t\tt.Errorf(\"%d %%s %d = %%d, want %s\", %q, r)\n", c, d, want, o.symbol)
 					fmt.Fprintf(w, "\t}\n")
 				}
 			}
@@ -188,7 +188,7 @@ func main() {
 						fmt.Fprintf(w, "\tr = x %s y\n", o.symbol)
 						want := ansU(c, d, ls.name, o.symbol)
 						fmt.Fprintf(w, "\tif r != %s {\n", want)
-						fmt.Fprintf(w, "\t\tt.Errorf(\"%d %s %d = %%d, want %s\", r)\n", c, o.symbol, d, want)
+						fmt.Fprintf(w, "\t\tt.Errorf(\"%d %%s %d = %%d, want %s\", %q, r)\n", c, d, want, o.symbol)
 						fmt.Fprintf(w, "\t}\n")
 					}
 				}
@@ -200,7 +200,7 @@ func main() {
 						fmt.Fprintf(w, "\tr = x %s y\n", o.symbol)
 						want := ansS(c, int64(d), ls.name, o.symbol)
 						fmt.Fprintf(w, "\tif r != %s {\n", want)
-						fmt.Fprintf(w, "\t\tt.Errorf(\"%d %s %d = %%d, want %s\", r)\n", c, o.symbol, d, want)
+						fmt.Fprintf(w, "\t\tt.Errorf(\"%d %%s %d = %%d, want %s\", %q, r)\n", c, d, want, o.symbol)
 						fmt.Fprintf(w, "\t}\n")
 					}
 				}