fix indirect error

x.go:3: invalid indirect of X (type int)

was
x.go:3: invalid indirect of nil

R=ken
OCL=33008
CL=33008

diff --git a/src/cmd/gc/subr.c b/src/cmd/gc/subr.c
index d4ee33d872667ae5a142f32dddf1a86bd86763f8..896f5f61d12c0cfb48e2c04801dd5835e3e50020 100644 (file)
--- a/src/cmd/gc/subr.c
+++ b/src/cmd/gc/subr.c
@@ -1215,7 +1215,9 @@ Nconv(Fmt *fp)
        }
 
        if(fp->flags & FmtSign) {
-               if(n->type == T || n->type->etype == TNIL)
+               if(n->type == T)
+                       fmtprint(fp, "%#N", n);
+               else if(n->type->etype == TNIL)
                        fmtprint(fp, "nil");
                else
                        fmtprint(fp, "%#N (type %T)", n, n->type);

diff --git a/src/cmd/gc/typecheck.c b/src/cmd/gc/typecheck.c
index b041cf26f9ed9a67085f766651e5aad8767e1c27..983ff78356a7e011902d92fb5ee04a0e1ae73823 100644 (file)
--- a/src/cmd/gc/typecheck.c
+++ b/src/cmd/gc/typecheck.c
@@ -221,7 +221,7 @@ reswitch:
                        goto ret;
                }
                if(!isptr[t->etype]) {
-                       yyerror("invalid indirect of %+N", n);
+                       yyerror("invalid indirect of %+N", n->left);
                        goto error;
                }
                ok |= Erv;