Use encodeRuntimeContext.ptrs instead of opcode.ptr

encode.go

@@ -162,19 +162,17 @@ func (e *Encoder) encode(v interface{}) error {
 		} else {
 			code = codeSet.code.Get().(*opcode)
 		}
-		ctx := codeSet.ctx.Get().(encodeRuntimeContext)
+		ctx := codeSet.ctx.Get().(*encodeRuntimeContext)
 		p := uintptr(header.ptr)
 		ctx.init(p)
-		code.ptr = p
-		if err := e.run(ctx, code); err != nil {
-			return err
-		}
+		err := e.run(ctx, code)
 		if e.enabledIndent {
 			codeSet.codeIndent.Put(code)
 		} else {
 			codeSet.code.Put(code)
 		}
-		return nil
+		codeSet.ctx.Put(ctx)
+		return err
 	}
 
 	// noescape trick for header.typ ( reflect.*rtype )
@@ -210,20 +208,28 @@ func (e *Encoder) encode(v interface{}) error {
 		},
 		ctx: sync.Pool{
 			New: func() interface{} {
-				return make(encodeRuntimeContext, codeLength)
+				return &encodeRuntimeContext{
+					ptrs:    make([]uintptr, codeLength),
+					seenPtr: map[uintptr]struct{}{},
+				}
 			},
 		},
 	}
 	cachedOpcode.set(typeptr, codeSet)
 	p := uintptr(header.ptr)
-	ctx := codeSet.ctx.Get().(encodeRuntimeContext)
+	ctx := codeSet.ctx.Get().(*encodeRuntimeContext)
 	ctx.init(p)
 	if e.enabledIndent {
-		codeIndent.ptr = p
-		return e.run(ctx, codeIndent)
+		err := e.run(ctx, codeIndent)
+		codeSet.ctx.Put(ctx)
+		return err
 	}
-	code.ptr = p
-	return e.run(ctx, code)
+	if err := e.run(ctx, code); err != nil {
+		codeSet.ctx.Put(ctx)
+		return err
+	}
+	codeSet.ctx.Put(ctx)
+	return err
 }
 
 func (e *Encoder) encodeInt(v int) {

encode_context.go

@@ -58,13 +58,16 @@ func (c *encodeCompileContext) decOpcodeIndex() {
 	}
 }
 
-type encodeRuntimeContext []uintptr
+type encodeRuntimeContext struct {
+	ptrs    []uintptr
+	seenPtr map[uintptr]struct{}
+}
 
 func (c *encodeRuntimeContext) init(p uintptr) {
-	(*c)[0] = p
+	c.ptrs[0] = p
 }
 
-func (c *encodeRuntimeContext) ptr() *uintptr {
-	header := (*reflect.SliceHeader)(unsafe.Pointer(c))
-	return (*uintptr)(unsafe.Pointer(&header.Data))
+func (c *encodeRuntimeContext) ptr() uintptr {
+	header := (*reflect.SliceHeader)(unsafe.Pointer(&c.ptrs))
+	return header.Data
 }

encode_opcode.go

@@ -16,7 +16,6 @@ type opcodeHeader struct {
 	op     opType
 	typ    *rtype
 	idx    int
-	ptr    uintptr
 	indent int
 	next   *opcode
 }
@@ -26,7 +25,6 @@ func (h *opcodeHeader) copy(codeMap map[uintptr]*opcode) *opcodeHeader {
 		op:     h.op,
 		typ:    h.typ,
 		idx:    h.idx,
-		ptr:    h.ptr,
 		indent: h.indent,
 		next:   h.next.copy(codeMap),
 	}
@@ -616,7 +614,6 @@ func newRecursiveCode(recursive *recursiveCode) *opcode {
 	code := copyOpcode(recursive.jmp.code)
 	head := (*structFieldCode)(unsafe.Pointer(code))
 	head.end.next = newEndOp(&encodeCompileContext{})
-	code.ptr = recursive.ptr
 
 	code.op = code.op.ptrHeadToHead()
 	return code