aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/compile/internal/ir
diff options
context:
space:
mode:
authorMatthew Dempsky <mdempsky@google.com>2021-01-03 20:14:00 -0800
committerMatthew Dempsky <mdempsky@google.com>2021-01-04 10:30:09 +0000
commitf24e40c14a0a767b6663c85dc900bb9e6b7c2d8e (patch)
tree0a0a73c3df818b6d574bb4d55c3e96689f5ca4e9 /src/cmd/compile/internal/ir
parentd89705e08742c0f4fdf5d2bdbab6f344c6be884f (diff)
downloadgo-f24e40c14a0a767b6663c85dc900bb9e6b7c2d8e.tar.gz
go-f24e40c14a0a767b6663c85dc900bb9e6b7c2d8e.zip
[dev.regabi] cmd/compile: remove Name.Class_ accessors
These aren't part of the Node interface anymore, so no need to keep them around. Passes toolstash -cmp. [git-generate] cd src/cmd/compile/internal/ir : Fix one off case that causes trouble for rf. sed -i -e 's/n.SetClass(ir.PAUTO)/n.Class_ = ir.PAUTO/' ../ssa/export_test.go pkgs=$(go list . ../...) rf ' ex '"$(echo $pkgs)"' { var n *Name var c Class n.Class() -> n.Class_ n.SetClass(c) -> n.Class_ = c } rm Name.Class rm Name.SetClass mv Name.Class_ Name.Class ' Change-Id: Ifb304bf4691a8c455456aabd8aa77178d4a49500 Reviewed-on: https://go-review.googlesource.com/c/go/+/281294 Trust: Matthew Dempsky <mdempsky@google.com> Run-TryBot: Matthew Dempsky <mdempsky@google.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Diffstat (limited to 'src/cmd/compile/internal/ir')
-rw-r--r--src/cmd/compile/internal/ir/expr.go6
-rw-r--r--src/cmd/compile/internal/ir/func.go4
-rw-r--r--src/cmd/compile/internal/ir/name.go8
-rw-r--r--src/cmd/compile/internal/ir/scc.go2
4 files changed, 9 insertions, 11 deletions
diff --git a/src/cmd/compile/internal/ir/expr.go b/src/cmd/compile/internal/ir/expr.go
index 1b88427146..6d81bf8781 100644
--- a/src/cmd/compile/internal/ir/expr.go
+++ b/src/cmd/compile/internal/ir/expr.go
@@ -527,7 +527,7 @@ func (n *SelectorExpr) FuncName() *Name {
panic(n.no("FuncName"))
}
fn := NewNameAt(n.Selection.Pos, MethodSym(n.X.Type(), n.Sel))
- fn.Class_ = PFUNC
+ fn.Class = PFUNC
fn.SetType(n.Type())
return fn
}
@@ -736,7 +736,7 @@ func IsAddressable(n Node) bool {
case ONAME:
n := n.(*Name)
- if n.Class_ == PFUNC {
+ if n.Class == PFUNC {
return false
}
return true
@@ -771,7 +771,7 @@ func staticValue1(nn Node) Node {
return nil
}
n := nn.(*Name)
- if n.Class_ != PAUTO || n.Addrtaken() {
+ if n.Class != PAUTO || n.Addrtaken() {
return nil
}
diff --git a/src/cmd/compile/internal/ir/func.go b/src/cmd/compile/internal/ir/func.go
index 1eaca9c6f3..12ef083c19 100644
--- a/src/cmd/compile/internal/ir/func.go
+++ b/src/cmd/compile/internal/ir/func.go
@@ -245,11 +245,11 @@ func FuncSymName(s *types.Sym) string {
// MarkFunc marks a node as a function.
func MarkFunc(n *Name) {
- if n.Op() != ONAME || n.Class_ != Pxxx {
+ if n.Op() != ONAME || n.Class != Pxxx {
base.Fatalf("expected ONAME/Pxxx node, got %v", n)
}
- n.Class_ = PFUNC
+ n.Class = PFUNC
n.Sym().SetFunc(true)
}
diff --git a/src/cmd/compile/internal/ir/name.go b/src/cmd/compile/internal/ir/name.go
index 689ef983f6..58b4ababff 100644
--- a/src/cmd/compile/internal/ir/name.go
+++ b/src/cmd/compile/internal/ir/name.go
@@ -37,7 +37,7 @@ func (*Ident) CanBeNtype() {}
type Name struct {
miniExpr
BuiltinOp Op // uint8
- Class_ Class // uint8
+ Class Class // uint8
pragma PragmaFlag // int16
flags bitset16
sym *types.Sym
@@ -222,8 +222,6 @@ func (n *Name) Sym() *types.Sym { return n.sym }
func (n *Name) SetSym(x *types.Sym) { n.sym = x }
func (n *Name) SubOp() Op { return n.BuiltinOp }
func (n *Name) SetSubOp(x Op) { n.BuiltinOp = x }
-func (n *Name) Class() Class { return n.Class_ }
-func (n *Name) SetClass(x Class) { n.Class_ = x }
func (n *Name) SetFunc(x *Func) { n.Func = x }
func (n *Name) Offset() int64 { panic("Name.Offset") }
func (n *Name) SetOffset(x int64) {
@@ -425,7 +423,7 @@ func IsParamStackCopy(n Node) bool {
return false
}
name := n.(*Name)
- return (name.Class_ == PPARAM || name.Class_ == PPARAMOUT) && name.Heapaddr != nil
+ return (name.Class == PPARAM || name.Class == PPARAMOUT) && name.Heapaddr != nil
}
// IsParamHeapCopy reports whether this is the on-heap copy of
@@ -435,7 +433,7 @@ func IsParamHeapCopy(n Node) bool {
return false
}
name := n.(*Name)
- return name.Class_ == PAUTOHEAP && name.Stackcopy != nil
+ return name.Class == PAUTOHEAP && name.Stackcopy != nil
}
var RegFP *Name
diff --git a/src/cmd/compile/internal/ir/scc.go b/src/cmd/compile/internal/ir/scc.go
index f35c4d44e9..83c6074170 100644
--- a/src/cmd/compile/internal/ir/scc.go
+++ b/src/cmd/compile/internal/ir/scc.go
@@ -87,7 +87,7 @@ func (v *bottomUpVisitor) visit(n *Func) uint32 {
Visit(n, func(n Node) {
switch n.Op() {
case ONAME:
- if n := n.(*Name); n.Class_ == PFUNC {
+ if n := n.(*Name); n.Class == PFUNC {
do(n.Defn)
}
case ODOTMETH, OCALLPART, OMETHEXPR: