From: Dmitriy Vyukov <dvyukov@google.com>
Date: Thu, 8 Nov 2012 16:37:05 +0000 (+0400)
Subject: runtime: fix instrumentation of slice append for race detection
X-Git-Tag: go1.1rc2~1919
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3f7f030c5965bbf62ae2cb54f10ea01d2f49e212;p=gostls13.git

runtime: fix instrumentation of slice append for race detection

R=golang-dev, iant
CC=golang-dev
https://golang.org/cl/6819107
---

diff --git a/src/pkg/runtime/slice.c b/src/pkg/runtime/slice.c
index 3ec44b875f..2f62c4c02d 100644
--- a/src/pkg/runtime/slice.c
+++ b/src/pkg/runtime/slice.c
@@ -86,6 +86,8 @@ runtime·appendslice(SliceType *t, Slice x, Slice y, Slice ret)
 			runtime·racereadpc(x.array + i*t->elem->size, pc);
 		for(i=x.len; i<x.cap; i++)
 			runtime·racewritepc(x.array + i*t->elem->size, pc);
+		for(i=0; i<y.len; i++)
+			runtime·racereadpc(y.array + i*t->elem->size, pc);
 	}
 
 	if(m > x.cap)