diff options
| author | Filippo Valsorda <filippo@golang.org> | 2020-11-13 03:04:52 +0100 |
|---|---|---|
| committer | Filippo Valsorda <filippo@golang.org> | 2020-11-13 03:04:52 +0100 |
| commit | 11087322f85d5ace6494fc194982d92f0a34df0f (patch) | |
| tree | 1fc71e2b2e13647ad4a2a86f95794b47ca950e99 /src/cmd/compile/internal/gc/ssa.go | |
| parent | ed9dc25d693c02aeeb8ed084b28b6d7f9489dc5a (diff) | |
| parent | c53315d6cf1b4bfea6ff356b4a1524778c683bb9 (diff) | |
| download | go-11087322f85d5ace6494fc194982d92f0a34df0f.tar.gz go-11087322f85d5ace6494fc194982d92f0a34df0f.zip | |
[dev.boringcrypto.go1.15] all: merge go1.15.5 into dev.boringcrypto.go1.15
Change-Id: I075fd29b5d035cac905c7bc3145405bf622a981b
Diffstat (limited to 'src/cmd/compile/internal/gc/ssa.go')
| -rw-r--r-- | src/cmd/compile/internal/gc/ssa.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/cmd/compile/internal/gc/ssa.go b/src/cmd/compile/internal/gc/ssa.go index 3e21450deb..7da04547c2 100644 --- a/src/cmd/compile/internal/gc/ssa.go +++ b/src/cmd/compile/internal/gc/ssa.go @@ -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(): s.store(t, left, right) 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(): if skip&skipLen != 0 { 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) { switch { case t.IsPtrShaped(): + if t.IsPtr() && t.Elem().NotInHeap() { + break // see issue 42032 + } s.store(t, left, right) case t.IsString(): ptr := s.newValue1(ssa.OpStringPtr, s.f.Config.Types.BytePtr, right) |