aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKir Kolyshkin <kolyshkin@gmail.com>2018-07-30 17:05:49 +0300
committerIan Lance Taylor <iant@golang.org>2018-07-31 20:20:47 +0000
commit6bea321ba27a4c0c9424c11c6424697deee7cce2 (patch)
tree973e4a90273da99607068e12db438bb4f8cbc47b
parent344d0e0bf78ce479310496e8c767fc5e7410b527 (diff)
downloadgo-6bea321ba27a4c0c9424c11c6424697deee7cce2.tar.gz
go-6bea321ba27a4c0c9424c11c6424697deee7cce2.zip
cmd/cgo: add column number to line directives
Due to a new specification of //line: directives, missing column info is now treated as column 0, aka "unknown column" (see https://github.com/golang/go/issues/24183 for details). As cgo does not add column number to generated //line: directive, resulting files parsed do not have column info. Fix by adding column of 1 to generated line directives. Fixes #26692 Change-Id: Ie9263c0cf666b92d19c34240e745e8f32ffe7174 Reviewed-on: https://go-review.googlesource.com/126675 Run-TryBot: Ian Lance Taylor <iant@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org>
-rw-r--r--src/cmd/cgo/out.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmd/cgo/out.go b/src/cmd/cgo/out.go
index 07874974ee..89598c96e8 100644
--- a/src/cmd/cgo/out.go
+++ b/src/cmd/cgo/out.go
@@ -522,7 +522,7 @@ func (p *Package) writeOutput(f *File, srcfile string) {
// Write Go output: Go input with rewrites of C.xxx to _C_xxx.
fmt.Fprintf(fgo1, "// Code generated by cmd/cgo; DO NOT EDIT.\n\n")
- fmt.Fprintf(fgo1, "//line %s:1\n", srcfile)
+ fmt.Fprintf(fgo1, "//line %s:1:1\n", srcfile)
fgo1.Write(f.Edit.Bytes())
// While we process the vars and funcs, also write gcc output.