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 e1080488274191241ef7229374b03a5cc6de1b3a..dcbe719c96f1e30720460cf166a095e872e63cd5 100644 (file)
--- 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)
 }