fix: TestGenericsHashKeyInPprofBuilder, TestGenericsShape on gotip (#150)

Author: korniltsev

Makefile

@@ -1,9 +1,10 @@
-GO_VERSION_PRE20 := $(shell go version | awk '{print $$3}' | awk -F '.' '{print ($$1 == "go1" && int($$2) < 20)}')
 TEST_PACKAGES := ./... ./godeltaprof/compat/... ./godeltaprof/...
+GO ?= go
+GOTIP ?= gotip
 
 .PHONY: test
 test:
-	go test -race $(shell go list $(TEST_PACKAGES) | grep -v /example)
+	$(GO) test -race $(shell $(GO) list $(TEST_PACKAGES) | grep -v /example)
 
 .PHONY: go/mod
 go/mod:
@@ -18,6 +19,6 @@ go/mod:
 # https://github.com/grafana/pyroscope-go/issues/129
 .PHONY: gotip/fix
 gotip/fix:
-	cd godeltaprof/compat/ && gotip get -d -v golang.org/x/tools@v0.25.0
+	cd godeltaprof/compat/ && $(GOTIP) get -v golang.org/x/tools@v0.34.0
 	git --no-pager diff
 	! git diff | grep toolchain

godeltaprof/compat/generics_go21_test.go

@@ -6,7 +6,6 @@ package compat
 import (
 	"bytes"
 	"fmt"
-	"github.com/google/pprof/profile"
 	"io"
 	"runtime"
 	"runtime/pprof"
@@ -16,6 +15,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/google/pprof/profile"
 	"github.com/grafana/pyroscope-go/godeltaprof"
 	"github.com/stretchr/testify/require"
 )
@@ -60,7 +60,8 @@ func TestGenericsShape(t *testing.T) {
 		runtime.MemProfileRate = prev
 	}()
 
-	_ = genericAllocFunc[int](239)
+	it := genericAllocFunc[int](239)
+	escape(it)
 
 	runtime.GC()
 
@@ -233,10 +234,11 @@ func TestGenericsHashKeyInPprofBuilder(t *testing.T) {
 		runtime.MemProfileRate = previousRate
 	}()
 	for _, sz := range []int{128, 256} {
-		genericAllocFunc[uint32](sz / 4)
+		_ = genericAllocFunc[uint32](sz / 4)
 	}
 	for _, sz := range []int{32, 64} {
-		genericAllocFunc[uint64](sz / 8)
+		it := genericAllocFunc[uint64](sz / 8)
+		escape(it)
 	}
 
 	runtime.GC()
@@ -349,3 +351,10 @@ func WriteHeapProfile(w io.Writer) error {
 	})
 	return dh.Profile(w)
 }
+
+// make sure a is on the heap
+// https://go-review.googlesource.com/c/go/+/649035
+// https://go-review.googlesource.com/c/go/+/653856
+func escape(a any) {
+	fmt.Println(a)
+}