From fdc04223c5ed16ba568f6ce1b4859bc06e43df5e Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Sun, 13 Mar 2016 11:54:14 -0700 Subject: 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 Reviewed-by: Brad Fitzpatrick --- src/cmd/internal/obj/data.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/cmd/internal/obj/data.go') diff --git a/src/cmd/internal/obj/data.go b/src/cmd/internal/obj/data.go index 438435fd58..f4562d9938 100644 --- 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") -- cgit v1.3-5-g9baa