cmd/link: use a switch for name prefix switching

Minor cleanup.

Change-Id: I7574f58a7e55c2bb798ebe9c7c98d36b8c258fb8
Reviewed-on: https://go-review.googlesource.com/21982
Run-TryBot: David Crawshaw <crawshaw@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/cmd/link/internal/ld/symtab.go b/src/cmd/link/internal/ld/symtab.go
index 678ed387305aa738648ca443f613920edb3a54ff..60bec0d6c9ec926ce086438bb9c2395fba9e7442 100644 (file)
--- a/src/cmd/link/internal/ld/symtab.go
+++ b/src/cmd/link/internal/ld/symtab.go
@@ -384,33 +384,19 @@ func symtab() {
                symtyperel = s
        }
 
-       s = Linklookup(Ctxt, "go.string.*", 0)
-       s.Type = obj.SGOSTRING
-       s.Attr |= AttrLocal
-       s.Size = 0
-       s.Attr |= AttrReachable
-       symgostring := s
-
-       s = Linklookup(Ctxt, "go.string.hdr.*", 0)
-       s.Type = obj.SGOSTRINGHDR
-       s.Attr |= AttrLocal
-       s.Size = 0
-       s.Attr |= AttrReachable
-       symgostringhdr := s
-
-       s = Linklookup(Ctxt, "go.func.*", 0)
-       s.Type = obj.SGOFUNC
-       s.Attr |= AttrLocal
-       s.Size = 0
-       s.Attr |= AttrReachable
-       symgofunc := s
-
-       s = Linklookup(Ctxt, "runtime.gcbits.*", 0)
-       s.Type = obj.SGCBITS
-       s.Attr |= AttrLocal
-       s.Size = 0
-       s.Attr |= AttrReachable
-       symgcbits := s
+       groupSym := func(name string, t int16) *LSym {
+               s := Linklookup(Ctxt, name, 0)
+               s.Type = t
+               s.Size = 0
+               s.Attr |= AttrLocal | AttrReachable
+               return s
+       }
+       var (
+               symgostring    = groupSym("go.string.*", obj.SGOSTRING)
+               symgostringhdr = groupSym("go.string.hdr.*", obj.SGOSTRINGHDR)
+               symgofunc      = groupSym("go.func.*", obj.SGOFUNC)
+               symgcbits      = groupSym("runtime.gcbits.*", obj.SGCBITS)
+       )
 
        symtypelink := Linklookup(Ctxt, "runtime.typelink", 0)
        symtypelink.Type = obj.STYPELINK
@@ -436,7 +422,8 @@ func symtab() {
                        continue
                }
 
-               if strings.HasPrefix(s.Name, "type.") {
+               switch {
+               case strings.HasPrefix(s.Name, "type."):
                        if !DynlinkingGo() {
                                s.Attr |= AttrHidden
                        }
@@ -447,23 +434,20 @@ func symtab() {
                                s.Type = obj.STYPE
                                s.Outer = symtype
                        }
-               }
 
-               if strings.HasPrefix(s.Name, "go.typelink.") {
+               case strings.HasPrefix(s.Name, "go.typelink."):
                        ntypelinks++
                        s.Type = obj.STYPELINK
                        s.Attr |= AttrHidden
                        s.Outer = symtypelink
-               }
 
-               if strings.HasPrefix(s.Name, "go.itablink.") {
+               case strings.HasPrefix(s.Name, "go.itablink."):
                        nitablinks++
                        s.Type = obj.SITABLINK
                        s.Attr |= AttrHidden
                        s.Outer = symitablink
-               }
 
-               if strings.HasPrefix(s.Name, "go.string.") {
+               case strings.HasPrefix(s.Name, "go.string."):
                        s.Type = obj.SGOSTRING
                        s.Attr |= AttrHidden
                        s.Outer = symgostring
@@ -471,21 +455,18 @@ func symtab() {
                                s.Type = obj.SGOSTRINGHDR
                                s.Outer = symgostringhdr
                        }
-               }
 
-               if strings.HasPrefix(s.Name, "runtime.gcbits.") {
+               case strings.HasPrefix(s.Name, "runtime.gcbits."):
                        s.Type = obj.SGCBITS
                        s.Attr |= AttrHidden
                        s.Outer = symgcbits
-               }
 
-               if strings.HasPrefix(s.Name, "go.func.") {
+               case strings.HasPrefix(s.Name, "go.func."):
                        s.Type = obj.SGOFUNC
                        s.Attr |= AttrHidden
                        s.Outer = symgofunc
-               }
 
-               if strings.HasPrefix(s.Name, "gcargs.") || strings.HasPrefix(s.Name, "gclocals.") || strings.HasPrefix(s.Name, "gclocals·") {
+               case strings.HasPrefix(s.Name, "gcargs."), strings.HasPrefix(s.Name, "gclocals."), strings.HasPrefix(s.Name, "gclocals·"):
                        s.Type = obj.SGOFUNC
                        s.Attr |= AttrHidden
                        s.Outer = symgofunc