diff options
| author | Matthew Dempsky <mdempsky@google.com> | 2020-12-28 16:14:11 -0800 |
|---|---|---|
| committer | Matthew Dempsky <mdempsky@google.com> | 2020-12-29 02:35:04 +0000 |
| commit | 4629f6a51da5afabbebe9616f65fbfe0675d6039 (patch) | |
| tree | 8e81fbaa7ef4a2efc7cbc750df95c0eb817a4bee /src/cmd/compile/internal/staticinit | |
| parent | e563715b3085f44a76564485214e33e3c3b2b7b0 (diff) | |
| download | go-4629f6a51da5afabbebe9616f65fbfe0675d6039.tar.gz go-4629f6a51da5afabbebe9616f65fbfe0675d6039.zip | |
[dev.regabi] cmd/compile: merge {Selector,CallPart,Method}Expr
These three expression nodes all represent the same syntax, and so
they're represented the same within types2. And also they're not
handled that meaningfully differently throughout the rest of the
compiler to merit unique representations.
Method expressions are somewhat unique today that they're very
frequently turned into plain function names. But eventually that can
be handled by a post-typecheck desugaring phase that reduces the
number of redundant AST forms.
Passes toolstash -cmp.
Change-Id: I20df91bbd0d885c1f18ec67feb61ae1558670719
Reviewed-on: https://go-review.googlesource.com/c/go/+/280636
Trust: Matthew Dempsky <mdempsky@google.com>
Trust: Dan Scales <danscales@google.com>
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Dan Scales <danscales@google.com>
Diffstat (limited to 'src/cmd/compile/internal/staticinit')
| -rw-r--r-- | src/cmd/compile/internal/staticinit/sched.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cmd/compile/internal/staticinit/sched.go b/src/cmd/compile/internal/staticinit/sched.go index 2711f6cec0..d8f51766de 100644 --- a/src/cmd/compile/internal/staticinit/sched.go +++ b/src/cmd/compile/internal/staticinit/sched.go @@ -104,7 +104,7 @@ func (s *Schedule) staticcopy(l *ir.Name, loff int64, rn *ir.Name, typ *types.Ty switch r.Op() { case ir.OMETHEXPR: - r = r.(*ir.MethodExpr).FuncName() + r = r.(*ir.SelectorExpr).FuncName() fallthrough case ir.ONAME: r := r.(*ir.Name) @@ -165,7 +165,7 @@ func (s *Schedule) staticcopy(l *ir.Name, loff int64, rn *ir.Name, typ *types.Ty } x := e.Expr if x.Op() == ir.OMETHEXPR { - x = x.(*ir.MethodExpr).FuncName() + x = x.(*ir.SelectorExpr).FuncName() } if x.Op() == ir.ONAME && s.staticcopy(l, loff+e.Xoffset, x.(*ir.Name), typ) { continue @@ -195,7 +195,7 @@ func (s *Schedule) StaticAssign(l *ir.Name, loff int64, r ir.Node, typ *types.Ty return s.staticcopy(l, loff, r, typ) case ir.OMETHEXPR: - r := r.(*ir.MethodExpr) + r := r.(*ir.SelectorExpr) return s.staticcopy(l, loff, r.FuncName(), typ) case ir.ONIL: @@ -461,7 +461,7 @@ func StaticLoc(n ir.Node) (name *ir.Name, offset int64, ok bool) { return n, 0, true case ir.OMETHEXPR: - n := n.(*ir.MethodExpr) + n := n.(*ir.SelectorExpr) return StaticLoc(n.FuncName()) case ir.ODOT: |