From 1bef0707a537d19bbbfda09dde05e5874a2fb199 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Mon, 9 Jan 2023 12:46:20 +0000 Subject: [PATCH] cmd/link: use strings.LastIndexByte to fix a TODO Go 1.20 will require Go 1.17 to bootstrap, so we can stop worrying about older Go bootstrap versions. https://go.dev/issues/44505 fixed most of those TODOs, but this one was presumably forgotten about. Change-Id: I0c19ec4eec65cd807e7db9a57c5969845d915c07 Reviewed-on: https://go-review.googlesource.com/c/go/+/461155 Reviewed-by: Than McIntosh Run-TryBot: Than McIntosh TryBot-Result: Gopher Robot Reviewed-by: Cherry Mui --- src/cmd/link/internal/ld/pcln.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/cmd/link/internal/ld/pcln.go b/src/cmd/link/internal/ld/pcln.go index 34ab86cf12..b18a2b4bd4 100644 --- a/src/cmd/link/internal/ld/pcln.go +++ b/src/cmd/link/internal/ld/pcln.go @@ -297,11 +297,7 @@ func (state *pclntab) generateFuncnametab(ctxt *Link, funcs []loader.Sym) map[lo if i < 0 { return name, "", "" } - // TODO: use LastIndexByte once the bootstrap compiler is >= Go 1.5. - j := len(name) - 1 - for j > i && name[j] != ']' { - j-- - } + j := strings.LastIndexByte(name, ']') if j <= i { return name, "", "" } -- 2.50.0