From 6aeaf4a0f45bfd9215488aa3acb1fce4f45c2731 Mon Sep 17 00:00:00 2001 From: Than McIntosh Date: Mon, 13 Apr 2020 07:31:19 -0400 Subject: [PATCH] [dev.link] cmd/link: fix funcfunctab crash with darwin + plugin Fix a bug in findfunctab when building plugin on Darwin (this is a regression introduced by CL 227842). Change-Id: Ic610168e45a750c0a2f2b8611d5d9154e6c2622f Reviewed-on: https://go-review.googlesource.com/c/go/+/228137 Run-TryBot: Than McIntosh TryBot-Result: Gobot Gobot Reviewed-by: Jeremy Faller --- src/cmd/link/internal/ld/pcln.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/link/internal/ld/pcln.go b/src/cmd/link/internal/ld/pcln.go index 9e2a4b2ffa..b275d20856 100644 --- a/src/cmd/link/internal/ld/pcln.go +++ b/src/cmd/link/internal/ld/pcln.go @@ -601,7 +601,7 @@ func (ctxt *Link) findfunctab(container loader.Bitmap) { if i < len(ctxt.Textp2) { e = ctxt.Textp2[i] } - for !emitPcln(ctxt, e, container) && i < len(ctxt.Textp2) { + for e != 0 && !emitPcln(ctxt, e, container) && i < len(ctxt.Textp2) { e = ctxt.Textp2[i] i++ } -- 2.50.0