From: Jeremy Faller <jeremy@golang.org>
Date: Thu, 31 Oct 2019 13:51:20 +0000 (-0400)
Subject: [dev.link] cmd/link: fix merge error
X-Git-Tag: go1.14beta1~292^2^2~19
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=931845aee3fcb7efb9abe3b47a319b1422557e4c;p=gostls13.git

[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>
---

diff --git a/src/cmd/link/internal/loader/loader.go b/src/cmd/link/internal/loader/loader.go
index ff38e7cf88..f0689032f3 100644
--- a/src/cmd/link/internal/loader/loader.go
+++ b/src/cmd/link/internal/loader/loader.go
@@ -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
 // larger slice will be allocated. Final slice is returned.
 func (l *Loader) ReadAuxSyms(symIdx Sym, dst []Sym) []Sym {
-	if l.isExternal(symIdx) {
+	if l.IsExternal(symIdx) {
 		return dst[:0]
 	}
 	naux := l.NAux(symIdx)