]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/compile/internal/staticdata: remove use of `""` in embed linker symbols
authorMatthew Dempsky <mdempsky@google.com>
Thu, 12 May 2022 22:46:59 +0000 (15:46 -0700)
committerMatthew Dempsky <mdempsky@google.com>
Fri, 13 May 2022 21:12:30 +0000 (21:12 +0000)
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 <mdempsky@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: David Chase <drchase@google.com>
src/cmd/compile/internal/staticdata/embed.go

index 627c98ba447f004b1c78394a291cab1f40467103..48eaa07a5e59df242587f1e8e9fda6bd73122c1b 100644 (file)
@@ -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