fix: remove duplicated base64 funcs

bytedance · Feb 13, 2025 · 8c43c8c · 8c43c8c
1 parent b20b0be
commit 8c43c8c
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 95 deletions.
diff --git a/ast/node.go b/ast/node.go
@@ -1678,7 +1678,7 @@ func NewBytes(src []byte) Node {
     if len(src) == 0 {
         panic("empty src bytes")
     }
-    out := rt.EncodeBase64(src)
+    out := rt.EncodeBase64ToString(src)
     return NewString(out)
 }
 

diff --git a/internal/base64/b64_amd64.go b/internal/base64/b64_amd64.go
diff --git a/internal/base64/b64_compat.go b/internal/base64/b64_compat.go
diff --git a/internal/encoder/vm/vm.go b/internal/encoder/vm/vm.go
@@ -26,7 +26,6 @@ import (
 	"github.com/bytedance/sonic/internal/encoder/ir"
 	"github.com/bytedance/sonic/internal/encoder/vars"
 	"github.com/bytedance/sonic/internal/rt"
-	"github.com/bytedance/sonic/internal/base64"
 )
 
 const (
@@ -176,7 +175,7 @@ func Execute(b *[]byte, p unsafe.Pointer, s *vars.Stack, flags uint64, prog *ir.
 			buf = alg.F64toa(buf, v)
 		case ir.OP_bin:
 			v := *(*[]byte)(p)
-			buf = base64.EncodeBase64(buf, v)
+			buf = rt.EncodeBase64(buf, v)
 		case ir.OP_quote:
 			v := *(*string)(p)
 			buf = alg.Quote(buf, v, true)

diff --git a/internal/rt/base64_amd64.go b/internal/rt/base64_amd64.go
@@ -15,6 +15,23 @@ func DecodeBase64(raw []byte) ([]byte, error) {
 	return ret[:n], nil
 }
 
-func EncodeBase64(src []byte) string {
+func EncodeBase64ToString(src []byte) string {
     return base64x.StdEncoding.EncodeToString(src)
 }
+
+func EncodeBase64(buf []byte, src []byte) []byte {
+	if len(src) == 0 {
+		return append(buf, '"', '"')
+	}
+	buf = append(buf, '"')
+	need := base64x.StdEncoding.EncodedLen(len(src))
+	if cap(buf) - len(buf) < need {
+		tmp := make([]byte, len(buf), len(buf) + need*2)
+		copy(tmp, buf)
+		buf = tmp
+	}
+	base64x.StdEncoding.Encode(buf[len(buf):cap(buf)], src)
+	buf = buf[:len(buf) + need]
+	buf = append(buf, '"')
+	return buf
+}
diff --git a/internal/rt/base64_compat.go b/internal/rt/base64_compat.go
@@ -15,6 +15,23 @@ func DecodeBase64(raw []byte) ([]byte, error) {
 	return ret[:n], nil
 }
 
-func EncodeBase64(src []byte) string {
+func EncodeBase64ToString(src []byte) string {
     return base64.StdEncoding.EncodeToString(src)
 }
+
+func EncodeBase64(buf []byte, src []byte) []byte {
+	if len(src) == 0 {
+		return append(buf, '"', '"')
+	}
+	buf = append(buf, '"')
+	need := base64.StdEncoding.EncodedLen(len(src))
+	if cap(buf) - len(buf) < need {
+		tmp := make([]byte, len(buf), len(buf) + need*2)
+		copy(tmp, buf)
+		buf = tmp
+	}
+	base64.StdEncoding.Encode(buf[len(buf):cap(buf)], src)
+	buf = buf[:len(buf) + need]
+	buf = append(buf, '"')
+	return buf
+}