Merge pull request #1323 from Workiva/fixGob

flimzy · web-flow · commit 11d605d9fdd1 · 2024-07-16T08:56:46.000+02:00
[go1.20] Fixing a encoding/gob override
diff --git a/compiler/natives/src/encoding/gob/gob.go b/compiler/natives/src/encoding/gob/gob.go
@@ -26,15 +26,14 @@ func (x *atomicEncEnginePointer) Store(val *encEngine) { x.v = val }
 
 // temporarily replacement of growSlice[E any] for go1.20 without generics.
 func growSlice(v reflect.Value, ps any, length int) {
-	vps := reflect.ValueOf(ps)
-	vs := vps.Elem()
-	zero := reflect.Zero(vs.Elem().Type())
+	vps := reflect.ValueOf(ps) // *[]E
+	vs := vps.Elem()           // []E
+	zero := reflect.Zero(vs.Type().Elem())
 	vs.Set(reflect.Append(vs, zero))
 	cp := vs.Cap()
 	if cp > length {
 		cp = length
 	}
 	vs.Set(vs.Slice(0, cp))
 	v.Set(vs)
-	vps.Set(vs.Addr())
 }
diff --git a/compiler/natives/src/encoding/gob/gob_test.go b/compiler/natives/src/encoding/gob/gob_test.go
@@ -105,3 +105,11 @@ func TestTypeRace(t *testing.T) {
 	// cannot succeed when nosync is used.
 	t.Skip("using nosync")
 }
+
+func TestCountEncodeMallocs(t *testing.T) {
+	t.Skip("testing.AllocsPerRun not supported in GopherJS")
+}
+
+func TestCountDecodeMallocs(t *testing.T) {
+	t.Skip("testing.AllocsPerRun not supported in GopherJS")
+}
