From 02fb2b9de7710236845c79430f787bd78bd76936 Mon Sep 17 00:00:00 2001
From: Masaaki Goshima <goccy54@gmail.com>
Date: Tue, 23 Feb 2021 16:10:57 +0900
Subject: [PATCH] Revert "Refactor HeadInt operation"

This reverts commit fbfaea2c886b4c2afc95712badb719deaf5fc67d.
---
 encode_vm.go | 87 +++++++++++++++++++++++++++-------------------------
 1 file changed, 45 insertions(+), 42 deletions(-)

diff --git a/encode_vm.go b/encode_vm.go
index 86ce631..2e42f71 100644
--- a/encode_vm.go
+++ b/encode_vm.go
@@ -748,64 +748,67 @@ 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
-			}
-			store(ctxptr, code.idx, p)
-			fallthrough
-		case opStructFieldHeadOmitEmptyInt:
-			p := load(ctxptr, code.idx) + code.offset
-			b = append(b, '{')
-			u64 := ptrToUint64(p)
-			v := u64 & code.mask
-			if v == 0 {
-				code = code.nextField
 			} else {
+				b = append(b, '{')
 				b = append(b, code.key...)
-				b = appendInt(b, u64, code)
+				b = appendInt(b, ptrToUint64(ptr+code.offset), code)
 				b = encodeComma(b)
 				code = code.next
 			}
-		case opStructFieldPtrHeadStringTagInt:
-			p := ptrToPtr(load(ctxptr, code.idx))
-			if p == 0 {
+		case opStructFieldPtrHeadOmitEmptyInt:
+			ptr := load(ctxptr, code.idx)
+			if ptr != 0 {
+				store(ctxptr, code.idx, ptrToPtr(ptr))
+			}
+			fallthrough
+		case opStructFieldHeadOmitEmptyInt:
+			ptr := load(ctxptr, code.idx)
+			if ptr == 0 {
 				b = encodeNull(b)
 				b = encodeComma(b)
 				code = code.end.next
-				break
+			} else {
+				b = append(b, '{')
+				u64 := ptrToUint64(ptr + code.offset)
+				v := u64 & code.mask
+				if v == 0 {
+					code = code.nextField
+				} else {
+					b = append(b, code.key...)
+					b = appendInt(b, u64, code)
+					b = encodeComma(b)
+					code = code.next
+				}
+			}
+		case opStructFieldPtrHeadStringTagInt:
+			ptr := load(ctxptr, code.idx)
+			if ptr != 0 {
+				store(ctxptr, code.idx, ptrToPtr(ptr))
 			}
-			store(ctxptr, code.idx, p)
 			fallthrough
 		case opStructFieldHeadStringTagInt:
-			p := load(ctxptr, code.idx) + code.offset
-			b = append(b, '{')
-			b = append(b, code.key...)
-			b = append(b, '"')
-			b = appendInt(b, ptrToUint64(p), code)
-			b = append(b, '"')
-			b = encodeComma(b)
-			code = code.next
+			ptr := load(ctxptr, code.idx)
+			if ptr == 0 {
+				b = encodeNull(b)
+				b = encodeComma(b)
+				code = code.end.next
+			} else {
+				b = append(b, '{')
+				b = append(b, code.key...)
+				b = append(b, '"')
+				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, '{')