]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/internal/gc: remove incorrect "write barrier prohibited" error
authorAustin Clements <austin@google.com>
Tue, 19 May 2015 20:58:14 +0000 (16:58 -0400)
committerAustin Clements <austin@google.com>
Tue, 19 May 2015 21:03:01 +0000 (21:03 +0000)
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>
src/cmd/internal/gc/walk.go

index 36e4d66b33aec8a9d7287c851289ce280195c5da..b5b8611e5bbde447d773e3c0f6b30c65696f20bd 100644 (file)
@@ -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))