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

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

cmd/gc: ensure addable in checknil (fix race build)
TBR=dvyukov CC=golang-dev https://golang.org/cl/12791044
b75a08d0 · Russ Cox · 67a69bce · b75a08d0
Commit b75a08d0 authored Aug 15, 2013 by Russ Cox
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

src/cmd/gc/pgen.c src/cmd/gc/pgen.c +2 -2

No files found.
--- 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) {
+	if((thechar == '5' && n->op != OREGISTER) || !n->addable) {
-		regalloc(&reg, types[tptr], N);
+		regalloc(&reg, types[tptr], n);
 		cgen(n, &reg);
 		gins(ACHECKNIL, &reg, N);
 		regfree(&reg);