summaryrefslogtreecommitdiffhomepage
path: root/pkg/safemem/block_unsafe.go
diff options
context:
space:
mode:
authorJamie Liu <jamieliu@google.com>2021-02-17 17:39:24 -0800
committergVisor bot <gvisor-bot@google.com>2021-02-17 17:41:10 -0800
commitf051ec64639b83faabcfe766ff078072def3c2aa (patch)
tree892c0fc2f4fd4138299c3c0d5a5836a940a670b5 /pkg/safemem/block_unsafe.go
parent4bc7daf91a0d9102fa477b199964e7db45066da1 (diff)
Add gohacks.Slice/StringHeader.
See https://github.com/golang/go/issues/19367 for rationale. Note that the upstream decision arrived at in that thread, while useful for some of our use cases, doesn't account for all of our SliceHeader use cases (we often use SliceHeader to extract pointers from slices in a way that avoids bounds checking and/or handles nil slices correctly) and also doesn't exist yet. PiperOrigin-RevId: 358071574
Diffstat (limited to 'pkg/safemem/block_unsafe.go')
-rw-r--r--pkg/safemem/block_unsafe.go13
1 files changed, 6 insertions, 7 deletions
diff --git a/pkg/safemem/block_unsafe.go b/pkg/safemem/block_unsafe.go
index 7857f5853..93879bb4f 100644
--- a/pkg/safemem/block_unsafe.go
+++ b/pkg/safemem/block_unsafe.go
@@ -16,9 +16,9 @@ package safemem
import (
"fmt"
- "reflect"
"unsafe"
+ "gvisor.dev/gvisor/pkg/gohacks"
"gvisor.dev/gvisor/pkg/safecopy"
)
@@ -148,12 +148,11 @@ func (b Block) TakeFirst64(n uint64) Block {
// ToSlice returns a []byte equivalent to b.
func (b Block) ToSlice() []byte {
- var bs []byte
- hdr := (*reflect.SliceHeader)(unsafe.Pointer(&bs))
- hdr.Data = uintptr(b.start)
- hdr.Len = b.length
- hdr.Cap = b.length
- return bs
+ return *(*[]byte)(unsafe.Pointer(&gohacks.SliceHeader{
+ Data: b.start,
+ Len: b.length,
+ Cap: b.length,
+ }))
}
// Addr returns b's start address as a uintptr. It returns uintptr instead of