From 57335a8a8f27199b135705be1f8dca2e2441c67b Mon Sep 17 00:00:00 2001 From: Andrew Gerrand Date: Wed, 7 Jan 2015 12:46:00 +1100 Subject: [PATCH] cover: accept inaccurate block endings When cover is used with cgo packages, the coverage profile is produced from the cgo-generated Go source files, so the profile will reference line and column numbers from that generated source, even though it names the original file. This is okay in general because the cgo-generated Go source files are very similar to the original, with one significant exception: the original source may refer to C identifiers such as C.foo(), but the cgo tool generates source that rewrites these mentions to something like _Cfunc_foo. This means that column numbers in coverage profiles might be higher than they should be, so be lenient when interpreting them. Update golang/go#9479 Change-Id: Ic3abef07471614101ce0c686d35b85e7e5e6a777 Reviewed-on: https://go-review.googlesource.com/2410 Reviewed-by: Rob Pike --- cover/profile.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cover/profile.go b/cover/profile.go index 83efb0b3..a53bf4ea 100644 --- a/cover/profile.go +++ b/cover/profile.go @@ -162,7 +162,7 @@ func (p *Profile) Boundaries(src []byte) (boundaries []Boundary) { if b.StartLine == line && b.StartCol == col { boundaries = append(boundaries, boundary(si, true, b.Count)) } - if b.EndLine == line && b.EndCol == col { + if b.EndLine == line && b.EndCol == col || line > b.EndLine { boundaries = append(boundaries, boundary(si, false, 0)) bi++ continue // Don't advance through src; maybe the next block starts here.