]> Cypherpunks repositories - gostls13.git/commitdiff
[release-branch.go1.18] cmd/compile: pointers to notinheap types need their own shape
authorKeith Randall <khr@golang.org>
Fri, 18 Mar 2022 17:46:15 +0000 (10:46 -0700)
committerCherry Mui <cherryyz@google.com>
Mon, 4 Apr 2022 19:03:49 +0000 (19:03 +0000)
They should not share a shape with regular pointers. We could coalesce
multiple pointer-to-not-in-heap types, but doesn't seem worth it - just
make them fully stenciled.

Fixes #51741

Change-Id: Ie8158177226fbc46a798e71c51897a82f15153df
Reviewed-on: https://go-review.googlesource.com/c/go/+/393895
Trust: Keith Randall <khr@golang.org>
Run-TryBot: Keith Randall <khr@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: David Chase <drchase@google.com>
(cherry picked from commit fcf6afb82dc1e9f80a6260467026adc11d5c9529)
Reviewed-on: https://go-review.googlesource.com/c/go/+/393935

src/cmd/compile/internal/typecheck/subr.go
test/typeparam/issue51733.go [new file with mode: 0644]

index 5147ebbd2c45c8fe9dfd8ec4f19ab344cdf9f7d3..0d43855c4422a662788d84307327da8a32628974 100644 (file)
@@ -1536,7 +1536,7 @@ func Shapify(t *types.Type, index int, tparam *types.Type) *types.Type {
        // Note: pointers to arrays are special because of slice-to-array-pointer
        // conversions. See issue 49295.
        if u.Kind() == types.TPTR && u.Elem().Kind() != types.TARRAY &&
-               tparam.Bound().StructuralType() == nil {
+               tparam.Bound().StructuralType() == nil && !u.Elem().NotInHeap() {
                u = types.Types[types.TUINT8].PtrTo()
        }
 
diff --git a/test/typeparam/issue51733.go b/test/typeparam/issue51733.go
new file mode 100644 (file)
index 0000000..14f6db2
--- /dev/null
@@ -0,0 +1,32 @@
+// run -gcflags=-G=3
+
+// Copyright 2022 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+       "log"
+       "unsafe"
+)
+
+//go:notinheap
+type S struct{}
+
+func main() {
+       p := (*S)(unsafe.Pointer(uintptr(0x8000)))
+       var v any = p
+       p2 := v.(*S)
+       if p != p2 {
+               log.Fatalf("%p != %p", unsafe.Pointer(p), unsafe.Pointer(p2))
+       }
+       p2 = typeAssert[*S](v)
+       if p != p2 {
+               log.Fatalf("%p != %p from typeAssert", unsafe.Pointer(p), unsafe.Pointer(p2))
+       }
+}
+
+func typeAssert[T any](v any) T {
+       return v.(T)
+}