code review 5487077: gc: inlining, allow empty bodies, fix _ arguments.

src/cmd/gc/fmt.c

 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 #include        <u.h>
 #include        <libc.h>
 #include        "go.h"
 #include        "opnames.h"
 
 //
@@ skipping 662 matching lines @@
                         break;
                 default:
                         fmtprint(fp, " %T", getoutargx(t));
                         break;
                 }
                 return 0;
 
         case TSTRUCT:
                 if(t->funarg) {
                         fmtstrcpy(fp, "(");
-                        if(fmtmode == FTypeId) {        // no argument names on function signature, and no "noescape" tags
+                        if(fmtmode == FTypeId || fmtmode == FErr) {     // no argument names on function signature, and no "noescape" tags
                                 for(t1=t->type; t1!=T; t1=t1->down)
                                         if(t1->down)
                                                 fmtprint(fp, "%hT, ", t1);
                                         else
                                                 fmtprint(fp, "%hT", t1);
                         } else {
                                 for(t1=t->type; t1!=T; t1=t1->down)
                                         if(t1->down)
                                                 fmtprint(fp, "%T, ", t1);
                                         else
@@ skipping 587 matching lines @@
                 exprfmt(f, n->right, nprec+1);
                 return 0;
         }
 
         return fmtprint(f, "<node %O>", n->op);
 }
 
 static int
 nodefmt(Fmt *f, Node *n)
 {
-
-        if(f->flags&FmtLong && n->type != T) {
-                if(n->type->etype == TNIL)
+        Type *t;
+
+        t = n->type;
+        if(n->orig != N)
+                n = n->orig;
+
+        if(f->flags&FmtLong && t != T) {
+                if(t->etype == TNIL)
                         return fmtprint(f, "nil");
                 else
-                        return fmtprint(f, "%N (type %T)", n, n->type);
-
+                        return fmtprint(f, "%N (type %T)", n, t);
         }
 
         // TODO inlining produces expressions with ninits. we can't print these yet.
 
         if(opprec[n->op] < 0)
                 return stmtfmt(f, n);
 
         return exprfmt(f, n, 0);
 }
 
@@ skipping 174 matching lines @@
         n = va_arg(fp->args, Node*);
         if(n == N)
                 return fmtstrcpy(fp, "<N>");
         sf = fp->flags;
         sm = setfmode(&fp->flags);
 
         r = -1;
         switch(fmtmode) {
         case FErr:
         case FExp:
-                if(n->orig != N)
-                        n = n->orig;
                 r = nodefmt(fp, n);
                 break;
         case FDbg:
                 dumpdepth++;
                 r = nodedump(fp, n);
                 dumpdepth--;
                 break;
         default:
                 fatal("unhandled %%N mode");
         }
@@ skipping 63 matching lines @@
 dumplist(char *s, NodeList *l)
 {
         print("%s\n%+H\n", s, l);
 }
 
 void
 dump(char *s, Node *n)
 {
         print("%s [%p]\n%+N\n", s, n, n);
 }