1
0
mirror of https://github.com/golang/go synced 2024-11-14 23:00:29 -07:00

[release-branch.go1.15] cmd/compile: fix storeType to handle pointers to go:notinheap types

storeType splits compound stores up into a scalar parts and a pointer parts.
The scalar part happens unconditionally, and the pointer part happens
under the guard of a write barrier check.

Types which are declared as pointers, but are represented as scalars because
they might have "bad" values, were not handled correctly here. They ended
up not getting stored in either set.

Fixes #42151

Change-Id: I46f6600075c0c370e640b807066247237f93c7ac
Reviewed-on: https://go-review.googlesource.com/c/go/+/264300
Trust: Keith Randall <khr@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
(cherry picked from commit 933721b8c7)
Reviewed-on: https://go-review.googlesource.com/c/go/+/265719
Run-TryBot: Keith Randall <khr@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
This commit is contained in:
Keith Randall 2020-10-22 13:11:16 -07:00 committed by Ian Lance Taylor
parent 255afa2461
commit 068911e1dd
2 changed files with 34 additions and 1 deletions

View File

@ -4976,7 +4976,10 @@ func (s *state) storeTypeScalars(t *types.Type, left, right *ssa.Value, skip ski
case t.IsBoolean() || t.IsInteger() || t.IsFloat() || t.IsComplex(): case t.IsBoolean() || t.IsInteger() || t.IsFloat() || t.IsComplex():
s.store(t, left, right) s.store(t, left, right)
case t.IsPtrShaped(): case t.IsPtrShaped():
// no scalar fields. if t.IsPtr() && t.Elem().NotInHeap() {
s.store(t, left, right) // see issue 42032
}
// otherwise, no scalar fields.
case t.IsString(): case t.IsString():
if skip&skipLen != 0 { if skip&skipLen != 0 {
return return
@ -5020,6 +5023,9 @@ func (s *state) storeTypeScalars(t *types.Type, left, right *ssa.Value, skip ski
func (s *state) storeTypePtrs(t *types.Type, left, right *ssa.Value) { func (s *state) storeTypePtrs(t *types.Type, left, right *ssa.Value) {
switch { switch {
case t.IsPtrShaped(): case t.IsPtrShaped():
if t.IsPtr() && t.Elem().NotInHeap() {
break // see issue 42032
}
s.store(t, left, right) s.store(t, left, right)
case t.IsString(): case t.IsString():
ptr := s.newValue1(ssa.OpStringPtr, s.f.Config.Types.BytePtr, right) ptr := s.newValue1(ssa.OpStringPtr, s.f.Config.Types.BytePtr, right)

View File

@ -0,0 +1,27 @@
// run
// Copyright 2020 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
//go:notinheap
type NIH struct {
}
type T struct {
x *NIH
p *int
}
var y NIH
var z int
func main() {
a := []T{{&y, &z}}
a = append(a, T{&y, &z})
if a[1].x == nil {
panic("pointer not written")
}
}