aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Brainman <alex.brainman@gmail.com>2020-04-04 18:36:58 +1100
committerAlex Brainman <alex.brainman@gmail.com>2020-04-05 06:04:27 +0000
commit656f27ebf86e415c59de421643a35c98238b0ff5 (patch)
treec9b90bc9c9f121e22c420c5b9aabc7998d4a9388
parent9f40f9f4d3e9e5a08cfd1df5af23a6f61d67d408 (diff)
downloadgo-656f27ebf86e415c59de421643a35c98238b0ff5.tar.gz
go-656f27ebf86e415c59de421643a35c98238b0ff5.zip
cmd/compile: enable -d=checkptr even on windows
CL 201783 enable -d=checkptr when -race or -msan is specified everywhere but windows. But, now that all unsafe pointer conversions in the standard library are fixed, enable -d=checkptr even on windows. Updates #34964 Updates #34972 Change-Id: Id912fa83b0d5b46c6f1c134c742fd94d2d185835 Reviewed-on: https://go-review.googlesource.com/c/go/+/227003 Run-TryBot: Alex Brainman <alex.brainman@gmail.com> Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
-rw-r--r--src/cmd/compile/internal/gc/main.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/cmd/compile/internal/gc/main.go b/src/cmd/compile/internal/gc/main.go
index f65b95a9c9..2152c619fa 100644
--- a/src/cmd/compile/internal/gc/main.go
+++ b/src/cmd/compile/internal/gc/main.go
@@ -379,9 +379,8 @@ func Main(archInit func(*Arch)) {
if flag_race && flag_msan {
log.Fatal("cannot use both -race and -msan")
}
- if (flag_race || flag_msan) && objabi.GOOS != "windows" {
- // -race and -msan imply -d=checkptr for now (except on windows).
- // TODO(mdempsky): Re-evaluate before Go 1.14. See #34964.
+ if flag_race || flag_msan {
+ // -race and -msan imply -d=checkptr for now.
Debug_checkptr = 1
}
if ispkgin(omit_pkgs) {