diff options
| -rw-r--r-- | src/cmd/gc/range.c | 3 | ||||
| -rw-r--r-- | src/pkg/runtime/race/testdata/mop_test.go | 13 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/cmd/gc/range.c b/src/cmd/gc/range.c index 8af45b9d2..bd271da38 100644 --- a/src/cmd/gc/range.c +++ b/src/cmd/gc/range.c @@ -129,6 +129,9 @@ walkrange(Node *n) v2 = N; if(n->list->next) v2 = n->list->next->n; + // n->list has no meaning anymore, clear it + // to avoid erroneous processing by racewalk. + n->list = nil; hv2 = N; if(v2 == N && t->etype == TARRAY) { diff --git a/src/pkg/runtime/race/testdata/mop_test.go b/src/pkg/runtime/race/testdata/mop_test.go index fa7abe0ef..6d3098919 100644 --- a/src/pkg/runtime/race/testdata/mop_test.go +++ b/src/pkg/runtime/race/testdata/mop_test.go @@ -267,6 +267,19 @@ func TestNoRaceRange(t *testing.T) { close(ch) } +func TestNoRaceRangeIssue5446(t *testing.T) { + ch := make(chan int, 3) + a := []int{1, 2, 3} + b := []int{4} + // used to insert a spurious instrumentation of a[i] + // and crash. + i := 1 + for i, a[i] = range b { + ch <- i + } + close(ch) +} + func TestRaceRange(t *testing.T) { const N = 2 var a [N]int |