You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
63 lines
1.9 KiB
Diff
63 lines
1.9 KiB
Diff
From aad38f7aa37d00c723c3540bd8a907b92353d97d Mon Sep 17 00:00:00 2001
|
|
From: pagran <pagran@protonmail.com>
|
|
Date: Mon, 9 Jan 2023 10:27:41 +0100
|
|
Subject: [PATCH] add unexported function name removing
|
|
|
|
---
|
|
cmd/link/internal/ld/pcln.go | 27 +++++++++++++++++++++++++++
|
|
1 file changed, 27 insertions(+)
|
|
|
|
diff --git a/cmd/link/internal/ld/pcln.go b/cmd/link/internal/ld/pcln.go
|
|
index 1ec237ffc8..e1bea2032c 100644
|
|
--- a/cmd/link/internal/ld/pcln.go
|
|
+++ b/cmd/link/internal/ld/pcln.go
|
|
@@ -321,10 +321,19 @@ func (state *pclntab) generateFuncnametab(ctxt *Link, funcs []loader.Sym) map[lo
|
|
return name[:i], "[...]", name[j+1:]
|
|
}
|
|
|
|
+ garbleIsRemove := os.Getenv("GARBLE_LINK_TINY") == "true"
|
|
+
|
|
// Write the null terminated strings.
|
|
writeFuncNameTab := func(ctxt *Link, s loader.Sym) {
|
|
symtab := ctxt.loader.MakeSymbolUpdater(s)
|
|
+ if garbleIsRemove {
|
|
+ symtab.AddStringAt(0, "")
|
|
+ }
|
|
+
|
|
for s, off := range nameOffsets {
|
|
+ if garbleIsRemove && off == 0 {
|
|
+ continue
|
|
+ }
|
|
a, b, c := nameParts(ctxt.loader.SymName(s))
|
|
o := int64(off)
|
|
o = symtab.AddStringAt(o, a)
|
|
@@ -335,7 +344,25 @@ func (state *pclntab) generateFuncnametab(ctxt *Link, funcs []loader.Sym) map[lo
|
|
|
|
// Loop through the CUs, and calculate the size needed.
|
|
var size int64
|
|
+
|
|
+ if garbleIsRemove {
|
|
+ size = 1 // first byte is reserved for empty string used for all non-exportable method names
|
|
+ }
|
|
+ garbleIsUnexported := func(s loader.Sym) bool {
|
|
+ name, _, _ := nameParts(ctxt.loader.SymName(s))
|
|
+ if name[len(name)-1] == '.' {
|
|
+ return true
|
|
+ }
|
|
+ c := name[strings.LastIndexByte(name, '.')+1]
|
|
+ return 'a' <= c && c <= 'z'
|
|
+ }
|
|
+
|
|
walkFuncs(ctxt, funcs, func(s loader.Sym) {
|
|
+ if garbleIsRemove && garbleIsUnexported(s) {
|
|
+ nameOffsets[s] = 0 // redirect name to empty string
|
|
+ return
|
|
+ }
|
|
+
|
|
nameOffsets[s] = uint32(size)
|
|
a, b, c := nameParts(ctxt.loader.SymName(s))
|
|
size += int64(len(a) + len(b) + len(c) + 1) // NULL terminate
|
|
--
|
|
2.38.1.windows.1
|
|
|