From: Austin Clements <austin@google.com>
Date: Tue, 19 May 2015 20:58:14 +0000 (-0400)
Subject: cmd/internal/gc: remove incorrect "write barrier prohibited" error
X-Git-Tag: go1.5beta1~524
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f763da3d3404673484bcc9d0d911c75a40e326c2;p=gostls13.git

cmd/internal/gc: remove incorrect "write barrier prohibited" error

Commit 9c9e36b pushed these errors down to where the write barriers
are actually emitted, but forgot to remove the original error that was
being pushed down.

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

diff --git a/src/cmd/internal/gc/walk.go b/src/cmd/internal/gc/walk.go
index 36e4d66b33..b5b8611e5b 100644
--- a/src/cmd/internal/gc/walk.go
+++ b/src/cmd/internal/gc/walk.go
@@ -2206,9 +2206,6 @@ var applywritebarrier_bv Bvec
 
 func applywritebarrier(n *Node, init **NodeList) *Node {
 	if n.Left != nil && n.Right != nil && needwritebarrier(n.Left, n.Right) {
-		if Curfn != nil && Curfn.Func.Nowritebarrier {
-			Yyerror("write barrier prohibited")
-		}
 		if flag_race == 0 {
 			if Debug_wb > 1 {
 				Warnl(int(n.Lineno), "marking %v for barrier", Nconv(n.Left, 0))