diff options
| author | Keith Randall <khr@golang.org> | 2020-03-17 13:27:11 -0700 |
|---|---|---|
| committer | Keith Randall <khr@golang.org> | 2020-03-17 20:47:06 +0000 |
| commit | f4ddc00345af8ffc77fabe2f6f21d570288159c1 (patch) | |
| tree | 6971fab645578938444d742b85b9fb0d4ab2e41e /src/runtime/checkptr.go | |
| parent | 14d20dc4f38dda548f6991cc687bc71b250b1603 (diff) | |
| download | go-f4ddc00345af8ffc77fabe2f6f21d570288159c1.tar.gz go-f4ddc00345af8ffc77fabe2f6f21d570288159c1.zip | |
runtime: don't report a pointer alignment error for pointer-free base type
Fixes #37298
Change-Id: I8ba9c8b106e16cea7dd25473c7390b0f2ba9a1a5
Reviewed-on: https://go-review.googlesource.com/c/go/+/223781
Run-TryBot: Keith Randall <khr@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/runtime/checkptr.go')
| -rw-r--r-- | src/runtime/checkptr.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/runtime/checkptr.go b/src/runtime/checkptr.go index 8e401e8763..59891a06a5 100644 --- a/src/runtime/checkptr.go +++ b/src/runtime/checkptr.go @@ -8,8 +8,10 @@ import "unsafe" func checkptrAlignment(p unsafe.Pointer, elem *_type, n uintptr) { // Check that (*[n]elem)(p) is appropriately aligned. + // Note that we allow unaligned pointers if the types they point to contain + // no pointers themselves. See issue 37298. // TODO(mdempsky): What about fieldAlign? - if uintptr(p)&(uintptr(elem.align)-1) != 0 { + if elem.ptrdata != 0 && uintptr(p)&(uintptr(elem.align)-1) != 0 { throw("checkptr: misaligned pointer conversion") } |