cmd/internal/obj, cmd/compile: rip off some toolstash bandaids

Change-Id: I402383e893223facae451adbd640113126d5edd9
Reviewed-on: https://go-review.googlesource.com/37873
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/cmd/compile/internal/gc/pgen.go b/src/cmd/compile/internal/gc/pgen.go
index d2f68b7c33f47f48dfa8a33939ec3bf392951ca5..29d146c9cc09dbf9ff2f5f8f2472f52aa4a80f67 100644 (file)
--- a/src/cmd/compile/internal/gc/pgen.go
+++ b/src/cmd/compile/internal/gc/pgen.go
@@ -467,12 +467,6 @@ func gendebug(fnsym *obj.LSym, decls []*Node) {
 
                fnsym.Autom = append(fnsym.Autom, a)
        }
-
-       // Reverse to make toolstash happy.
-       // TODO(mdempsky): Remove.
-       for i, j := 0, len(fnsym.Autom)-1; i < j; i, j = i+1, j-1 {
-               fnsym.Autom[i], fnsym.Autom[j] = fnsym.Autom[j], fnsym.Autom[i]
-       }
 }
 
 // fieldtrack adds R_USEFIELD relocations to fnsym to record any

diff --git a/src/cmd/internal/obj/objfile.go b/src/cmd/internal/obj/objfile.go
index fbf4d4b244746b711076e81f64a53d50e0fdf6ef..1bd4f53ae46c72cd8ceac2ff4684fbe10253f4e1 100644 (file)
--- a/src/cmd/internal/obj/objfile.go
+++ b/src/cmd/internal/obj/objfile.go
@@ -595,13 +595,7 @@ func gendwarf(ctxt *Link, text []*LSym) []*LSym {
                        })
                }
 
-               // We want to sort variables by offset, breaking ties
-               // with declaration order. Autom holds variables in
-               // reverse declaration order, so we reverse the
-               // assembled slice and then apply a stable sort.
-               for i, j := 0, len(vars)-1; i < j; i, j = i+1, j-1 {
-                       vars[i], vars[j] = vars[j], vars[i]
-               }
+               // Stable sort so that ties are broken with declaration order.
                sort.Stable(dwarf.VarsByOffset(vars))
 
                dwarf.PutFunc(dctxt, dsym, s.Name, s.Version == 0, s, s.Size, vars)