summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Dempsky <mdempsky@google.com>2023-04-12 12:41:45 -0700
committerGopher Robot <gobot@golang.org>2023-04-24 14:06:53 +0000
commitee42d468f50e863f240a8b11e521feaf7f9114c9 (patch)
tree5c73e0d0aee5f5aa54714b16a4b5cd4f07787176
parent446493f5b8dc1c1425862153bf39643a99b10bec (diff)
downloadgo-git-ee42d468f50e863f240a8b11e521feaf7f9114c9.tar.gz
[release-branch.go1.20] cmd/compile: fix reproducible build of aliased generic types
Due to a missing "&& !alias" check, the unified linker was treating type aliases the same as defined types for the purpose of exporting method bodies. The methods will get exported anyway alongside the aliased type, so this mistake is normally harmless. However, if multiple type aliases instantiated the same generic type but with different type arguments, this could result in the same (generic) method body being exported multiple times under different symbol names. Further, because bodies aren't expected to be exported multiple times, we were sorting them simply based on index. And consequently, the sort wasn't total and is sensitive to the map iteration order used while ranging over linker.bodies. The fix is simply to add the missing "&& !alias" check, so that we don't end up with duplicate bodies in the first place. Thanks rsc@ for providing a minimal repro case. Fixes #59585. Change-Id: Iaa55968cc7110b601e2f0f9b620901c2d55f7014 Reviewed-on: https://go-review.googlesource.com/c/go/+/484155 Reviewed-by: Keith Randall <khr@google.com> Auto-Submit: Matthew Dempsky <mdempsky@google.com> TryBot-Result: Gopher Robot <gobot@golang.org> Run-TryBot: Matthew Dempsky <mdempsky@google.com> Reviewed-by: Keith Randall <khr@golang.org> Reviewed-by: Russ Cox <rsc@golang.org> (cherry picked from commit f58c6cccc44752146aabcd50a30865e34817a4b4) Reviewed-on: https://go-review.googlesource.com/c/go/+/484160 Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org> Auto-Submit: Dmitri Shuralyov <dmitshur@google.com>
-rw-r--r--src/cmd/compile/internal/noder/linker.go2
-rw-r--r--src/cmd/go/testdata/script/build_issue59571.txt40
2 files changed, 41 insertions, 1 deletions
diff --git a/src/cmd/compile/internal/noder/linker.go b/src/cmd/compile/internal/noder/linker.go
index 0f39fdec05..5d0459d412 100644
--- a/src/cmd/compile/internal/noder/linker.go
+++ b/src/cmd/compile/internal/noder/linker.go
@@ -198,7 +198,7 @@ func (l *linker) relocObj(pr *pkgReader, idx pkgbits.Index) pkgbits.Index {
l.exportBody(obj, local)
}
- if obj.Op() == ir.OTYPE {
+ if obj.Op() == ir.OTYPE && !obj.Alias() {
if typ := obj.Type(); !typ.IsInterface() {
for _, method := range typ.Methods().Slice() {
l.exportBody(method.Nname.(*ir.Name), local)
diff --git a/src/cmd/go/testdata/script/build_issue59571.txt b/src/cmd/go/testdata/script/build_issue59571.txt
new file mode 100644
index 0000000000..2cf32594bf
--- /dev/null
+++ b/src/cmd/go/testdata/script/build_issue59571.txt
@@ -0,0 +1,40 @@
+# Regression test for https://go.dev/issue/59571
+# Build should be reproducible, even with aliased generic types.
+
+go build -a -o 1.a
+go build -a -o 2.a
+cmp -q 1.a 2.a
+
+-- go.mod --
+module m
+
+go 1.20
+-- m.go --
+package m
+
+type (
+ SliceFlag[T any] struct{}
+
+ Alias1 = SliceFlag[[1]int]
+ Alias2 = SliceFlag[[2]int]
+ Alias3 = SliceFlag[[3]int]
+ Alias4 = SliceFlag[[4]int]
+ Alias5 = SliceFlag[[5]int]
+ Alias6 = SliceFlag[[6]int]
+ Alias7 = SliceFlag[[7]int]
+ Alias8 = SliceFlag[[8]int]
+ Alias9 = SliceFlag[[9]int]
+ Alias10 = SliceFlag[[10]int]
+ Alias11 = SliceFlag[[11]int]
+ Alias12 = SliceFlag[[12]int]
+ Alias13 = SliceFlag[[13]int]
+ Alias14 = SliceFlag[[14]int]
+ Alias15 = SliceFlag[[15]int]
+ Alias16 = SliceFlag[[16]int]
+ Alias17 = SliceFlag[[17]int]
+ Alias18 = SliceFlag[[18]int]
+ Alias19 = SliceFlag[[19]int]
+ Alias20 = SliceFlag[[20]int]
+)
+
+func (x *SliceFlag[T]) String() string { return "zzz" }