1
0
mirror of https://github.com/golang/go synced 2024-11-07 03:06:18 -07:00

[dev.link] cmd/link: fix merge error

Change-Id: Ief8384a74ac9cf303a959656f807f34a0ff9873b
Reviewed-on: https://go-review.googlesource.com/c/go/+/204518
Run-TryBot: Jeremy Faller <jeremy@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
This commit is contained in:
Jeremy Faller 2019-10-31 09:51:20 -04:00
parent 0e76e2f4e5
commit 931845aee3

View File

@ -478,7 +478,7 @@ func (l *Loader) AuxSym(i Sym, j int) Sym {
// slice passed as a parameter. If the slice capacity is not large enough, a new // slice passed as a parameter. If the slice capacity is not large enough, a new
// larger slice will be allocated. Final slice is returned. // larger slice will be allocated. Final slice is returned.
func (l *Loader) ReadAuxSyms(symIdx Sym, dst []Sym) []Sym { func (l *Loader) ReadAuxSyms(symIdx Sym, dst []Sym) []Sym {
if l.isExternal(symIdx) { if l.IsExternal(symIdx) {
return dst[:0] return dst[:0]
} }
naux := l.NAux(symIdx) naux := l.NAux(symIdx)