codec: fastpath is only for map/slice types. Do that check in fastEnc/fastDec funcs.

codec/decode.go

@@ -722,6 +722,7 @@ func (d *Decoder) getDecFn(rt reflect.Type) (fn decFn) {
 		// debugf("\tCreating new dec fn for type: %v\n", rt)
 		fi := decFnInfo{ti: getTypeInfo(rtid, rt), d: d, dd: d.d}
 		fn.i = &fi
+		rk := rt.Kind()
 		// An extension can be registered for any type, regardless of the Kind
 		// (e.g. type BitSet int64, type MyStruct { / * unexported fields * / }, type X []int, etc.
 		//
@@ -740,12 +741,12 @@ func (d *Decoder) getDecFn(rt reflect.Type) (fn decFn) {
 			fn.f = (*decFnInfo).ext
 		} else if supportBinaryMarshal && fi.ti.unm {
 			fn.f = (*decFnInfo).binaryMarshal
-		} else if xxf := fastDec(rtid); xxf != nil {
+		} else if xxf := fastDec(rtid, rk); xxf != nil {
 			fn.f = xxf
 			// } else if xxf, xxok := fastpathsDec[rtid]; xxok {
 			// 	fn.f = xxf
 		} else {
-			switch rk := rt.Kind(); rk {
+			switch rk {
 			case reflect.String:
 				fn.f = (*decFnInfo).kString
 			case reflect.Bool:
@@ -861,9 +862,9 @@ func decErr(format string, params ...interface{}) {
 	doPanic(msgTagDec, format, params...)
 }
 
-func fastDec(rtid uintptr) func(*decFnInfo, reflect.Value) {
+func fastDec(rtid uintptr, rk reflect.Kind) func(*decFnInfo, reflect.Value) {
 	// Unfortunately, accessing an empty map is not free free.
-	if fastpathEnabled {
+	if fastpathEnabled && (rk == reflect.Map || rk == reflect.Slice) {
 		return fastpathsDec[rtid]
 	}
 	return nil

codec/encode.go

@@ -806,6 +806,7 @@ func (e *Encoder) getEncFn(rt reflect.Type) (fn encFn) {
 		// debugf("\tCreating new enc fn for type: %v\n", rt)
 		fi := encFnInfo{ti: getTypeInfo(rtid, rt), e: e, ee: e.e}
 		fn.i = &fi
+		rk := rt.Kind()
 		if rtid == rawExtTypId {
 			fn.f = (*encFnInfo).rawExt
 		} else if e.e.isBuiltinType(rtid) {
@@ -815,12 +816,12 @@ func (e *Encoder) getEncFn(rt reflect.Type) (fn encFn) {
 			fn.f = (*encFnInfo).ext
 		} else if supportBinaryMarshal && fi.ti.m {
 			fn.f = (*encFnInfo).binaryMarshal
-		} else if xxf := fastEnc(rtid); xxf != nil {
+		} else if xxf := fastEnc(rtid, rk); xxf != nil {
 			fn.f = xxf
 			// } else if xxf, xxok := fastpathsEnc[rtid]; xxok {
 			// 	fn.f = xxf
 		} else {
-			switch rk := rt.Kind(); rk {
+			switch rk {
 			case reflect.Bool:
 				fn.f = (*encFnInfo).kBool
 			case reflect.String:
@@ -883,9 +884,9 @@ func encErr(format string, params ...interface{}) {
 	doPanic(msgTagEnc, format, params...)
 }
 
-func fastEnc(rtid uintptr) func(*encFnInfo, reflect.Value) {
+func fastEnc(rtid uintptr, rk reflect.Kind) func(*encFnInfo, reflect.Value) {
 	// Unfortunately, accessing an empty map is not free free.
-	if fastpathEnabled {
+	if fastpathEnabled && (rk == reflect.Map || rk == reflect.Slice) {
 		return fastpathsEnc[rtid]
 	}
 	return nil