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

callthingsoff · cherrymui · commit 1764da77c256 · 2023-11-03T15:06:23.000Z
Change-Id: Iea00d1951fa222a6e4e54320d204958dbdeabfe4 GitHub-Last-Rev: f9a1e44 GitHub-Pull-Request: #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
@@ -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)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1140,9 +1140,7 @@ func (d *dwctxt) importInfoSymbol(dsym loader.Sym) {`
`1140`	`1140`	`}`
`1141`	`1141`
`1142`	`1142`	`func expandFile(fname string) string {`
`1143`		`- if strings.HasPrefix(fname, src.FileSymPrefix) {`
`1144`		`- fname = fname[len(src.FileSymPrefix):]`
`1145`		`- }`
	`1143`	`+ fname = strings.TrimPrefix(fname, src.FileSymPrefix)`
`1146`	`1144`	`return expandGoroot(fname)`
`1147`	`1145`	`}`
`1148`	`1146`