1
0
mirror of https://github.com/golang/go synced 2024-11-18 09:14:43 -07:00

[dev.link] cmd/link: don't split container symbols when write blocks

We split the output into blocks and write them in parallel. The
block boundary is placed at symbol boundary. In the case of outer
symbols and sub symbols, currently we may split an outer symbol
into two blocks. This will be bad, as the two blocks will have
overlapping address range, since outer symbol and its sub symbols
occupies the same address range.

Make sure we place block boundary only at top-level symbol
boundaries.

Fix boringcrypto build.

Change-Id: I56811d3969c65c6be97672d8e1f1ea36b2447465
Reviewed-on: https://go-review.googlesource.com/c/go/+/227957
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Than McIntosh <thanm@google.com>
This commit is contained in:
Cherry Zhang 2020-04-10 22:11:51 -04:00
parent 84fb045763
commit 636fa3148f

View File

@ -820,6 +820,10 @@ func writeBlocks(out *OutBuf, sem chan int, syms []*sym.Symbol, addr, size int64
// Find the last symbol we'd write. // Find the last symbol we'd write.
idx := -1 idx := -1
for i, s := range syms { for i, s := range syms {
if s.Attr.SubSymbol() {
continue
}
// If the next symbol's size would put us out of bounds on the total length, // If the next symbol's size would put us out of bounds on the total length,
// stop looking. // stop looking.
if s.Value+s.Size > lastAddr { if s.Value+s.Size > lastAddr {
@ -847,7 +851,15 @@ func writeBlocks(out *OutBuf, sem chan int, syms []*sym.Symbol, addr, size int64
// blocks or at the end. // blocks or at the end.
length := int64(0) length := int64(0)
if idx+1 < len(syms) { if idx+1 < len(syms) {
length = syms[idx+1].Value - addr // Find the next top-level symbol.
// Skip over sub symbols so we won't split a containter symbol
// into two blocks.
next := syms[idx+1]
for next.Attr.SubSymbol() {
idx++
next = syms[idx+1]
}
length = next.Value - addr
} }
if length == 0 || length > lastAddr-addr { if length == 0 || length > lastAddr-addr {
length = lastAddr - addr length = lastAddr - addr