cmd/compile: clean up savedata

Simplify function signature.
Remove unused Ctxt field Enforce_data_order.

Passes toolstash -cmp.

Change-Id: I5caa270ca9ae725708fe415b2c978b5f40780255
Reviewed-on: https://go-review.googlesource.com/20644
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/cmd/internal/obj/data.go b/src/cmd/internal/obj/data.go
index 438435fd585543f19f7c7dd37b0a1d7cb0bf0f78..f4562d993860cf674836971cea7a01d5a68e8bc6 100644 (file)
--- a/src/cmd/internal/obj/data.go
+++ b/src/cmd/internal/obj/data.go
@@ -52,14 +52,12 @@ func Symgrow(ctxt *Link, s *LSym, lsiz int64) {
        s.P = s.P[:siz]
 }
 
-func savedata(ctxt *Link, s *LSym, p *Prog, file string) {
+func savedata(ctxt *Link, p *Prog) {
+       s := p.From.Sym
        off := int32(p.From.Offset)
        siz := int32(p.From3.Offset)
        if off < 0 || siz < 0 || off >= 1<<30 || siz >= 100 {
-               log.Fatalf("%s: mangled input file", file)
-       }
-       if ctxt.Enforce_data_order != 0 && off < int32(len(s.P)) {
-               ctxt.Diag("data out of order (already have %d)\n%v", len(s.P), p)
+               log.Fatalf("savedata: bad off=%d siz=%d", off, siz)
        }
        if s.Type == SBSS || s.Type == STLSBSS {
                ctxt.Diag("cannot supply data for BSS var")

diff --git a/src/cmd/internal/obj/link.go b/src/cmd/internal/obj/link.go
index db66be6bff44c17921dc5b21f060fc180ef2861a..91837145efd779fc3afe7b705eaedc3536e94613 100644 (file)
--- a/src/cmd/internal/obj/link.go
+++ b/src/cmd/internal/obj/link.go
@@ -602,55 +602,54 @@ const (
 // Link holds the context for writing object code from a compiler
 // to be linker input or for reading that input into the linker.
 type Link struct {
-       Goarm              int32
-       Headtype           int
-       Arch               *LinkArch
-       Debugasm           int32
-       Debugvlog          int32
-       Debugdivmod        int32
-       Debugpcln          int32
-       Flag_shared        int32
-       Flag_dynlink       bool
-       Flag_optimize      bool
-       Bso                *Biobuf
-       Pathname           string
-       Windows            int32
-       Goroot             string
-       Goroot_final       string
-       Enforce_data_order int32
-       Hash               map[SymVer]*LSym
-       LineHist           LineHist
-       Imports            []string
-       Plist              *Plist
-       Plast              *Plist
-       Sym_div            *LSym
-       Sym_divu           *LSym
-       Sym_mod            *LSym
-       Sym_modu           *LSym
-       Plan9privates      *LSym
-       Curp               *Prog
-       Printp             *Prog
-       Blitrl             *Prog
-       Elitrl             *Prog
-       Rexflag            int
-       Vexflag            int
-       Rep                int
-       Repn               int
-       Lock               int
-       Asmode             int
-       Andptr             []byte
-       And                [100]uint8
-       Instoffset         int64
-       Autosize           int32
-       Armsize            int32
-       Pc                 int64
-       DiagFunc           func(string, ...interface{})
-       Mode               int
-       Cursym             *LSym
-       Version            int
-       Textp              *LSym
-       Etextp             *LSym
-       Errors             int
+       Goarm         int32
+       Headtype      int
+       Arch          *LinkArch
+       Debugasm      int32
+       Debugvlog     int32
+       Debugdivmod   int32
+       Debugpcln     int32
+       Flag_shared   int32
+       Flag_dynlink  bool
+       Flag_optimize bool
+       Bso           *Biobuf
+       Pathname      string
+       Windows       int32
+       Goroot        string
+       Goroot_final  string
+       Hash          map[SymVer]*LSym
+       LineHist      LineHist
+       Imports       []string
+       Plist         *Plist
+       Plast         *Plist
+       Sym_div       *LSym
+       Sym_divu      *LSym
+       Sym_mod       *LSym
+       Sym_modu      *LSym
+       Plan9privates *LSym
+       Curp          *Prog
+       Printp        *Prog
+       Blitrl        *Prog
+       Elitrl        *Prog
+       Rexflag       int
+       Vexflag       int
+       Rep           int
+       Repn          int
+       Lock          int
+       Asmode        int
+       Andptr        []byte
+       And           [100]uint8
+       Instoffset    int64
+       Autosize      int32
+       Armsize       int32
+       Pc            int64
+       DiagFunc      func(string, ...interface{})
+       Mode          int
+       Cursym        *LSym
+       Version       int
+       Textp         *LSym
+       Etextp        *LSym
+       Errors        int
 
        // state for writing objects
        Text  *LSym

diff --git a/src/cmd/internal/obj/objfile.go b/src/cmd/internal/obj/objfile.go
index 9b00c9af2a8f6978e4df6018c92b9ad493ec5da9..0920edafff6c1d5e246059ff5f6032fc589b3305 100644 (file)
--- a/src/cmd/internal/obj/objfile.go
+++ b/src/cmd/internal/obj/objfile.go
@@ -201,7 +201,7 @@ func flushplist(ctxt *Link, freeProgs bool) {
                                continue
 
                        case ADATA:
-                               savedata(ctxt, p.From.Sym, p, "<input>")
+                               savedata(ctxt, p)
                                continue
 
                        case ATEXT: