Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[dev.typeparams] cmd/compile/internal/types2: resolve decl cycle the same way as in go/types

Browse source 
Minor adjustment to match go/types more closely.

Change-Id: Id79c51f0ecd8cda0f5b68f6e961500f7f22f7115
Reviewed-on: https://go-review.googlesource.com/c/go/+/294270
Reviewed-by: Robert Findley <rfindley@google.com>
Trust: Robert Griesemer <gri@golang.org>
This commit is contained in:
Robert Griesemer 2021-02-19 09:39:01 -08:00
parent dfe0ef961b
commit 6521c7b378
2 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/cmd/compile/internal/types2/expr.go
View file

@ -59,12 +59,17 @@ the type (and constant value, if any) is recorded via Info.Types, if present.
type opPredicates map[syntax.Operator]func(Type) bool type opPredicates map[syntax.Operator]func(Type) bool
var unaryOpPredicates = opPredicates{ var unaryOpPredicates opPredicates
func init() {
// Setting unaryOpPredicates in init avoids declaration cycles.
unaryOpPredicates = opPredicates{
syntax.Add: isNumeric, syntax.Add: isNumeric,
syntax.Sub: isNumeric, syntax.Sub: isNumeric,
syntax.Xor: isInteger, syntax.Xor: isInteger,
syntax.Not: isBoolean, syntax.Not: isBoolean,
} }
}
func (check *Checker) op(m opPredicates, x *operand, op syntax.Operator) bool { func (check *Checker) op(m opPredicates, x *operand, op syntax.Operator) bool {
if pred := m[op]; pred != nil { if pred := m[op]; pred != nil {
@ -896,7 +901,11 @@ func (check *Checker) shift(x, y *operand, e syntax.Expr, op syntax.Operator) {
x.mode = value x.mode = value
} }
var binaryOpPredicates = opPredicates{ var binaryOpPredicates opPredicates
func init() {
// Setting binaryOpPredicates in init avoids declaration cycles.
binaryOpPredicates = opPredicates{
syntax.Add: isNumericOrString, syntax.Add: isNumericOrString,
syntax.Sub: isNumeric, syntax.Sub: isNumeric,
syntax.Mul: isNumeric, syntax.Mul: isNumeric,
@ -911,6 +920,7 @@ var binaryOpPredicates = opPredicates{
syntax.AndAnd: isBoolean, syntax.AndAnd: isBoolean,
syntax.OrOr: isBoolean, syntax.OrOr: isBoolean,
} }
}
// If e != nil, it must be the binary expression; it may be nil for non-constant expressions // If e != nil, it must be the binary expression; it may be nil for non-constant expressions
// (when invoked for an assignment operation where the binary expression is implicit). // (when invoked for an assignment operation where the binary expression is implicit).

11
src/cmd/compile/internal/types2/type.go
View file

@ -881,16 +881,7 @@ func (t *top) String() string { return TypeString(t, nil) }
// If it doesn't exist, the result is Typ[Invalid]. // If it doesn't exist, the result is Typ[Invalid].
// under must only be called when a type is known // under must only be called when a type is known
// to be fully set up. // to be fully set up.
// func under(t Type) Type {
// under is set to underf to avoid an initialization cycle.
// TODO(gri) this doesn't happen in go/types - investigate
var under func(Type) Type
func init() {
under = underf
}
func underf(t Type) Type {
// TODO(gri) is this correct for *Sum? // TODO(gri) is this correct for *Sum?
if n := asNamed(t); n != nil { if n := asNamed(t); n != nil {
return n.under() return n.under()