runtime/race: update runtime to rev 188542

Fixes #6107.
race: output goroutine 1 as main goroutine

Fixes #6130.
race: option to abort program on first detected error

R=golang-dev, mikioh.mikioh
CC=golang-dev
https://golang.org/cl/12968044

diff --git a/src/pkg/runtime/race/README b/src/pkg/runtime/race/README
index 8bedb09cdd43cf16c7dd56837f2506e6a662fc61..c298218a07f6136c4fa9631069660356a661729d 100644 (file)
--- a/src/pkg/runtime/race/README
+++ b/src/pkg/runtime/race/README
@@ -9,3 +9,4 @@ $ ./buildgo.sh
 
 Tested with gcc 4.6.1 and 4.7.0.  On Windows it's built with 64-bit MinGW.
 
+Current runtime is built on rev 188542.

diff --git a/src/pkg/runtime/race/output_test.go b/src/pkg/runtime/race/output_test.go
index 3604aec3c62de8b5786c98f724e845672c63a89f..83240ca34a166fb6ec57a8848afc5845b54dc75f 100644 (file)
--- a/src/pkg/runtime/race/output_test.go
+++ b/src/pkg/runtime/race/output_test.go
@@ -61,6 +61,7 @@ var tests = []struct {
 }{
        {"simple", `
 package main
+import "time"
 func main() {
        done := make(chan bool)
        x := 0
@@ -75,6 +76,7 @@ func startRacer(x *int, done chan bool) {
        go racer(x, done)
 }
 func racer(x *int, done chan bool) {
+       time.Sleep(10*time.Millisecond)
        store(x, 42)
        done <- true
 }
@@ -82,26 +84,21 @@ func racer(x *int, done chan bool) {
 WARNING: DATA RACE
 Write by goroutine [0-9]:
   main\.store\(\)
-      .*/main\.go:11 \+0x[0-9,a-f]+
+      .*/main\.go:12 \+0x[0-9,a-f]+
   main\.racer\(\)
-      .*/main\.go:17 \+0x[0-9,a-f]+
+      .*/main\.go:19 \+0x[0-9,a-f]+
 
-Previous write by goroutine 1:
+Previous write by main goroutine:
   main\.store\(\)
-      .*/main\.go:11 \+0x[0-9,a-f]+
+      .*/main\.go:12 \+0x[0-9,a-f]+
   main\.main\(\)
-      .*/main\.go:7 \+0x[0-9,a-f]+
+      .*/main\.go:8 \+0x[0-9,a-f]+
 
-Goroutine 3 \(running\) created at:
+Goroutine [0-9] \(running\) created at:
   main\.startRacer\(\)
-      .*/main\.go:14 \+0x[0-9,a-f]+
+      .*/main\.go:15 \+0x[0-9,a-f]+
   main\.main\(\)
-      .*/main\.go:6 \+0x[0-9,a-f]+
-
-Goroutine 1 \(running\) created at:
-  _rt0_go\(\)
-      .*/src/pkg/runtime/asm_amd64\.s:[0-9]+ \+0x[0-9,a-f]+
-
+      .*/main\.go:7 \+0x[0-9,a-f]+
 ==================
 Found 1 data race\(s\)
 exit status 66

diff --git a/src/pkg/runtime/race/race_darwin_amd64.syso b/src/pkg/runtime/race/race_darwin_amd64.syso
index ff47534d7174f5de1a2943d239b881227a793779..18fabc217e6a552087b2efb116435d598116848c 100644 (file)
Binary files a/src/pkg/runtime/race/race_darwin_amd64.syso and b/src/pkg/runtime/race/race_darwin_amd64.syso differ

diff --git a/src/pkg/runtime/race/race_linux_amd64.syso b/src/pkg/runtime/race/race_linux_amd64.syso
index 41e12093fbfb0a46ee1c78bd3a560717b8dc60d9..d770031d5b3754b3c7b9152fde2027ca5eb9cb65 100644 (file)
Binary files a/src/pkg/runtime/race/race_linux_amd64.syso and b/src/pkg/runtime/race/race_linux_amd64.syso differ

diff --git a/src/pkg/runtime/race/race_windows_amd64.syso b/src/pkg/runtime/race/race_windows_amd64.syso
index 9e669f94fda8f656b1fb1cc1eee02640d744de3e..4fd661f5b6d578711e6ca8bb1dd75d29fa01a8d1 100644 (file)
Binary files a/src/pkg/runtime/race/race_windows_amd64.syso and b/src/pkg/runtime/race/race_windows_amd64.syso differ