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 583e77e4ccfa464704acc8768e208d9f6d4d85e5..edeaa06a693c21be3411f0947f63284c4864f6c6 100644 (file)
--- 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);