XeLabs/sonic
2
0
Fork 0
mirror of https://github.com/ii64/sonic.git synced 2026-06-23 01:46:44 +08:00
Code Issues Projects Releases Wiki Activity

fix:(encoder) handle map like pointer when calling call_marshaler_v (#259)

Browse source
This commit is contained in:
Yi Duan 2022-07-06 14:50:28 +08:00 committed by GitHub
parent 55e3d10619
commit a66db08b94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 56 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
encoder/assembler_amd64_go116.go
View file

@ -512,9 +512,9 @@ func (self *_Assembler) call_encoder(pc obj.Addr) {
func (self *_Assembler) call_marshaler(fn obj.Addr, it *rt.GoType, vt reflect.Type) { func (self *_Assembler) call_marshaler(fn obj.Addr, it *rt.GoType, vt reflect.Type) {
switch vt.Kind() { switch vt.Kind() {
case reflect.Interface : self.call_marshaler_i(fn, it) case reflect.Interface : self.call_marshaler_i(fn, it)
case reflect.Ptr : self.call_marshaler_v(fn, it, vt, true) case reflect.Ptr, reflect.Map: self.call_marshaler_v(fn, it, vt, true)
default : self.call_marshaler_v(fn, it, vt, false) default : self.call_marshaler_v(fn, it, vt, false)
} }
} }

6
encoder/assembler_amd64_go117.go
View file

@ -531,9 +531,9 @@ func (self *_Assembler) call_encoder(pc obj.Addr) {
func (self *_Assembler) call_marshaler(fn obj.Addr, it *rt.GoType, vt reflect.Type) { func (self *_Assembler) call_marshaler(fn obj.Addr, it *rt.GoType, vt reflect.Type) {
switch vt.Kind() { switch vt.Kind() {
case reflect.Interface : self.call_marshaler_i(fn, it) case reflect.Interface : self.call_marshaler_i(fn, it)
case reflect.Ptr : self.call_marshaler_v(fn, it, vt, true) case reflect.Ptr, reflect.Map : self.call_marshaler_v(fn, it, vt, true)
default : self.call_marshaler_v(fn, it, vt, false) default : self.call_marshaler_v(fn, it, vt, false)
} }
} }

50
issue_test/issue258_test.go Normal file
View file

@ -0,0 +1,50 @@
package issue_test
import (
`encoding/json`
`fmt`
`testing`
`github.com/bytedance/sonic`
`github.com/davecgh/go-spew/spew`
`github.com/stretchr/testify/require`
)
type M1 map[string]int
func (m *M1) MarshalJSON() ([]byte, error) {
return []byte(fmt.Sprintf(`{"m":%q}`, spew.Sprintf("%#+v", m))), nil
}
type M2 map[string]int
func (m M2) MarshalJSON() ([]byte, error) {
return []byte(fmt.Sprintf(`{"m":%q}`, spew.Sprintf("%#+v", m))), nil
}
func TestIssue258(t *testing.T) {
m1 := M1{}
oe,ee := json.Marshal(m1)
os,es := sonic.Marshal(m1)
require.Equal(t, ee, es)
require.Equal(t, oe, os)
m1p := &M1{}
oe,ee = json.Marshal(m1p)
os,es = sonic.Marshal(m1p)
require.Equal(t, ee, es)
require.Equal(t, oe, os)
m2 := M2{}
oe,ee = json.Marshal(m2)
os,es = sonic.Marshal(m2)
require.Equal(t, ee, es)
require.Equal(t, oe, os)
m2p := &M2{}
oe,ee = json.Marshal(m2p)
os,es = sonic.Marshal(m2p)
require.Equal(t, ee, es)
require.Equal(t, oe, os)
}