aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/compile/internal/types2/universe.go
diff options
context:
space:
mode:
authorRob Findley <rfindley@google.com>2021-07-23 10:00:10 -0400
committerRobert Findley <rfindley@google.com>2021-07-24 01:54:15 +0000
commit9f928f9318efb9e6a9d45e7ed959afaaee4b7315 (patch)
tree6c6d416469abab2da3bdf6f9ac030cfa17a7eb7a /src/cmd/compile/internal/types2/universe.go
parent6992dcdad9b94a2b33b957474ef0eb210d563a40 (diff)
downloadgo-9f928f9318efb9e6a9d45e7ed959afaaee4b7315.tar.gz
go-9f928f9318efb9e6a9d45e7ed959afaaee4b7315.zip
[dev.typeparams] go/types, types2: set tset when constructing interfaces in the universe
As of CL 334894, type sets are lazily evaluated on interfaces. For the universe interfaces error and comparable, this can lead to data races when type checking concurrently. Fix this by computing their type set when they are defined. Tested using the repro from #47345. I considered checking this in as a test, but it probably wouldn't add much value going forward. Fixes #47345 Change-Id: I014a511b8e3c092c86201a8bfc7f5f494f8f20e8 Reviewed-on: https://go-review.googlesource.com/c/go/+/336910 Trust: Robert Findley <rfindley@google.com> Run-TryBot: Robert Findley <rfindley@google.com> Reviewed-by: Robert Griesemer <gri@golang.org>
Diffstat (limited to 'src/cmd/compile/internal/types2/universe.go')
-rw-r--r--src/cmd/compile/internal/types2/universe.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/cmd/compile/internal/types2/universe.go b/src/cmd/compile/internal/types2/universe.go
index e2dd0df69e..0f711a6b68 100644
--- a/src/cmd/compile/internal/types2/universe.go
+++ b/src/cmd/compile/internal/types2/universe.go
@@ -88,7 +88,9 @@ func defPredeclaredTypes() {
res := NewVar(nopos, nil, "", Typ[String])
sig := NewSignature(nil, nil, NewTuple(res), false)
err := NewFunc(nopos, nil, "Error", sig)
- typ := NewNamed(obj, NewInterfaceType([]*Func{err}, nil), nil)
+ ityp := NewInterfaceType([]*Func{err}, nil)
+ computeTypeSet(nil, nopos, ityp) // prevent races due to lazy computation of tset
+ typ := NewNamed(obj, ityp, nil)
sig.recv = NewVar(nopos, nil, "", typ)
def(obj)
}
@@ -99,7 +101,9 @@ func defPredeclaredTypes() {
obj.setColor(black)
sig := NewSignature(nil, nil, nil, false)
eql := NewFunc(nopos, nil, "==", sig)
- typ := NewNamed(obj, NewInterfaceType([]*Func{eql}, nil), nil)
+ ityp := NewInterfaceType([]*Func{eql}, nil)
+ computeTypeSet(nil, nopos, ityp) // prevent races due to lazy computation of tset
+ typ := NewNamed(obj, ityp, nil)
sig.recv = NewVar(nopos, nil, "", typ)
def(obj)
}