From: Russ Cox <rsc@golang.org>
Date: Fri, 16 Aug 2013 01:05:05 +0000 (-0400)
Subject: cmd/gc: ensure addable in checknil (fix race build)
X-Git-Tag: go1.2rc2~539
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b75a08d03c3d0fc659191dbc7eed174d5cb6f6c3;p=gostls13.git

cmd/gc: ensure addable in checknil (fix race build)

TBR=dvyukov
CC=golang-dev
https://golang.org/cl/12791044
---

diff --git a/src/cmd/gc/pgen.c b/src/cmd/gc/pgen.c
index 583e77e4cc..edeaa06a69 100644
--- a/src/cmd/gc/pgen.c
+++ b/src/cmd/gc/pgen.c
@@ -515,8 +515,8 @@ cgen_checknil(Node *n)
 		return;
 	while(n->op == ODOT || (n->op == OINDEX && isfixedarray(n->left->type->type))) // NOTE: not ODOTPTR
 		n = n->left;
-	if(thechar == '5' && n->op != OREGISTER) {
-		regalloc(&reg, types[tptr], N);
+	if((thechar == '5' && n->op != OREGISTER) || !n->addable) {
+		regalloc(&reg, types[tptr], n);
 		cgen(n, &reg);
 		gins(ACHECKNIL, &reg, N);
 		regfree(&reg);