Skip to content

Commit 0ee9c46

Browse files
committed
cmd/compile: add missing WBs for reflect.{Slice,String}Header.Data
Fixes #19168. Change-Id: I3f4fcc0b189c53819ac29ef8de86fdad76a17488 Reviewed-on: https://go-review.googlesource.com/37663 Reviewed-by: Keith Randall <[email protected]>
1 parent 3d77bc0 commit 0ee9c46

File tree

3 files changed

+98
-6
lines changed

3 files changed

+98
-6
lines changed

src/cmd/compile/internal/gc/ssa.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3454,6 +3454,11 @@ func (s *state) insertWBstore(t *Type, left, right *ssa.Value, skip skipMask) {
34543454
if !s.WBPos.IsKnown() {
34553455
s.WBPos = left.Pos
34563456
}
3457+
if t == Types[TUINTPTR] {
3458+
// Stores to reflect.{Slice,String}Header.Data.
3459+
s.vars[&memVar] = s.newValue3I(ssa.OpStoreWB, ssa.TypeMem, s.config.PtrSize, left, right, s.mem())
3460+
return
3461+
}
34573462
s.storeTypeScalars(t, left, right, skip)
34583463
s.storeTypePtrsWB(t, left, right)
34593464
}

src/cmd/compile/internal/gc/walk.go

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2006,6 +2006,29 @@ func isstack(n *Node) bool {
20062006
return false
20072007
}
20082008

2009+
// isReflectHeaderDataField reports whether l is an expression p.Data
2010+
// where p has type reflect.SliceHeader or reflect.StringHeader.
2011+
func isReflectHeaderDataField(l *Node) bool {
2012+
if l.Type != Types[TUINTPTR] {
2013+
return false
2014+
}
2015+
2016+
var tsym *Sym
2017+
switch l.Op {
2018+
case ODOT:
2019+
tsym = l.Left.Type.Sym
2020+
case ODOTPTR:
2021+
tsym = l.Left.Type.Elem().Sym
2022+
default:
2023+
return false
2024+
}
2025+
2026+
if tsym == nil || l.Sym.Name != "Data" || tsym.Pkg.Path != "reflect" {
2027+
return false
2028+
}
2029+
return tsym.Name == "SliceHeader" || tsym.Name == "StringHeader"
2030+
}
2031+
20092032
// Do we need a write barrier for assigning to l?
20102033
func needwritebarrier(l *Node) bool {
20112034
if !use_writebarrier {
@@ -2016,15 +2039,21 @@ func needwritebarrier(l *Node) bool {
20162039
return false
20172040
}
20182041

2019-
// No write barrier for write of non-pointers.
2020-
dowidth(l.Type)
2021-
2022-
if !haspointers(l.Type) {
2042+
// No write barrier for write to stack.
2043+
if isstack(l) {
20232044
return false
20242045
}
20252046

2026-
// No write barrier for write to stack.
2027-
if isstack(l) {
2047+
// Package unsafe's documentation says storing pointers into
2048+
// reflect.SliceHeader and reflect.StringHeader's Data fields
2049+
// is valid, even though they have type uintptr (#19168).
2050+
if isReflectHeaderDataField(l) {
2051+
return true
2052+
}
2053+
2054+
// No write barrier for write of non-pointers.
2055+
dowidth(l.Type)
2056+
if !haspointers(l.Type) {
20282057
return false
20292058
}
20302059

test/fixedbugs/issue19168.go

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
// errorcheck -0 -l -d=wb
2+
3+
// Copyright 2017 The Go Authors. All rights reserved.
4+
// Use of this source code is governed by a BSD-style
5+
// license that can be found in the LICENSE file.
6+
7+
package p
8+
9+
import (
10+
"reflect"
11+
"unsafe"
12+
13+
reflect2 "reflect"
14+
)
15+
16+
func sink(e interface{})
17+
18+
func a(hdr *reflect.SliceHeader, p *byte) {
19+
hdr.Data = uintptr(unsafe.Pointer(p)) // ERROR "write barrier"
20+
}
21+
22+
func b(hdr *reflect.StringHeader, p *byte) {
23+
hdr.Data = uintptr(unsafe.Pointer(p)) // ERROR "write barrier"
24+
}
25+
26+
func c(hdrs *[1]reflect.SliceHeader, p *byte) {
27+
hdrs[0].Data = uintptr(unsafe.Pointer(p)) // ERROR "write barrier"
28+
}
29+
30+
func d(hdr *struct{ s reflect.StringHeader }, p *byte) {
31+
hdr.s.Data = uintptr(unsafe.Pointer(p)) // ERROR "write barrier"
32+
}
33+
34+
func e(p *byte) (resHeap, resStack string) {
35+
sink(&resHeap)
36+
37+
hdr := (*reflect.StringHeader)(unsafe.Pointer(&resHeap))
38+
hdr.Data = uintptr(unsafe.Pointer(p)) // ERROR "write barrier"
39+
40+
// No write barrier for non-escaping stack vars.
41+
hdr = (*reflect.StringHeader)(unsafe.Pointer(&resStack))
42+
hdr.Data = uintptr(unsafe.Pointer(p))
43+
44+
return
45+
}
46+
47+
func f(hdr *reflect2.SliceHeader, p *byte) {
48+
hdr.Data = uintptr(unsafe.Pointer(p)) // ERROR "write barrier"
49+
}
50+
51+
type SliceHeader struct {
52+
Data uintptr
53+
}
54+
55+
func g(hdr *SliceHeader, p *byte) {
56+
// No write barrier for lookalike SliceHeader.
57+
hdr.Data = uintptr(unsafe.Pointer(p))
58+
}

0 commit comments

Comments
 (0)