From d7db21691cb8c0380c14a41037c4ce67087260c5 Mon Sep 17 00:00:00 2001 From: liu Date: Mon, 29 May 2023 11:16:36 +0800 Subject: [PATCH] fix: not initialize cap and len of emptyslice (#438) --- internal/decoder/assembler_amd64_go116.go | 2 ++ internal/decoder/assembler_amd64_go117.go | 2 ++ issue_test/issue437_test.go | 42 +++++++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 issue_test/issue437_test.go diff --git a/internal/decoder/assembler_amd64_go116.go b/internal/decoder/assembler_amd64_go116.go index 26e305e..a2618bb 100644 --- a/internal/decoder/assembler_amd64_go116.go +++ b/internal/decoder/assembler_amd64_go116.go @@ -1656,6 +1656,8 @@ func (self *_Assembler) _asm_OP_check_empty(p *_Instr) { self.Sjmp("JNE" , "_not_empty_array_{n}") // JNE _not_empty_array_{n} self.Emit("MOVQ", _AX, _IC) // MOVQ AX, IC self.StorePtr(_Zero_Base, jit.Ptr(_VP, 0), _AX) // MOVQ $zerobase, (VP) + self.Emit("PXOR" , _X0, _X0) // PXOR X0, X0 + self.Emit("MOVOU", _X0, jit.Ptr(_VP, 8)) // MOVOU X0, 8(VP) self.Xjmp("JMP" , p.vi()) // JMP {p.vi()} self.Link("_not_empty_array_{n}") } else { diff --git a/internal/decoder/assembler_amd64_go117.go b/internal/decoder/assembler_amd64_go117.go index 874324f..2741373 100644 --- a/internal/decoder/assembler_amd64_go117.go +++ b/internal/decoder/assembler_amd64_go117.go @@ -1646,6 +1646,8 @@ func (self *_Assembler) _asm_OP_check_empty(p *_Instr) { self.Sjmp("JNE" , "_not_empty_array_{n}") // JNE _not_empty_array_{n} self.Emit("MOVQ", _AX, _IC) // MOVQ AX, IC self.StorePtr(_Zero_Base, jit.Ptr(_VP, 0), _AX) // MOVQ $zerobase, (VP) + self.Emit("PXOR", _X0, _X0) // PXOR X0, X0 + self.Emit("MOVOU", _X0, jit.Ptr(_VP, 8)) // MOVOU X0, 8(VP) self.Xjmp("JMP" , p.vi()) // JMP {p.vi()} self.Link("_not_empty_array_{n}") } else { diff --git a/issue_test/issue437_test.go b/issue_test/issue437_test.go new file mode 100644 index 0000000..3045618 --- /dev/null +++ b/issue_test/issue437_test.go @@ -0,0 +1,42 @@ +/* + * Copyright 2023 ByteDance Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package issue_test + +import ( + `github.com/bytedance/sonic` + `encoding/json` + `testing` + `github.com/stretchr/testify/require` +) + +// Person document for testing +type Person struct { + Name string `bson:"name,omitempty"` + Age uint `bson:"age,omitempty"` +} + + +func TestIssue437(t *testing.T) { + stdv := []Person{{Name: "hello world"}} + sonicv := []Person{{Name: "hello world"}} + + data := []byte(`[]`) + stde := json.Unmarshal(data, &stdv) + sonice := sonic.ConfigStd.Unmarshal(data, &sonicv) + require.Equal(t, stde, sonice) + require.Equal(t, stdv, sonicv) +} \ No newline at end of file