Skip to content

rust coverage: fix binary ids padding #6551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2021
Merged

rust coverage: fix binary ids padding #6551

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions infra/base-images/base-runner/gocoverage/llvm-cov-rel/llvm-profraw-relative.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,18 @@ func relativizeProfraw(data []byte, sectPrfCnts uint64, sectPrfData uint64) (err
h.NamesDelta = binary.LittleEndian.Uint64(data[72:80])
h.ValueKindLast = binary.LittleEndian.Uint64(data[80:88])

if h.BinaryIdsSize%8 != 0 {
// adds padding for binary ids
// cf commit b9f547e8e51182d32f1912f97a3e53f4899ea6be https://reviews.llvm.org/D110365
padlen := 8 - (h.BinaryIdsSize % 8)
data2 := make([]byte, len(data)+int(padlen))
copy(data2, data[0:88+h.BinaryIdsSize])
copy(data2[88+h.BinaryIdsSize+padlen:], data[88+h.BinaryIdsSize:])
data = data2
h.BinaryIdsSize += padlen
binary.LittleEndian.PutUint64(data[16:24], h.BinaryIdsSize)
}

if h.CountersDelta != sectPrfCnts-sectPrfData {
// Rust linking adds an offset ? not seen in readelf.
sectPrfData = h.CountersDelta - sectPrfCnts + sectPrfData
Expand Down