qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 16:44:43 -07:00
Code Releases Activity

cmd/compile: clean up savedata

Browse Source 
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>
This commit is contained in:
Josh Bleecher Snyder 2016-03-13 11:54:14 -07:00
parent e8fab405cb
commit fdc04223c5
3 changed files with 52 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cmd/internal/obj/data.go
View File

@ -52,14 +52,12 @@ func Symgrow(ctxt *Link, s *LSym, lsiz int64) {
s.P = s.P[:siz] 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) off := int32(p.From.Offset)
siz := int32(p.From3.Offset) siz := int32(p.From3.Offset)
if off < 0 || siz < 0 || off >= 1<<30 || siz >= 100 { if off < 0 || siz < 0 || off >= 1<<30 || siz >= 100 {
log.Fatalf("%s: mangled input file", file) log.Fatalf("savedata: bad off=%d siz=%d", off, siz)
}
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)
} }
if s.Type == SBSS || s.Type == STLSBSS { if s.Type == SBSS || s.Type == STLSBSS {
ctxt.Diag("cannot supply data for BSS var") ctxt.Diag("cannot supply data for BSS var")

1
src/cmd/internal/obj/link.go
View File

@ -617,7 +617,6 @@ type Link struct {
Windows int32 Windows int32
Goroot string Goroot string
Goroot_final string Goroot_final string
Enforce_data_order int32
Hash map[SymVer]*LSym Hash map[SymVer]*LSym
LineHist LineHist LineHist LineHist
Imports []string Imports []string

2
src/cmd/internal/obj/objfile.go
View File

@ -201,7 +201,7 @@ func flushplist(ctxt *Link, freeProgs bool) {
continue continue
case ADATA: case ADATA:
savedata(ctxt, p.From.Sym, p, "<input>") savedata(ctxt, p)
continue continue
case ATEXT: case ATEXT: