diff options
author | Cherry Mui <cherryyz@google.com> | 2024-05-06 20:16:53 +0000 |
---|---|---|
committer | Cherry Mui <cherryyz@google.com> | 2024-05-06 21:02:33 +0000 |
commit | 947e43e3711948aa3f4d2bbb55ae51ccf54e7638 (patch) | |
tree | 2fe30847e1b7e44673a12a9315e369125770aa9f | |
parent | 9d2e28501c7dea1c0ddde00ac683105d0bfe9f63 (diff) | |
download | go-947e43e3711948aa3f4d2bbb55ae51ccf54e7638.tar.gz go-947e43e3711948aa3f4d2bbb55ae51ccf54e7638.zip |
[release-branch.go1.22] Revert "cmd/compile: don't combine loads in generated equality functions"
This reverts CL 583417.
Reason for revert: release branch is currently frozen.
Change-Id: Ia6223911e0e124f14509c4bf978d7e37688e3d4c
Reviewed-on: https://go-review.googlesource.com/c/go/+/582960
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
-rw-r--r-- | src/cmd/compile/internal/compare/compare.go | 7 | ||||
-rw-r--r-- | test/fixedbugs/issue67160.go | 32 |
2 files changed, 1 insertions, 38 deletions
diff --git a/src/cmd/compile/internal/compare/compare.go b/src/cmd/compile/internal/compare/compare.go index cb2f84ef55..e165cd67db 100644 --- a/src/cmd/compile/internal/compare/compare.go +++ b/src/cmd/compile/internal/compare/compare.go @@ -148,7 +148,7 @@ func calculateCostForType(t *types.Type) int64 { return EqStructCost(t) case types.TSLICE: // Slices are not comparable. - base.Fatalf("calculateCostForType: unexpected slice type") + base.Fatalf("eqStructFieldCost: unexpected slice type") case types.TARRAY: elemCost := calculateCostForType(t.Elem()) cost = t.NumElem() * elemCost @@ -371,11 +371,6 @@ func eqmem(p, q ir.Node, field int, size int64) ir.Node { } func eqmemfunc(size int64, t *types.Type) (fn *ir.Name, needsize bool) { - if !base.Ctxt.Arch.CanMergeLoads && t.Alignment() < int64(base.Ctxt.Arch.Alignment) && t.Alignment() < t.Size() { - // We can't use larger comparisons if the value might not be aligned - // enough for the larger comparison. See issues 46283 and 67160. - size = 0 - } switch size { case 1, 2, 4, 8, 16: buf := fmt.Sprintf("memequal%d", int(size)*8) diff --git a/test/fixedbugs/issue67160.go b/test/fixedbugs/issue67160.go deleted file mode 100644 index be45a61420..0000000000 --- a/test/fixedbugs/issue67160.go +++ /dev/null @@ -1,32 +0,0 @@ -// run - -// Copyright 2024 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Test to make sure that we don't try using larger loads for -// generated equality functions on architectures that can't do -// unaligned loads. - -package main - -// T has a big field that wants to be compared with larger loads/stores. -// T is "special" because of the unnamed field, so it needs a generated equality function. -// T is an odd number of bytes in size and has alignment 1. -type T struct { - src [8]byte - _ byte -} - -// U contains 8 copies of T, each at a different %8 alignment. -type U [8]T - -//go:noinline -func f(x, y *U) bool { - return *x == *y -} - -func main() { - var a U - _ = f(&a, &a) -} |