diff options
Diffstat (limited to 'src/cmd/gc/const.c')
| -rw-r--r-- | src/cmd/gc/const.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/cmd/gc/const.c b/src/cmd/gc/const.c index bbbc8d739..054ce2412 100644 --- a/src/cmd/gc/const.c +++ b/src/cmd/gc/const.c @@ -704,6 +704,7 @@ nodlit(Val v) return n; } +// TODO(rsc): combine with convlit void defaultlit(Node **np, Type *t) { @@ -713,7 +714,7 @@ defaultlit(Node **np, Type *t) n = *np; if(n == N) return; - if(n->type == T || n->type->etype != TIDEAL) + if(n->type == T || (n->type->etype != TIDEAL && n->type->etype != TNIL)) return; switch(n->op) { @@ -739,6 +740,16 @@ defaultlit(Node **np, Type *t) lineno = n->lineno; switch(n->val.ctype) { default: + if(t != T) { + convlit(np, t); + break; + } + if(n->val.ctype == CTNIL) { + lineno = lno; + yyerror("use of untyped nil"); + n->type = T; + break; + } yyerror("defaultlit: unknown literal: %#N", n); break; case CTINT: |