gc: avoid saying same error 3 times

R=ken2
CC=golang-dev
https://golang.org/cl/4316051

diff --git a/src/cmd/gc/const.c b/src/cmd/gc/const.c
index 0cc26fc3b51d5dc019fe4003b138a0f1aef987c0..a36ec68c0aa27e9cb0a1172815339e7a0c3c9ea6 100644 (file)
--- a/src/cmd/gc/const.c
+++ b/src/cmd/gc/const.c
@@ -136,7 +136,6 @@ convlit1(Node **np, Type *t, int explicit)
        case CTNIL:
                switch(et) {
                default:
-                       yyerror("cannot use nil as %T", t);
                        n->type = T;
                        goto bad;
 

diff --git a/src/cmd/gc/subr.c b/src/cmd/gc/subr.c
index 26b9a40a290a0860fc1a0c81a098a29b6457c056..b4c58d10d72434653d797c8665febd6217df0d45 100644 (file)
--- a/src/cmd/gc/subr.c
+++ b/src/cmd/gc/subr.c
@@ -2053,13 +2053,16 @@ Node*
 assignconv(Node *n, Type *t, char *context)
 {
        int op;
-       Node *r;
+       Node *r, *old;
        char *why;
        
        if(n == N || n->type == T)
                return n;
 
+       old = n;
+       old->diag++;  // silence errors about n; we'll issue one below
        defaultlit(&n, t);
+       old->diag--;
        if(t->etype == TBLANK)
                return n;
 

diff --git a/test/ddd1.go b/test/ddd1.go
index ff6342843a96ce785bb11f89b53452e4a5d3ea12..a0bc73814fd551e256aff9ccb4774607ed76f0e3 100644 (file)
--- a/test/ddd1.go
+++ b/test/ddd1.go
@@ -15,7 +15,7 @@ var (
        _ = sum()
        _ = sum(1.0, 2.0)
        _ = sum(1.5)      // ERROR "integer"
-       _ = sum("hello")  // ERROR "convert|incompatible"
+       _ = sum("hello")  // ERROR "string.*as type int|incompatible"
        _ = sum([]int{1}) // ERROR "slice literal.*as type int|incompatible"
 )