From 499e334a28c63c15e0b1add8172fd48b3c19e1ce Mon Sep 17 00:00:00 2001 From: Matthew Dempsky Date: Thu, 12 May 2022 15:46:59 -0700 Subject: [PATCH] cmd/compile/internal/staticdata: remove use of `""` in embed linker symbols Not strictly necessary for CL 393715, but this is necessary if we want to remove the logic from cmd/internal/obj for substituting `""` in linker symbol names. Updates #51734. Change-Id: Ib13cb12fa3973389ca0c1c9a9209e00c30dc9431 Reviewed-on: https://go-review.googlesource.com/c/go/+/406058 Run-TryBot: Matthew Dempsky TryBot-Result: Gopher Robot Reviewed-by: David Chase --- src/cmd/compile/internal/staticdata/embed.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/compile/internal/staticdata/embed.go b/src/cmd/compile/internal/staticdata/embed.go index 627c98ba44..48eaa07a5e 100644 --- a/src/cmd/compile/internal/staticdata/embed.go +++ b/src/cmd/compile/internal/staticdata/embed.go @@ -135,7 +135,7 @@ func WriteEmbed(v *ir.Name) { } case embedFiles: - slicedata := base.Ctxt.Lookup(`"".` + v.Sym().Name + `.files`) + slicedata := v.Sym().Pkg.Lookup(v.Sym().Name + `.files`).Linksym() off := 0 // []files pointed at by Files off = objw.SymPtr(slicedata, off, slicedata, 3*types.PtrSize) // []file, pointing just past slice -- 2.50.0