qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 21:11:57 -07:00
Code Releases Activity

cmd/compile: use better line numbers for write barriers

Browse Source 
When the write barrier does several pointer writes under one
write barrier flag check, the line numbers aren't really correct.

The writes inside the write barrier have a confusing set of positions.
The loads of the old values are given the line number of the
corresponding store instruction, but the stores into the write buffer
are given the line number of the first store. Instead, give them all
line numbers corresponding to the store instruction.

The writes at the merge point, which are the original writes and the
only ones that happen when the barrier is off, are currently all given
the line number of the first write. Instead give them their original
line number.

Change-Id: Id64820b707f45f07b0978f8d03c97900fdc4bc0b
Reviewed-on: https://go-review.googlesource.com/c/go/+/521499
Reviewed-by: Keith Randall <khr@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: David Chase <drchase@google.com>
Run-TryBot: Keith Randall <khr@golang.org>
This commit is contained in:
Keith Randall 2023-08-21 14:10:24 -07:00
parent 63ab68ddc5
commit 463c34451d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cmd/compile/internal/ssa/writebarrier.go
View File

@ -353,7 +353,7 @@ func writebarrier(f *Func) {
memThen := mem
var curCall *Value
var curPtr *Value
addEntry := func(v *Value) {
addEntry := func(pos src.XPos, v *Value) {
if curCall == nil || curCall.AuxInt == maxEntries {
t := types.NewTuple(types.Types[types.TUINTPTR].PtrTo(), types.TypeMem)
curCall = bThen.NewValue1(pos, OpWB, t, memThen)
@ -394,7 +394,7 @@ func writebarrier(f *Func) {
val := w.Args[1]
if !srcs.contains(val.ID) && needWBsrc(val) {
srcs.add(val.ID)
addEntry(val)
addEntry(pos, val)
}
if !dsts.contains(ptr.ID) && needWBdst(ptr, w.Args[2], zeroes) {
dsts.add(ptr.ID)
@ -407,7 +407,7 @@ func writebarrier(f *Func) {
// combine the read and the write.
oldVal := bThen.NewValue2(pos, OpLoad, types.Types[types.TUINTPTR], ptr, memThen)
// Save old value to write buffer.
addEntry(oldVal)
addEntry(pos, oldVal)
}
f.fe.Func().SetWBPos(pos)
nWBops--
@ -449,6 +449,7 @@ func writebarrier(f *Func) {
// Do raw stores after merge point.
for _, w := range stores {
pos := w.Pos
switch w.Op {
case OpStoreWB:
ptr := w.Args[0]