From: Ian Lance Taylor <iant@golang.org>
Date: Tue, 1 Mar 2016 23:17:34 +0000 (-0800)
Subject: cmd/compile: s/flag_race/instrumenting/ in OCONVNOP check
X-Git-Tag: go1.7beta1~1619
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=88e18032bd76656afcf246c1a252e04cf462b41e;p=gostls13.git

cmd/compile: s/flag_race/instrumenting/ in OCONVNOP check

This check seems to apply to all code instrumentation, not just -race.

Fixes #14589.

Change-Id: I16ae07749ede7c1e6ed06f472711638d195034ac
Reviewed-on: https://go-review.googlesource.com/20113
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Marvin Stenger <marvin.stenger94@gmail.com>
---

diff --git a/src/cmd/compile/internal/gc/ssa.go b/src/cmd/compile/internal/gc/ssa.go
index 0add627a11..03ff17eb01 100644
--- a/src/cmd/compile/internal/gc/ssa.go
+++ b/src/cmd/compile/internal/gc/ssa.go
@@ -1481,7 +1481,7 @@ func (s *state) expr(n *Node) *ssa.Value {
 			return nil
 		}
 
-		if flag_race != 0 {
+		if instrumenting {
 			// These appear to be fine, but they fail the
 			// integer constraint below, so okay them here.
 			// Sample non-integer conversion: map[string]string -> *uint8