Commit 6e4a8615 authored by Alan Donovan's avatar Alan Donovan Committed by Robert Griesemer

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/22444Reviewed-by: 's avatarRobert Griesemer <gri@golang.org>
parent 17db07f9
...@@ -113,12 +113,8 @@ import ( ...@@ -113,12 +113,8 @@ import (
const debugFormat = false // default: false const debugFormat = false // default: false
// If posInfoFormat is set, position information (file, lineno) is written // If posInfoFormat is set, position information (file, lineno) is written
// for each exported object, including methods and struct fields. Currently // for each exported object, including methods and struct fields.
// disabled because it may lead to different object files depending on which const posInfoFormat = true // default: true
// 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
// TODO(gri) remove eventually // TODO(gri) remove eventually
const forceNewExport = false // force new export format - do NOT submit with this flag set const forceNewExport = false // force new export format - do NOT submit with this flag set
...@@ -517,7 +513,7 @@ func (p *exporter) pos(n *Node) { ...@@ -517,7 +513,7 @@ func (p *exporter) pos(n *Node) {
var file string var file string
var line int var line int
if n != nil { 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 { if file == p.prevFile && line != p.prevLine {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment