From 02de5ed748e419f43d12d2bfaad35fdc3af5143b Mon Sep 17 00:00:00 2001 From: Matthew Dempsky Date: Mon, 13 Feb 2017 13:34:30 -0800 Subject: [PATCH] cmd/internal/obj: add AddrName type and cleanup AddrType values Passes toolstash -cmp. Change-Id: Ida3eda9bd9d79a34c1c3f18cb41aea9392698076 Reviewed-on: https://go-review.googlesource.com/36950 Run-TryBot: Matthew Dempsky TryBot-Result: Gobot Gobot Reviewed-by: Josh Bleecher Snyder --- src/cmd/compile/internal/gc/pgen.go | 2 +- src/cmd/internal/obj/link.go | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/cmd/compile/internal/gc/pgen.go b/src/cmd/compile/internal/gc/pgen.go index e612cf6a33..519cf02f27 100644 --- a/src/cmd/compile/internal/gc/pgen.go +++ b/src/cmd/compile/internal/gc/pgen.go @@ -442,7 +442,7 @@ func gendebug(fn *obj.LSym, decls []*Node) { continue } - var name int16 + var name obj.AddrName switch n.Class { case PAUTO: if !n.Used { diff --git a/src/cmd/internal/obj/link.go b/src/cmd/internal/obj/link.go index f81e1e2ef6..7f588b9356 100644 --- a/src/cmd/internal/obj/link.go +++ b/src/cmd/internal/obj/link.go @@ -157,7 +157,7 @@ type Addr struct { Index int16 Scale int16 // Sometimes holds a register. Type AddrType - Name int8 + Name AddrName Class int8 Offset int64 Sym *LSym @@ -172,10 +172,10 @@ type Addr struct { Node interface{} // for use by compiler } -type AddrType uint8 +type AddrName int8 const ( - NAME_NONE = 0 + iota + NAME_NONE AddrName = iota NAME_EXTERN NAME_STATIC NAME_AUTO @@ -185,10 +185,11 @@ const ( NAME_GOTREF ) -const ( - TYPE_NONE AddrType = 0 +type AddrType uint8 - TYPE_BRANCH AddrType = 5 + iota +const ( + TYPE_NONE AddrType = iota + TYPE_BRANCH TYPE_TEXTSIZE TYPE_MEM TYPE_CONST @@ -691,7 +692,7 @@ type Auto struct { Asym *LSym Link *Auto Aoffset int32 - Name int16 + Name AddrName Gotype *LSym } -- 2.50.0