cmd/compile: use internal/race

CL 14870 added internal/race to factor out duplicated race thunks,
we should use it.

No signification changes in compile time and compile binary size.

Change-Id: I786af44dd5bb0f4ab6709432eeb603f27a5b6c63
Reviewed-on: https://go-review.googlesource.com/c/go/+/178118
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/cmd/compile/internal/gc/norace.go b/src/cmd/compile/internal/gc/norace.go
deleted file mode 100644 (file)
index e00f0c4..0000000
--- a/src/cmd/compile/internal/gc/norace.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !race
-
-package gc
-
-const raceEnabled = false

diff --git a/src/cmd/compile/internal/gc/pgen.go b/src/cmd/compile/internal/gc/pgen.go
index 2ae7452e7db11824c0553a603e36aab56101e436..dd2294e37f1b7767efa3a2887c0d8d188ab34dcc 100644 (file)
--- a/src/cmd/compile/internal/gc/pgen.go
+++ b/src/cmd/compile/internal/gc/pgen.go
@@ -13,6 +13,7 @@ import (
        "cmd/internal/src"
        "cmd/internal/sys"
        "fmt"
+       "internal/race"
        "math/rand"
        "sort"
        "sync"
@@ -325,7 +326,7 @@ func compileSSA(fn *Node, worker int) {
 }
 
 func init() {
-       if raceEnabled {
+       if race.Enabled {
                rand.Seed(time.Now().UnixNano())
        }
 }
@@ -336,7 +337,7 @@ func init() {
 func compileFunctions() {
        if len(compilequeue) != 0 {
                sizeCalculationDisabled = true // not safe to calculate sizes concurrently
-               if raceEnabled {
+               if race.Enabled {
                        // Randomize compilation order to try to shake out races.
                        tmp := make([]*Node, len(compilequeue))
                        perm := rand.Perm(len(compilequeue))

diff --git a/src/cmd/compile/internal/gc/race.go b/src/cmd/compile/internal/gc/race.go
deleted file mode 100644 (file)
index 78e1997..0000000
--- a/src/cmd/compile/internal/gc/race.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build race
-
-package gc
-
-const raceEnabled = true

diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go
index 190b592b6ef19c85af4c3acaed99b20eb33a4b20..b434d4f60f49c161494f24814b268ab941e4f52e 100644 (file)
--- a/src/cmd/dist/buildtool.go
+++ b/src/cmd/dist/buildtool.go
@@ -90,6 +90,7 @@ var bootstrapDirs = []string{
        "debug/macho",
        "debug/pe",
        "internal/goversion",
+       "internal/race",
        "internal/xcoff",
        "math/big",
        "math/bits",