re
/
go-json
forked from mirror/go-json
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Refactor HeadInt operation" 

This reverts commit fbfaea2c88.
This commit is contained in:
Masaaki Goshima 2021-02-23 16:10:57 +09:00
parent 8aded2b62d
commit 02fb2b9de7
1 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
encode_vm.go
View File

@ -748,36 +748,36 @@ func encodeRun(ctx *encodeRuntimeContext, b []byte, codeSet *opcodeSet, opt Enco
}
}
case opStructFieldPtrHeadInt:
p := ptrToPtr(load(ctxptr, code.idx))
if p == 0 {
b = encodeNull(b)
b = encodeComma(b)
code = code.end.next
break
}
store(ctxptr, code.idx, p)
store(ctxptr, code.idx, ptrToPtr(load(ctxptr, code.idx)))
fallthrough
case opStructFieldHeadInt:
p := load(ctxptr, code.idx) + code.offset
b = append(b, '{')
b = append(b, code.key...)
b = appendInt(b, ptrToUint64(p), code)
b = encodeComma(b)
code = code.next
case opStructFieldPtrHeadOmitEmptyInt:
p := ptrToPtr(load(ctxptr, code.idx))
if p == 0 {
ptr := load(ctxptr, code.idx)
if ptr == 0 {
b = encodeNull(b)
b = encodeComma(b)
code = code.end.next
break
} else {
b = append(b, '{')
b = append(b, code.key...)
b = appendInt(b, ptrToUint64(ptr+code.offset), code)
b = encodeComma(b)
code = code.next
}
case opStructFieldPtrHeadOmitEmptyInt:
ptr := load(ctxptr, code.idx)
if ptr != 0 {
store(ctxptr, code.idx, ptrToPtr(ptr))
}
store(ctxptr, code.idx, p)
fallthrough
case opStructFieldHeadOmitEmptyInt:
p := load(ctxptr, code.idx) + code.offset
ptr := load(ctxptr, code.idx)
if ptr == 0 {
b = encodeNull(b)
b = encodeComma(b)
code = code.end.next
} else {
b = append(b, '{')
u64 := ptrToUint64(p)
u64 := ptrToUint64(ptr + code.offset)
v := u64 & code.mask
if v == 0 {
code = code.nextField
@ -787,25 +787,28 @@ func encodeRun(ctx *encodeRuntimeContext, b []byte, codeSet *opcodeSet, opt Enco
b = encodeComma(b)
code = code.next
}
}
case opStructFieldPtrHeadStringTagInt:
p := ptrToPtr(load(ctxptr, code.idx))
if p == 0 {
ptr := load(ctxptr, code.idx)
if ptr != 0 {
store(ctxptr, code.idx, ptrToPtr(ptr))
}
fallthrough
case opStructFieldHeadStringTagInt:
ptr := load(ctxptr, code.idx)
if ptr == 0 {
b = encodeNull(b)
b = encodeComma(b)
code = code.end.next
break
}
store(ctxptr, code.idx, p)
fallthrough
case opStructFieldHeadStringTagInt:
p := load(ctxptr, code.idx) + code.offset
} else {
b = append(b, '{')
b = append(b, code.key...)
b = append(b, '"')
b = appendInt(b, ptrToUint64(p), code)
b = appendInt(b, ptrToUint64(ptr+code.offset), code)
b = append(b, '"')
b = encodeComma(b)
code = code.next
}
case opStructFieldPtrHeadIntOnly, opStructFieldHeadIntOnly:
p := load(ctxptr, code.idx)
b = append(b, '{')