cmd/internal: remove SymKind values that are only checked for, never set

Change-Id: Id152767c033c12966e9e12ae303b99f38776f919
Reviewed-on: https://go-review.googlesource.com/40987
Run-TryBot: Michael Hudson-Doyle <michael.hudson@canonical.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>

diff --git a/src/cmd/internal/obj/mips/asm0.go b/src/cmd/internal/obj/mips/asm0.go
index 39c4d4750b4ffa66e258b4d3d69dc3a1d1d5e99a..cb0775b2b9baa7134f0fbf4d16699e44f8fef3ae 100644 (file)
--- a/src/cmd/internal/obj/mips/asm0.go
+++ b/src/cmd/internal/obj/mips/asm0.go
@@ -606,10 +606,6 @@ func (c *ctxt0) aclass(a *obj.Addr) int {
                        if s == nil {
                                break
                        }
-                       if s.Type == objabi.SCONST {
-                               c.instoffset = a.Offset
-                               goto consize
-                       }
 
                        c.instoffset = a.Offset
                        if s.Type == objabi.STLSBSS {

diff --git a/src/cmd/internal/obj/plist.go b/src/cmd/internal/obj/plist.go
index fbc902696f2e43c87193f90d54551b3cf191f425..c8d282712ba065737f541657d34a15326b7828f8 100644 (file)
--- a/src/cmd/internal/obj/plist.go
+++ b/src/cmd/internal/obj/plist.go
@@ -162,7 +162,7 @@ func (ctxt *Link) Globl(s *LSym, size int64, flag int) {
        s.Set(AttrOnList, true)
        ctxt.Data = append(ctxt.Data, s)
        s.Size = size
-       if s.Type == 0 || s.Type == objabi.SXREF {
+       if s.Type == 0 {
                s.Type = objabi.SBSS
        }
        if flag&DUPOK != 0 {

diff --git a/src/cmd/internal/obj/ppc64/asm9.go b/src/cmd/internal/obj/ppc64/asm9.go
index c3f0a0d187bed1741784bc5da50b431daf7cbebc..8bfc667cff62df8b078fbaef47818217e749c3a8 100644 (file)
--- a/src/cmd/internal/obj/ppc64/asm9.go
+++ b/src/cmd/internal/obj/ppc64/asm9.go
@@ -810,10 +810,6 @@ func (c *ctxt9) aclass(a *obj.Addr) int {
                        if s == nil {
                                break
                        }
-                       if s.Type == objabi.SCONST {
-                               c.instoffset = a.Offset
-                               goto consize
-                       }
 
                        c.instoffset = a.Offset
 

diff --git a/src/cmd/internal/obj/s390x/asmz.go b/src/cmd/internal/obj/s390x/asmz.go
index df466d6d920fb6d9e5daae45969aa5daedb7b6c8..624d3b74ffd528e75389cd4805edf017602624c0 100644 (file)
--- a/src/cmd/internal/obj/s390x/asmz.go
+++ b/src/cmd/internal/obj/s390x/asmz.go
@@ -558,9 +558,6 @@ func (c *ctxtz) aclass(a *obj.Addr) int {
                                break
                        }
                        c.instoffset = a.Offset
-                       if s.Type == objabi.SCONST {
-                               goto consize
-                       }
 
                        return C_SYMADDR
 

diff --git a/src/cmd/internal/objabi/symkind.go b/src/cmd/internal/objabi/symkind.go
index 6c2eecf8a55390815054af3a25863e9a87fe71b9..6219436fb7deb2bfd32c2d514947414e10955c13 100644 (file)
--- a/src/cmd/internal/objabi/symkind.go
+++ b/src/cmd/internal/objabi/symkind.go
@@ -54,10 +54,6 @@ const (
        SNOPTRBSS
        // Thread-local data that is initally all 0s
        STLSBSS
-       // TODO(mwhudson): outside of the linker, these values are
-       // only checked for, not set, so they should be removed.
-       SXREF
-       SCONST
        // Debugging data
        SDWARFINFO
 )

diff --git a/src/cmd/internal/objabi/symkind_string.go b/src/cmd/internal/objabi/symkind_string.go
index 365bf17a73be8e4e7cbd2eef745ca286e566464c..b28628b520706035819d9d17052ca3d31322b9bc 100644 (file)
--- a/src/cmd/internal/objabi/symkind_string.go
+++ b/src/cmd/internal/objabi/symkind_string.go
@@ -4,9 +4,9 @@ package objabi
 
 import "fmt"
 
-const _SymKind_name = "SxxxSTEXTSRODATASNOPTRDATASDATASBSSSNOPTRBSSSTLSBSSSXREFSCONSTSDWARFINFO"
+const _SymKind_name = "SxxxSTEXTSRODATASNOPTRDATASDATASBSSSNOPTRBSSSTLSBSSSDWARFINFO"
 
-var _SymKind_index = [...]uint8{0, 4, 9, 16, 26, 31, 35, 44, 51, 56, 62, 72}
+var _SymKind_index = [...]uint8{0, 4, 9, 16, 26, 31, 35, 44, 51, 61}
 
 func (i SymKind) String() string {
        if i < 0 || i >= SymKind(len(_SymKind_index)-1) {

diff --git a/src/cmd/internal/objfile/goobj.go b/src/cmd/internal/objfile/goobj.go
index 63c66a8dc2416b3ff964ccb9ed2e374f52fc0cd8..e075604abdfdcda2d618faba04dad529f4980aeb 100644 (file)
--- a/src/cmd/internal/objfile/goobj.go
+++ b/src/cmd/internal/objfile/goobj.go
@@ -53,8 +53,6 @@ func (f *goobjFile) symbols() ([]Sym, error) {
                        sym.Code = 'D'
                case objabi.SBSS, objabi.SNOPTRBSS, objabi.STLSBSS:
                        sym.Code = 'B'
-               case objabi.SXREF, objabi.SCONST:
-                       sym.Code = 'X' // should not see
                }
                if s.Version != 0 {
                        sym.Code += 'a' - 'A'

diff --git a/src/cmd/link/internal/ld/symkind.go b/src/cmd/link/internal/ld/symkind.go
index faf888d43ff2ac18a04e1d474d72dcd6f2f73533..1d10ce235c059a4847b55d641f948b24e539c8ab 100644 (file)
--- a/src/cmd/link/internal/ld/symkind.go
+++ b/src/cmd/link/internal/ld/symkind.go
@@ -121,8 +121,6 @@ var abiSymKindToSymKind = [...]SymKind{
        SBSS,
        SNOPTRBSS,
        STLSBSS,
-       SXREF,
-       SCONST,
        SDWARFINFO,
 }