cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-23 16:31:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmd/compile: fix interaction between GOEXPERIMENT=fieldtrack and race detector

Browse Source 
Tested by hand.
Only lines of code changing are protected by Fieldtrack_enabled > 0,
which is never true in standard Go distributions.

Fixes #12171.

Change-Id: I963b9997dac10829db8ad4bfc97a7d6bf14b55c6
Reviewed-on: https://go-review.googlesource.com/13676
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Russ Cox 2015-08-17 21:38:46 -04:00
parent 9e26cde786
commit f68d1df6b9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/compile/internal/gc/typecheck.go
View File

@ -2532,7 +2532,7 @@ func lookdot(n *Node, t *Type, dostrcmp int) *Type {
n.Xoffset = f1.Width n.Xoffset = f1.Width
n.Type = f1.Type n.Type = f1.Type
if obj.Fieldtrack_enabled > 0 { if obj.Fieldtrack_enabled > 0 {
dotField[typeSym{t, s}] = f1 dotField[typeSym{t.Orig, s}] = f1
} }
if t.Etype == TINTER { if t.Etype == TINTER {
if Isptr[n.Left.Type.Etype] { if Isptr[n.Left.Type.Etype] {

2
src/cmd/compile/internal/gc/walk.go
View File

@ -3873,7 +3873,7 @@ func usefield(n *Node) {
if Isptr[t.Etype] { if Isptr[t.Etype] {
t = t.Type t = t.Type
} }
field := dotField[typeSym{t, n.Right.Sym}] field := dotField[typeSym{t.Orig, n.Right.Sym}]
if field == nil { if field == nil {
Fatal("usefield %v %v without paramfld", n.Left.Type, n.Right.Sym) Fatal("usefield %v %v without paramfld", n.Left.Type, n.Right.Sym)
} }