From 0dfa57ea042f935183746f98dc6751d8e38d88d4 Mon Sep 17 00:00:00 2001
From: Damian Gryski <damian@gryski.com>
Date: Fri, 18 Oct 2024 10:25:04 -0700
Subject: runtime: use unsafe.Slice in tsip code

---
 src/runtime/memhash_tsip.go | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/runtime/memhash_tsip.go b/src/runtime/memhash_tsip.go
index a8829e052..607055bd5 100644
--- a/src/runtime/memhash_tsip.go
+++ b/src/runtime/memhash_tsip.go
@@ -15,23 +15,6 @@ import (
 	"unsafe"
 )
 
-func ptrToSlice(ptr unsafe.Pointer, n uintptr) []byte {
-	var p []byte
-
-	type _bslice struct {
-		ptr *byte
-		len uintptr
-		cap uintptr
-	}
-
-	pslice := (*_bslice)(unsafe.Pointer(&p))
-	pslice.ptr = (*byte)(ptr)
-	pslice.cap = n
-	pslice.len = n
-
-	return p
-}
-
 type sip struct {
 	v0, v1 uint64
 }
@@ -45,8 +28,7 @@ func (s *sip) round() {
 }
 
 func hash64(ptr unsafe.Pointer, n uintptr, seed uintptr) uint64 {
-
-	p := ptrToSlice(ptr, n)
+	p := unsafe.Slice((*byte)(ptr), n)
 
 	k0 := uint64(seed)
 	k1 := uint64(0)
@@ -117,9 +99,7 @@ func (s *sip32) round() {
 }
 
 func hash32(ptr unsafe.Pointer, n uintptr, seed uintptr) uint32 {
-	// TODO(dgryski): replace this messiness with unsafe.Slice when we can use 1.17 features
-
-	p := ptrToSlice(ptr, n)
+	p := unsafe.Slice((*byte)(ptr), n)
 
 	k0 := uint32(seed)
 	k1 := uint32(seed >> 32)
-- 
cgit v1.2.3