do not use fake names on anonymous function return values

R=ken
OCL=17679
CL=17679

diff --git a/src/cmd/6g/gsubr.c b/src/cmd/6g/gsubr.c
index b5cb9fd2294a9d75ea310d7a1bba643938fdf0e0..b158f09b9c7c63eb5c3bb38958cb86c029d11b55 100644 (file)
--- a/src/cmd/6g/gsubr.c
+++ b/src/cmd/6g/gsubr.c
@@ -1002,10 +1002,8 @@ naddr(Node *n, Addr *a)
                a->etype = n->etype;
                a->offset = n->xoffset;
                a->sym = n->sym;
-               if(a->sym == S) {
+               if(a->sym == S)
                        a->sym = lookup(".noname");
-                       fatal("noname");
-               }
                if(n->method) {
                        if(n->type != T)
                        if(n->type->sym != S)

diff --git a/src/cmd/gc/dcl.c b/src/cmd/gc/dcl.c
index 9a4fe730367cb6fdfb8b5ed71e3a01a87b54662a..f836f3ba749606ee7f3aee1100f38b80f8745719 100644 (file)
--- a/src/cmd/gc/dcl.c
+++ b/src/cmd/gc/dcl.c
@@ -472,12 +472,8 @@ loop:
        if(n->left != N && n->left->op == ONAME) {
                f->nname = n->left;
                f->embedded = n->embedded;
-       } else {
-               vargen++;
-               snprint(buf, sizeof(buf), "_e%s_%.3ld", filename, vargen);
-               f->nname = newname(lookup(buf));
+               f->sym = f->nname->sym;
        }
-       f->sym = f->nname->sym;
 
        *t = f;
        t = &f->down;

diff --git a/src/cmd/gc/subr.c b/src/cmd/gc/subr.c
index b66bd2bc8a2f0501fa7230fef58c259bcbb52e5c..d81c47c9f4cc2a7c884f9a7cb8ef7050d5d3942a 100644 (file)
--- a/src/cmd/gc/subr.c
+++ b/src/cmd/gc/subr.c
@@ -1061,7 +1061,7 @@ Tpretty(Fmt *fp, Type *t)
                return fmtprint(fp, " }");
 
        case TFIELD:
-               if(t->sym == S || t->sym->name[0] == '_' || t->embedded) {
+               if(t->sym == S || t->embedded) {
                        if(exporting)
                                fmtprint(fp, "? ");
                        return fmtprint(fp, "%T", t->type);