diff options
| author | griesemer <gri@golang.org> | 2017-11-10 11:38:51 -0800 |
|---|---|---|
| committer | Robert Griesemer <gri@golang.org> | 2017-11-13 16:47:41 +0000 |
| commit | ca2a886cbade477e2c7cf09cdac604b757fb70a9 (patch) | |
| tree | a53caa12f75272cad04d04bd5ea1ffd3dea576ef /src/cmd/asm/internal/lex/input.go | |
| parent | 2c00dea18b4a62fbf0bc11c85e4d9b91a314381f (diff) | |
| download | go-ca2a886cbade477e2c7cf09cdac604b757fb70a9.tar.xz | |
cmd/compile: record original and absolute file names for line directives
Also, with this change, error locations don't print absolute positions
in [] brackets following positions relative to line directives. To get
the absolute positions as well, specify the -L flag.
Fixes #22660.
Change-Id: I9ecfa254f053defba9c802222874155fa12fee2c
Reviewed-on: https://go-review.googlesource.com/77090
Reviewed-by: David Crawshaw <crawshaw@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>
Diffstat (limited to 'src/cmd/asm/internal/lex/input.go')
| -rw-r--r-- | src/cmd/asm/internal/lex/input.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cmd/asm/internal/lex/input.go b/src/cmd/asm/internal/lex/input.go index ddfcddf36d..666611e179 100644 --- a/src/cmd/asm/internal/lex/input.go +++ b/src/cmd/asm/internal/lex/input.go @@ -13,6 +13,7 @@ import ( "text/scanner" "cmd/asm/internal/flags" + "cmd/internal/objabi" "cmd/internal/src" ) @@ -454,7 +455,7 @@ func (in *Input) line() { in.Error("unexpected token at end of #line: ", tok) } pos := src.MakePos(in.Base(), uint(in.Line()), uint(in.Col())) - in.Stack.SetBase(src.NewLinePragmaBase(pos, file, uint(line))) + in.Stack.SetBase(src.NewLinePragmaBase(pos, file, objabi.AbsFile(objabi.WorkingDir(), file, *flags.TrimPath), uint(line))) } // #undef processing |