diff options
| author | Robert Griesemer <gri@golang.org> | 2016-12-01 13:03:54 -0800 |
|---|---|---|
| committer | Robert Griesemer <gri@golang.org> | 2016-12-01 22:01:33 +0000 |
| commit | 2d136ae82e68bc820804b6a38262f240ea2bb5cf (patch) | |
| tree | 7f451792262e25fbff19dca0607a3f71a27c13f8 /src | |
| parent | 751c8903d29752bffa0c846a69fe465b2487f3f4 (diff) | |
| download | go-2d136ae82e68bc820804b6a38262f240ea2bb5cf.tar.xz | |
cmd/compile: correctly parse //line filename:line where filename contains ':'
This was a regression from 1.7. See the issue for details.
Fixes #18149.
Change-Id: Ic8f5a35d14edf9254b1275400316cff7aff32a27
Reviewed-on: https://go-review.googlesource.com/33799
Run-TryBot: Robert Griesemer <gri@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/compile/internal/gc/noder.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/cmd/compile/internal/gc/noder.go b/src/cmd/compile/internal/gc/noder.go index f9de48a08b..a501cb67b6 100644 --- a/src/cmd/compile/internal/gc/noder.go +++ b/src/cmd/compile/internal/gc/noder.go @@ -1022,13 +1022,14 @@ func (p *noder) error(err error) { func (p *noder) pragma(pos, line int, text string) syntax.Pragma { switch { case strings.HasPrefix(text, "line "): - i := strings.IndexByte(text, ':') + // Want to use LastIndexByte below but it's not defined in Go1.4 and bootstrap fails. + i := strings.LastIndex(text, ":") // look from right (Windows filenames may contain ':') if i < 0 { break } n, err := strconv.Atoi(text[i+1:]) if err != nil { - // todo: make this an error instead? it is almost certainly a bug. + // TODO: make this an error instead? it is almost certainly a bug. break } if n > 1e8 { |