From: Jes Cok <xigua67damn@gmail.com>
Date: Wed, 1 Nov 2023 15:34:27 +0000 (+0000)
Subject: cmd/link/internal/ld: use strings.TrimPrefix in expandFile
X-Git-Tag: go1.22rc1~435
X-Git-Url: http://www.git.cypherpunks.ru/?a=commitdiff_plain;h=1764da77c2562061533922f9f6354e53d37ebdbc;p=gostls13.git

cmd/link/internal/ld: use strings.TrimPrefix in expandFile

Change-Id: Iea00d1951fa222a6e4e54320d204958dbdeabfe4
GitHub-Last-Rev: f9a1e4415cdfb8f61e57142e5a2e182465fa5cda
GitHub-Pull-Request: golang/go#63874
Reviewed-on: https://go-review.googlesource.com/c/go/+/538863
Reviewed-by: David Chase <drchase@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
---

diff --git a/src/cmd/link/internal/ld/dwarf.go b/src/cmd/link/internal/ld/dwarf.go
index e108048827..dcbe719c96 100644
--- a/src/cmd/link/internal/ld/dwarf.go
+++ b/src/cmd/link/internal/ld/dwarf.go
@@ -1140,9 +1140,7 @@ func (d *dwctxt) importInfoSymbol(dsym loader.Sym) {
 }
 
 func expandFile(fname string) string {
-	if strings.HasPrefix(fname, src.FileSymPrefix) {
-		fname = fname[len(src.FileSymPrefix):]
-	}
+	fname = strings.TrimPrefix(fname, src.FileSymPrefix)
 	return expandGoroot(fname)
 }