json: pass remaining cycle/unsupported-value tests

Author: extemporalgenome

json/codec.go

@@ -366,6 +366,21 @@ func constructSliceCodec(t reflect.Type, seen seenMap) *codec {
 	}
 
 	inner := constructCodec(e, seen, true)
+
+	// If encode/decode functions are nil, that means this is a recursive type,
+	// and so we can use delayed binding to define self-referential calls.
+	if inner.encode == nil {
+		inner.encode = func(e encoder, b []byte, p unsafe.Pointer) ([]byte, error) {
+			return c.encode(e, b, p)
+		}
+	}
+
+	if inner.decode == nil {
+		inner.decode = func(d decoder, b []byte, p unsafe.Pointer) ([]byte, error) {
+			return c.decode(d, b, p)
+		}
+	}
+
 	c.encode = constructSliceEncodeFunc(s, t, inner.encode)
 	c.decode = constructSliceDecodeFunc(s, t, inner.decode)
 

json/encode.go

@@ -297,7 +297,7 @@ func (e encoder) encodeTime(b []byte, p unsafe.Pointer) ([]byte, error) {
 
 func (e encoder) encodeArray(b []byte, p unsafe.Pointer, n int, size uintptr, t reflect.Type, encode encodeFunc) ([]byte, error) {
 	if shouldCheckForRefCycle(&e) {
-		key := cycleKey{ptr: p}
+		key := cycleKey{ptr: p, len: n}
 		if hasRefCycle(&e, key) {
 			return b, refCycleError(t, p)
 		}