mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gc: use AbsFileLine for deterministic binary export data 

This version of the file name honors the -trimprefix flag,
which strips off variable parts like $WORK or $PWD.
The TestCgoConsistentResults test now passes.

Change-Id: If93980b054f9b13582dd314f9d082c26eaac4f41
Reviewed-on: https://go-review.googlesource.com/22444
Reviewed-by: Robert Griesemer <gri@golang.org>
This commit is contained in:
Alan Donovan 2016-04-25 18:31:36 -04:00 committed by Robert Griesemer
parent 17db07f9b5
commit 6e4a8615f6
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cmd/compile/internal/gc/bexport.go
View File

@ -113,12 +113,8 @@ import (
const debugFormat = false // default: false
// If posInfoFormat is set, position information (file, lineno) is written
// for each exported object, including methods and struct fields. Currently
// disabled because it may lead to different object files depending on which
// directory they are built under, which causes tests checking for hermetic
// builds to fail (e.g. TestCgoConsistentResults for cmd/go).
// TODO(gri) determine what to do here.
const posInfoFormat = false
// for each exported object, including methods and struct fields.
const posInfoFormat = true // default: true
// TODO(gri) remove eventually
const forceNewExport = false // force new export format - do NOT submit with this flag set
@ -517,7 +513,7 @@ func (p *exporter) pos(n *Node) {
var file string
var line int
if n != nil {
file, line = Ctxt.LineHist.FileLine(int(n.Lineno))
file, line = Ctxt.LineHist.AbsFileLine(int(n.Lineno))
}
if file == p.prevFile && line != p.prevLine {