commit cd0a8ed48a4a71fb4fdb3d3b22f91d2335e4793a
author Dmitry Vyukov <dvyukov@google.com> Wed Jun 24 19:25:51 2015 +0200
committer Russ Cox <rsc@golang.org> Fri Jun 26 15:54:03 2015 +0000
tree 88189741d2a49467569837f509e3e4deca78640f
parent f271f928d9f1beb892dc576d397f37a3fddd6c0b

cmd/compile: add instrumentation of OKEY

Instrument operands of OKEY.
Also instrument OSLICESTR. Previously it was not needed
because of preceeding bounds checks (which were instrumented).
But the preceeding bounds checks have disappeared.

Change-Id: I3b0de213e23cbcf5b8ef800abeded5eeeb3f8287
Reviewed-on: https://go-review.googlesource.com/11417
Reviewed-by: Russ Cox <rsc@golang.org>

src/cmd/compile/internal/gc/racewalk.go

diff --git a/src/cmd/compile/internal/gc/racewalk.go b/src/cmd/compile/internal/gc/racewalk.go
index f826097..2664e0c 100644
--- a/src/cmd/compile/internal/gc/racewalk.go
+++ b/src/cmd/compile/internal/gc/racewalk.go
@@ -299,8 +299,14 @@
 		}
 		goto ret
 
-	case OSLICE, OSLICEARR, OSLICE3, OSLICE3ARR:
+	case OSLICE, OSLICEARR, OSLICE3, OSLICE3ARR, OSLICESTR:
 		racewalknode(&n.Left, init, 0, 0)
+		racewalknode(&n.Right, init, 0, 0)
+		goto ret
+
+	case OKEY:
+		racewalknode(&n.Left, init, 0, 0)
+		racewalknode(&n.Right, init, 0, 0)
 		goto ret
 
 	case OADDR:
@@ -413,8 +419,7 @@
 		OTYPE,
 		ONONAME,
 		OLITERAL,
-		OSLICESTR, // always preceded by bounds checking, avoid double instrumentation.
-		OTYPESW:   // ignored by code generation, do not instrument.
+		OTYPESW: // ignored by code generation, do not instrument.
 		goto ret
 	}