diff options
author | Dan Scales <danscales@google.com> | 2021-08-07 22:26:46 -0700 |
---|---|---|
committer | Dan Scales <danscales@google.com> | 2021-08-09 20:08:06 +0000 |
commit | f5f79c47f900300e8ac962e73ae7c2c706489d67 (patch) | |
tree | d230a1539fcfb224956b4b9dc17b6f94171cef87 /src/cmd/compile/internal/types/type.go | |
parent | 9f4d6a83594a04f0fc82c33f373b7e7bcf64f7f2 (diff) | |
download | go-f5f79c47f900300e8ac962e73ae7c2c706489d67.tar.gz go-f5f79c47f900300e8ac962e73ae7c2c706489d67.zip |
[dev.typeparams] cmd/compile: use types2.Constraint() rather than types2.Bound()
types2.Constraint() returns the top-level constraint type, including any
unions or other interface elements. Because of that, we needed to
add/fix some code in the type substituter and generic type instantiater
in the importer to deal with unions and non-method members of an
interface. Also, NewUnion was not correctly setting the HasTParam flag.
I also added a better error message when a symbol is not found in
(*deadcodePass).decodeIfaceMethod().
Change-Id: Id3668dc596dce63690fa05a9e5e42295b5e2bbb5
Reviewed-on: https://go-review.googlesource.com/c/go/+/340670
Trust: Dan Scales <danscales@google.com>
Run-TryBot: Dan Scales <danscales@google.com>
Reviewed-by: Keith Randall <khr@golang.org>
Diffstat (limited to 'src/cmd/compile/internal/types/type.go')
-rw-r--r-- | src/cmd/compile/internal/types/type.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/cmd/compile/internal/types/type.go b/src/cmd/compile/internal/types/type.go index 099080f48f..875b0ba82f 100644 --- a/src/cmd/compile/internal/types/type.go +++ b/src/cmd/compile/internal/types/type.go @@ -1912,6 +1912,15 @@ func NewUnion(terms []*Type, tildes []bool) *Type { } t.Extra.(*Union).terms = terms t.Extra.(*Union).tildes = tildes + nt := len(terms) + for i := 0; i < nt; i++ { + if terms[i].HasTParam() { + t.SetHasTParam(true) + } + if terms[i].HasShape() { + t.SetHasShape(true) + } + } return t } |